Merge pull request #38 from MONEYMONG/MONEYMONG-511

Moneymong 511 강제 업데이트 얼랏창 구현
MONEYMONG · Oct 27, 2024 · 21aac59 · 21aac59
2 parents 3c1feb0 + 964c26e
commit 21aac59
Show file tree

Hide file tree

Showing 43 changed files with 204 additions and 99 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,6 +1,4 @@
 import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
-import java.io.FileInputStream
-import java.util.Properties
 
 @Suppress("DSL_SCOPE_VIOLATION")
 plugins {
@@ -30,7 +28,7 @@ android {
         }
         buildConfigField("String", "NATIVE_APP_KEY", getApiKey("native_app_key"))
     }
-    buildFeatures{
+    buildFeatures {
         buildConfig = true
     }
 
@@ -74,6 +72,7 @@ dependencies {
 
     implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.compose.material3)
+    implementation(libs.lifecycle.runtime.compose)
     implementation(libs.orbit.core)
     implementation(libs.orbit.compose)
     implementation(libs.orbit.viewModel)
@@ -85,6 +84,6 @@ dependencies {
     androidTestImplementation(libs.androidx.test.espresso.core)
 }
 
-fun getApiKey(propertyKey : String): String {
+fun getApiKey(propertyKey: String): String {
     return gradleLocalProperties(rootDir).getProperty(propertyKey)
 }
diff --git a/app/src/main/java/com/moneymong/moneymong/MainActivity.kt b/app/src/main/java/com/moneymong/moneymong/MainActivity.kt
@@ -1,33 +1,30 @@
 package com.moneymong.moneymong
 
+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
-import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
+import androidx.activity.viewModels
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.lifecycle.compose.LifecycleStartEffect
 import com.moneymong.moneymong.common.event.EventTracker
-import dagger.hilt.android.AndroidEntryPoint
+import com.moneymong.moneymong.design_system.error.ErrorDialog
 import com.moneymong.moneymong.design_system.theme.MMTheme
-import com.moneymong.moneymong.domain.repository.TokenRepository
-import com.moneymong.moneymong.domain.repository.user.UserRepository
-import com.moneymong.moneymong.feature.sign.LoginScreen
-import com.moneymong.moneymong.feature.sign.SignUpScreen
-import com.moneymong.moneymong.ocr.OCRScreen
+import com.moneymong.moneymong.domain.repository.token.TokenRepository
 import com.moneymong.moneymong.ui.MoneyMongApp
-import kotlinx.coroutines.CoroutineDispatcher
+import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
+import org.orbitmvi.orbit.compose.collectAsState
 import javax.inject.Inject
-import kotlin.coroutines.CoroutineContext
 
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
+    private val viewModel: MainViewModel by viewModels()
 
     @Inject
     lateinit var tokenRepository: TokenRepository
@@ -41,7 +38,32 @@ class MainActivity : ComponentActivity() {
         eventTracker.initialize()
 
         setContent {
+            val context = LocalContext.current
+            val state by viewModel.collectAsState()
+
+            val shouldUpdate = state.shouldUpdate
+            LifecycleStartEffect(key1 = Unit, effects = {
+                viewModel.checkShouldUpdate(version = BuildConfig.VERSION_NAME)
+                onStopOrDispose { }
+            })
+
             MMTheme {
+                if (shouldUpdate) {
+                    ErrorDialog(
+                        message = "안정적인 머니몽 사용을 위해\n최신 버전으로 업데이트가 필요해요!",
+                        confirmText = "업데이트",
+                        onConfirm = {
+                            val playStoreUrl =
+                                "https://play.google.com/store/apps/details?id=${BuildConfig.APPLICATION_ID}"
+                            val intent = Intent(Intent.ACTION_VIEW).apply {
+                                data = Uri.parse(playStoreUrl)
+                                setPackage("com.android.vending")
+                            }
+                            context.startActivity(intent)
+                        }
+                    )
+                }
+
                 MoneyMongApp(expired.value) {
                     expired.value = false
                 }
@@ -54,12 +76,4 @@ class MainActivity : ComponentActivity() {
             }
         }
     }
-}
-
-@Composable
-fun Greeting(name: String, modifier: Modifier = Modifier) {
-    Text(
-        text = "Hello $name!",
-        modifier = modifier
-    )
 }
diff --git a/app/src/main/java/com/moneymong/moneymong/MainState.kt b/app/src/main/java/com/moneymong/moneymong/MainState.kt
@@ -3,5 +3,5 @@ package com.moneymong.moneymong
 import com.moneymong.moneymong.common.base.State
 
 data class MainState(
-    val something: Any? = null // TODO
+    val shouldUpdate: Boolean = false
 ): State
diff --git a/app/src/main/java/com/moneymong/moneymong/MainViewModel.kt b/app/src/main/java/com/moneymong/moneymong/MainViewModel.kt
@@ -1,9 +1,22 @@
 package com.moneymong.moneymong
 
 import com.moneymong.moneymong.common.base.BaseViewModel
+import com.moneymong.moneymong.domain.usecase.version.CheckVersionUpdateUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
+import org.orbitmvi.orbit.syntax.simple.intent
+import org.orbitmvi.orbit.syntax.simple.reduce
 import javax.inject.Inject
 
 @HiltViewModel
-class MainViewModel @Inject constructor() : BaseViewModel<MainState, MainSideEffect>(MainState()) {
+class MainViewModel @Inject constructor(
+    val checkVersionUpdateUseCase: CheckVersionUpdateUseCase
+) : BaseViewModel<MainState, MainSideEffect>(MainState()) {
+
+    fun checkShouldUpdate(version: String) = intent {
+        val shouldUpdate =
+            checkVersionUpdateUseCase(version = version).isFailure
+        reduce {
+            state.copy(shouldUpdate = shouldUpdate)
+        }
+    }
 }
diff --git a/core/design-system/src/main/java/com/moneymong/moneymong/design_system/error/ErrorDialog.kt b/core/design-system/src/main/java/com/moneymong/moneymong/design_system/error/ErrorDialog.kt
@@ -44,7 +44,8 @@ fun ErrorDialog(
     modifier: Modifier = Modifier,
     message: String,
     description: String = "",
-    onConfirm: () -> Unit
+    confirmText: String = "확인",
+    onConfirm: () -> Unit,
 ) {
     val horizontalPadding = 22.dp
     val buttonWidth = 276.dp
@@ -93,7 +94,7 @@ fun ErrorDialog(
             MDSButton(
                 modifier = Modifier.width(buttonWidth),
                 onClick = onConfirm,
-                text = "확인",
+                text = confirmText,
                 type = MDSButtonType.PRIMARY,
                 size = MDSButtonSize.LARGE,
             )

diff --git a/core/model/src/main/java/com/moneymong/moneymong/model/version/VersionRequest.kt b/core/model/src/main/java/com/moneymong/moneymong/model/version/VersionRequest.kt
@@ -0,0 +1,5 @@
+package com.moneymong.moneymong.model.version
+
+data class VersionRequest(
+    val version: String
+)
diff --git a/core/network/src/main/java/com/moneymong/moneymong/network/adapter/ResultCallAdapter.kt b/core/network/src/main/java/com/moneymong/moneymong/network/adapter/ResultCallAdapter.kt
@@ -48,12 +48,16 @@ private class ResultCall<T>(
                     return Result.failure(MoneyMongError.UnExpectedError)
                 }
 
-                val errorResponse = fromJsonToErrorResponse(errorBody)
-                val httpError = getErrorByStatusCode(
-                    statusCode = errorResponse.status,
-                    message = errorResponse.message
-                )
-                return Result.failure(httpError)
+                return try {
+                    val errorResponse = fromJsonToErrorResponse(errorBody)
+                    val httpError = getErrorByStatusCode(
+                        statusCode = errorResponse.status,
+                        message = errorResponse.message
+                    )
+                    Result.failure(httpError)
+                } catch (e: Exception) {
+                    Result.failure(MoneyMongError.UnExpectedError)
+                }
             }
 
             override fun onFailure(call: Call<T>, t: Throwable) {

diff --git a/core/network/src/main/java/com/moneymong/moneymong/network/api/MoneyMongApi.kt b/core/network/src/main/java/com/moneymong/moneymong/network/api/MoneyMongApi.kt
@@ -3,8 +3,8 @@ package com.moneymong.moneymong.network.api
 import com.moneymong.moneymong.model.ocr.FileUploadResponse
 import okhttp3.MultipartBody
 import retrofit2.http.Multipart
-import retrofit2.http.Part
 import retrofit2.http.POST
+import retrofit2.http.Part
 
 interface MoneyMongApi {
 

diff --git a/core/network/src/main/java/com/moneymong/moneymong/network/api/VersionApi.kt b/core/network/src/main/java/com/moneymong/moneymong/network/api/VersionApi.kt
@@ -0,0 +1,13 @@
+package com.moneymong.moneymong.network.api
+
+import com.moneymong.moneymong.model.version.VersionRequest
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+interface VersionApi {
+
+    @POST("api/v1/version")
+    suspend fun checkUpdate(
+        @Body version: VersionRequest
+    ): Result<Unit>
+}
diff --git a/core/network/src/main/java/com/moneymong/moneymong/network/di/NetworkModule.kt b/core/network/src/main/java/com/moneymong/moneymong/network/di/NetworkModule.kt
@@ -17,6 +17,7 @@ import com.moneymong.moneymong.network.api.MemberApi
 import com.moneymong.moneymong.network.api.MoneyMongApi
 import com.moneymong.moneymong.network.api.UniversityApi
 import com.moneymong.moneymong.network.api.UserApi
+import com.moneymong.moneymong.network.api.VersionApi
 import com.moneymong.moneymong.network.util.AuthInterceptor
 import com.moneymong.moneymong.network.util.MoneyMongTokenAuthenticator
 import dagger.Module
@@ -143,6 +144,10 @@ object NetworkModule {
     fun provideMemberApi(@MoneyMongRetrofit retrofit: Retrofit): MemberApi =
         retrofit.create(MemberApi::class.java)
 
+    @Provides
+    fun provideVersionApi(@MoneyMongRetrofit retrofit: Retrofit): VersionApi =
+        retrofit.create(VersionApi::class.java)
+
     @Provides
     fun provideClovaApi(@ClovaRetrofit retrofit: Retrofit): ClovaApi =
         retrofit.create(ClovaApi::class.java)

diff --git a/core/network/src/main/java/com/moneymong/moneymong/network/response/ErrorResponse.kt b/core/network/src/main/java/com/moneymong/moneymong/network/response/ErrorResponse.kt
@@ -1,7 +1,6 @@
 package com.moneymong.moneymong.network.response
 
 import com.google.gson.Gson
-import com.google.gson.annotations.SerializedName
 
 data class ErrorResponse(
     val status: Int,

diff --git a/core/network/src/main/java/com/moneymong/moneymong/network/util/AuthInterceptor.kt b/core/network/src/main/java/com/moneymong/moneymong/network/util/AuthInterceptor.kt
@@ -1,6 +1,6 @@
 package com.moneymong.moneymong.network.util
 
-import com.moneymong.moneymong.domain.repository.TokenRepository
+import com.moneymong.moneymong.domain.repository.token.TokenRepository
 import com.moneymong.moneymong.network.BuildConfig
 import kotlinx.coroutines.runBlocking
 import okhttp3.Interceptor
@@ -24,9 +24,11 @@ class AuthInterceptor @Inject constructor(
             tokenRepository.getAccessToken()
         }
 
-        val newRequest = originalRequest.newBuilder()
-            .addHeader("Authorization", "Bearer ${accessToken.getOrNull()}")
-            .build()
+        val newRequest = originalRequest.newBuilder().apply {
+            accessToken.getOrNull()?.let {
+                addHeader("Authorization", "Bearer $it")
+            } ?: addHeader("Authorization", "null")
+        }.build()
 
         return chain.proceed(newRequest)
     }

diff --git a/...network/src/main/java/com/moneymong/moneymong/network/util/MoneyMongTokenAuthenticator.kt b/...network/src/main/java/com/moneymong/moneymong/network/util/MoneyMongTokenAuthenticator.kt
@@ -1,6 +1,6 @@
 package com.moneymong.moneymong.network.util
 
-import com.moneymong.moneymong.domain.repository.TokenRepository
+import com.moneymong.moneymong.domain.repository.token.TokenRepository
 import com.moneymong.moneymong.network.BuildConfig
 import kotlinx.coroutines.runBlocking
 import okhttp3.Authenticator

diff --git a/core/ui/src/main/java/com/moneymong/moneymong/ui/RippleEffect.kt b/core/ui/src/main/java/com/moneymong/moneymong/ui/RippleEffect.kt
diff --git a/.../src/main/java/com/moneymong/moneymong/data/datasource/version/VersionRemoteDataSource.kt b/.../src/main/java/com/moneymong/moneymong/data/datasource/version/VersionRemoteDataSource.kt
@@ -0,0 +1,6 @@
+package com.moneymong.moneymong.data.datasource.version
+
+interface VersionRemoteDataSource {
+
+    suspend fun checkUpdate(version: String): Result<Unit>
+}
diff --git a/.../main/java/com/moneymong/moneymong/data/datasource/version/VersionRemoteDataSourceImpl.kt b/.../main/java/com/moneymong/moneymong/data/datasource/version/VersionRemoteDataSourceImpl.kt
@@ -0,0 +1,13 @@
+package com.moneymong.moneymong.data.datasource.version
+
+import com.moneymong.moneymong.model.version.VersionRequest
+import com.moneymong.moneymong.network.api.VersionApi
+import javax.inject.Inject
+
+class VersionRemoteDataSourceImpl @Inject constructor(
+    private val versionApi: VersionApi
+) : VersionRemoteDataSource {
+    override suspend fun checkUpdate(version: String): Result<Unit> {
+        return versionApi.checkUpdate(VersionRequest(version = version))
+    }
+}
diff --git a/data/src/main/java/com/moneymong/moneymong/data/di/DataSourceModule.kt b/data/src/main/java/com/moneymong/moneymong/data/di/DataSourceModule.kt
@@ -24,6 +24,8 @@ import com.moneymong.moneymong.data.datasource.user.UserLocalDataSource
 import com.moneymong.moneymong.data.datasource.user.UserLocalDataSourceImpl
 import com.moneymong.moneymong.data.datasource.user.UserRemoteDataSource
 import com.moneymong.moneymong.data.datasource.user.UserRemoteDataSourceImpl
+import com.moneymong.moneymong.data.datasource.version.VersionRemoteDataSource
+import com.moneymong.moneymong.data.datasource.version.VersionRemoteDataSourceImpl
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -92,4 +94,9 @@ interface DataSourceModule {
     fun bindLedgerDetailRemoteDataSource(
         ledgerDetailRemoteDataSourceImpl: LedgerDetailRemoteDataSourceImpl
     ): LedgerDetailRemoteDataSource
+
+    @Binds
+    fun bindVersionRemoteDataSource(
+        versionRemoteDataSourceImpl: VersionRemoteDataSourceImpl
+    ): VersionRemoteDataSource
 }