docs : update readme

README.md

@@ -1,19 +1,55 @@
-# Surveasy-app
+# ✅ Surveasy 서베이지
+<br>
 
-✅ 서베이지 패널용 안드로이드 어플 workspace 입니다.
+## ⚙️ 주요 기능
+* 서베이지 웹에 올라오는 설문에 참여
+* 참여한 설문에 해당하는 리워드 지급
+
+<br><br>
 
+## 📚 기술 스택
 
----
+| 분류          | 사용기술                                  |
+| ------------- | ----------------------------------------- |
+| 아키텍처      | MVVM, Clean Architecture                  |
+| 네트워크 통신 | Retrofit, Okhttp                          |
+| 이미지 처리   | Glide                                     |
+| 비동기        | Coroutine, Flow                           |
+| jetpack       | Navigation, Hilt, DataBinding, viewpager2 |
+| 데이터        | Datastore                                 |
+| etc           | Firebase                                  |
 
+<br><br>
 
-### ⚙️ 주요 기능
-* 서베이지 웹에 올라오는 설문에 참여
-* 참여한 설문에 해당하는 리워드 지급
-* 다양한 주제의 poll에 참여 
 
 
+## 📲 주요 기능 동작 화면
+
+### 로그인 / 회원가입
+기존 회원 로그인 및 신규 회원 카카오 로그인|
+|------|
+|<img src="https://github.com/seoyamin/Surveasy-app/assets/82799840/4029d153-6ffa-44bf-a961-715032d9c9a3" width="400" heigth="1000">|
+
+<br>
+
+### 설문 참여
+설문 상세 확인|설문 참여|
+|------|---|
+|<img src="https://github.com/seoyamin/Surveasy-app/assets/82799840/e8a176f0-c60d-46ea-b0dd-d8da7db23b63" width="400" heigth="1000">|<img src="https://github.com/seoyamin/Surveasy-app/assets/82799840/a48c82da-f8e3-400f-8abd-c8879c97050b" width="400" heigth="1000">|
+
+<br>
 
-### 📱 설치 방법
+### 주요 화면
+
+설문 리스트|정산 내역 확인|
+|------|---|
+|<img src="https://github.com/seoyamin/Surveasy-app/assets/82799840/bd4559f8-328e-4a7e-9480-099d3d430fd5" width="400" heigth="1000">|<img src="https://github.com/seoyamin/Surveasy-app/assets/82799840/464bdddb-4fea-4569-8094-9615561fdb51" width="400" heigth="1000">|
+
+
+
+
+<br><br>
+
+## 📱 설치 방법
 * play store 에 "서베이지" 검색 후 다운로드
 * https://play.google.com/store/apps/details?id=com.surveasy.surveasy
-

app/.gitignore

@@ -1 +1,168 @@
-/build
+/build
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### macOS Patch ###
+# iCloud generated files
+*.icloud
+
+### AndroidStudio ###
+# Covers files to be ignored for android development using Android Studio.
+
+# Built application files
+*.apk
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle
+.gradle/
+build/
+
+# Signing files
+.signing/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio
+/*/build/
+/*/local.properties
+/*/out
+/*/*/build
+/*/*/production
+captures/
+.navigation/
+*.ipr
+*~
+*.swp
+
+# Keystore files
+*.jks
+*.keystore
+
+# Google Services (e.g. APIs or Firebase)
+# google-services.json
+
+# Android Patch
+gen-external-apklibs
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# NDK
+obj/
+
+# IntelliJ IDEA
+*.iml
+*.iws
+/out/
+
+# User-specific configurations
+.idea/caches/
+.idea/libraries/
+.idea/shelf/
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/.name
+.idea/compiler.xml
+.idea/copyright/profiles_settings.xml
+.idea/encodings.xml
+.idea/misc.xml
+.idea/modules.xml
+.idea/scopes/scope_settings.xml
+.idea/dictionaries
+.idea/vcs.xml
+.idea/jsLibraryMappings.xml
+.idea/datasources.xml
+.idea/dataSources.ids
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+.idea/assetWizardSettings.xml
+.idea/gradle.xml
+.idea/jarRepositories.xml
+.idea/navEditor.xml
+
+# Legacy Eclipse project files
+.classpath
+.project
+.cproject
+.settings/
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.war
+*.ear
+
+# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
+hs_err_pid*
+
+## Plugin-specific files:
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Mongo Explorer plugin
+.idea/mongoSettings.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### AndroidStudio Patch ###
+
+!/gradle/wrapper/gradle-wrapper.jar
+
+# End of https://www.toptal.com/developers/gitignore/api/macos,androidstudio

app/build.gradle.kts

@@ -23,8 +23,8 @@ android {
         applicationId = "com.surveasy.surveasy"
         minSdk = 24
         targetSdk = 34
-        versionCode = 46
-        versionName = "2.0.6"
+        versionCode = 60
+        versionName = "2.1.5"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
@@ -105,10 +105,16 @@ dependencies {
     implementation("com.google.firebase:firebase-auth-ktx:22.1.2")
     implementation("com.google.firebase:firebase-analytics")
     implementation("com.google.firebase:firebase-storage-ktx")
+    implementation("com.google.firebase:firebase-config-ktx")
+    implementation("com.google.firebase:firebase-messaging-ktx")
 
     // indicator
     implementation("com.tbuonomo:dotsindicator:4.2")
 
     // kakao
     implementation("com.kakao.sdk:v2-user:2.11.2")
+
+    //inapp update
+    implementation("com.google.android.play:app-update-ktx:2.1.0")
+
 }

app/src/main/AndroidManifest.xml

@@ -6,6 +6,7 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_MEDIA_IMAGES" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="com.google.android.gms.permission.AD_ID" />
@@ -87,6 +88,14 @@
             android:name=".presentation.intro.IntroActivity"
             android:exported="true"
             android:windowSoftInputMode="adjustPan" />
+
+        <service
+            android:name=".app.MyFirebaseMessagingService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
     </application>
 
 </manifest>

app/src/main/java/com/surveasy/surveasy/app/MyFirebaseMessagingService.kt

@@ -0,0 +1,17 @@
+package com.surveasy.surveasy.app
+
+import android.util.Log
+import com.google.firebase.messaging.FirebaseMessagingService
+import com.google.firebase.messaging.RemoteMessage
+
+class MyFirebaseMessagingService : FirebaseMessagingService() {
+    override fun onMessageReceived(message: RemoteMessage) {
+        super.onMessageReceived(message)
+    }
+
+    override fun onNewToken(token: String) {
+        super.onNewToken(token)
+        Log.d("TAG", "onNewToken: $token")
+    }
+
+}

app/src/main/java/com/surveasy/surveasy/app/di/FirebaseModule.kt

@@ -2,6 +2,7 @@ package com.surveasy.surveasy.app.di
 
 import com.google.firebase.Firebase
 import com.google.firebase.auth.FirebaseAuth
+import com.google.firebase.messaging.FirebaseMessaging
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -20,4 +21,8 @@ object FirebaseModule {
     @Provides
     @Singleton
     fun provideFirebaseStorage(): Firebase = Firebase
+
+    @Provides
+    @Singleton
+    fun provideFirebaseMessaging(): FirebaseMessaging = FirebaseMessaging.getInstance()
 }

app/src/main/java/com/surveasy/surveasy/app/di/NetworkModule.kt

@@ -1,9 +1,9 @@
 package com.surveasy.surveasy.app.di
 
 import com.surveasy.surveasy.BuildConfig
-import com.surveasy.surveasy.app.DataStoreManager
 import com.surveasy.surveasy.data.config.AccessTokenInterceptor
 import com.surveasy.surveasy.data.config.BearerInterceptor
+import com.surveasy.surveasy.data.config.RetryInterceptor
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -23,12 +23,15 @@ object NetworkModule {
     fun provideOkHttpClient(
         httpLoggingInterceptor: HttpLoggingInterceptor,
         accessTokenInterceptor: AccessTokenInterceptor,
-        bearerInterceptor: BearerInterceptor
+        bearerInterceptor: BearerInterceptor,
+        retryInterceptor: RetryInterceptor,
     ): OkHttpClient {
 
         return OkHttpClient.Builder()
             .readTimeout(10000, TimeUnit.MILLISECONDS)
             .connectTimeout(10000, TimeUnit.MILLISECONDS)
+            .writeTimeout(10000, TimeUnit.MILLISECONDS)
+            .addInterceptor(retryInterceptor)
             .addInterceptor(httpLoggingInterceptor)
             .addNetworkInterceptor(accessTokenInterceptor)
             .addInterceptor(bearerInterceptor)
@@ -43,10 +46,6 @@ object NetworkModule {
         }
     }
 
-    @Provides
-    fun provideAccessTokenInterceptor(dataStoreManager: DataStoreManager): AccessTokenInterceptor =
-        AccessTokenInterceptor(dataStoreManager)
-
     @Provides
     fun provideRetrofit(okHttpClient: OkHttpClient): Retrofit {
 

app/src/main/java/com/surveasy/surveasy/app/di/RepositoryModule.kt

@@ -2,6 +2,7 @@ package com.surveasy.surveasy.app.di
 
 import com.google.firebase.Firebase
 import com.google.firebase.auth.FirebaseAuth
+import com.google.firebase.messaging.FirebaseMessaging
 import com.surveasy.surveasy.data.remote.SurveasyApi
 import com.surveasy.surveasy.data.repository.FirebaseRepositoryImpl
 import com.surveasy.surveasy.data.repository.PanelRepositoryImpl
@@ -25,8 +26,12 @@ object RepositoryModule {
 
     @Singleton
     @Provides
-    fun provideFirebaseRepository(fbAuth: FirebaseAuth, fb: Firebase): FirebaseRepository =
-        FirebaseRepositoryImpl(fbAuth, fb)
+    fun provideFirebaseRepository(
+        fbAuth: FirebaseAuth,
+        fb: Firebase,
+        fcm: FirebaseMessaging
+    ): FirebaseRepository =
+        FirebaseRepositoryImpl(fbAuth, fb, fcm)
 
     @Singleton
     @Provides