🔀 :: (#51) packgename을 대문자에서 소문자로 변경했습니다.

build.gradle.kts

@@ -7,3 +7,21 @@ plugins {
     id(Dependency.Google.GOOGLE_SERVICES_PLUGIN) version Versions.GOOGLE_SERVICE_PLUGIN apply false
     id(Dependency.Gradle.KSP) version Versions.KSP apply false
 }
+
+
+allprojects {
+    tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinCompile::class.java).configureEach {
+        kotlinOptions {
+            if (project.findProperty("enableMultiModuleComposeReports") == "true") {
+                freeCompilerArgs += listOf(
+                    "-P",
+                    "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=" + rootProject.buildDir.absolutePath + "/compose_metrics/"
+                )
+                freeCompilerArgs += listOf(
+                    "-P",
+                    "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=" + rootProject.buildDir.absolutePath + "/compose_metrics/"
+                )
+            }
+        }
+    }
+}

buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/counters.tab

@@ -1,2 +1,2 @@
-6
+5
 0

buildSrc/src/main/kotlin/Dependency.kt

@@ -33,7 +33,6 @@ object Dependency {
 
         const val GOOGLE_SERVICES_PLUGIN = "com.google.gms.google-services"
 
-
         const val SWIPE_REFRESH ="com.google.accompanist:accompanist-swiperefresh:${Versions.SWIPE_REFRESH}"
     }
 

buildSrc/src/main/kotlin/ProjectProperties.kt

@@ -21,8 +21,8 @@ object ProjectProperties {
         const val MIN_SDK = 26
         const val TARGET_SDK = 34
         const val JVM_TARGET = "17"
-        const val VERSION_CODE = 1
-        const val VERSION_NAME = "1.0"
+        const val VERSION_CODE = 20
+        const val VERSION_NAME = "1.2.9"
         const val KOTLIN_COMPILER_EXTENSION = "1.4.3"
 
         val JAVA_VERSION = JavaVersion.VERSION_17

presentation/build.gradle.kts

@@ -1,5 +1,4 @@
 
-
 plugins {
     id(Dependency.Gradle.KOTLIN)
     id(Dependency.Gradle.LIBRARY)

presentation/src/main/java/view/login/screen/LoginScreen.kt

@@ -9,6 +9,9 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -20,24 +23,75 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.msg.gauthsignin.GAuthSigninWebView
 import view.login.component.DoMaGAthButton
+import viewmodel.login.AuthViewModel
+import viewmodel.login.uistate.LoginUiState
+import viewmodel.login.uistate.SaveTokenUiState
 
 @Composable
 internal fun LoginRoute(
-    navigateToHome: () -> Unit,
     modifier: Modifier = Modifier,
+    navigateToHome: () -> Unit,
+    authViewModel: AuthViewModel = hiltViewModel(),
 ) {
-    //구현할 예정입니다.
+    val saveTokenUiState by authViewModel.saveTokenUiState.collectAsStateWithLifecycle()
+    val loginUiState by authViewModel.loginUiState.collectAsStateWithLifecycle()
+    val (ClickButton, leIsClickLoginButton) = rememberSaveable { mutableStateOf(false) }
+
+    LoginScreen(
+        modifier = modifier,
+        ClickButton = ClickButton,
+        loginUiState = loginUiState,
+        saveTokenUiState = saveTokenUiState,
+        onErrorToast = { throwable, message ->  },
+        navigateToHome = navigateToHome,
+        gAuthLogin = { code -> authViewModel.gAuthLogin(code = code)  },
+        leIsClickLoginButton = {leIsClickLoginButton(!ClickButton)}
+
+    )
 }
 
+
+
+
 @Composable
 fun LoginScreen(
     modifier: Modifier = Modifier,
-    ClickButton: () -> Unit,
-    navigateToHome: () -> Unit
+    ClickButton: Boolean,
+    loginUiState: LoginUiState,
+    leIsClickLoginButton: () -> Unit,
+    gAuthLogin: (String) -> Unit,
+    navigateToHome: () -> Unit,
+    saveTokenUiState: SaveTokenUiState,
+    onErrorToast: (throwable: Throwable?, message: Int?) -> Unit
 
-    ) {
-    Column(
+) {
+
+    when (loginUiState) {
+        is LoginUiState.Loading -> Unit
+        is LoginUiState.Success -> {
+            when (saveTokenUiState) {
+                is SaveTokenUiState.Success -> {
+                    navigateToHome()
+                }
+
+                is SaveTokenUiState.Error -> {
+                    onErrorToast(saveTokenUiState.exception, 0)
+                }
+
+                is SaveTokenUiState.Loading -> Unit
+            }
+        }
+
+        is LoginUiState.Error -> {
+            onErrorToast(loginUiState.exception, 0)
+
+        }
+    }
+    Column (
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Center,
         modifier = modifier
@@ -84,7 +138,15 @@ fun LoginScreen(
                     ),
                     verticalAlignment = Alignment.CenterVertically
                 ) {
-                    DoMaGAthButton(onClick = ClickButton)
+                    DoMaGAthButton(onClick = leIsClickLoginButton)
+                }
+            }
+            if (ClickButton){
+                GAuthSigninWebView(
+                    clientId = "ghskfend",
+                    redirectUri = "ghskfen"
+                ){
+                        code -> gAuthLogin(code)
                 }
             }
         }
@@ -95,6 +157,13 @@ fun LoginScreen(
 @Preview
 @Composable
 fun PreviewLoginScreen() {
-    LoginScreen(ClickButton = {}, navigateToHome = {})
-}
-
+    LoginScreen(
+        ClickButton = false,
+        navigateToHome = {},
+        onErrorToast = { _, _ -> },
+        saveTokenUiState = SaveTokenUiState.Loading,
+        loginUiState = LoginUiState.Loading,
+        gAuthLogin = {},
+        leIsClickLoginButton = {}
+    )
+}

presentation/src/main/java/viewModel/login/uiState/LoginUiState.kt

@@ -1,4 +1,4 @@
-package viewModel.login.uiState
+package viewmodel.login.uistate
 
 sealed interface LoginUiState {
     object Loading : LoginUiState

presentation/src/main/java/viewModel/login/uiState/SaveTokenUiState.kt

@@ -1,4 +1,4 @@
-package viewModel.login.uiState
+package viewmodel.login.uistate
 
 sealed interface SaveTokenUiState {
     object Loading : SaveTokenUiState

presentation/src/main/java/viewModel/users/UsersViewModel.kt

@@ -1,16 +1,18 @@
-package viewModel.users
+package viewmodel.users
 
 import Untill.Result
 import Untill.asResult
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import usecase.Users.GetUsersUseCase
-import viewModel.UIstate.UsersUiState
+import viewmodel.users.uistate.UsersUiState
+
 import javax.inject.Inject
 
 @HiltViewModel
@@ -37,11 +39,10 @@ class UsersViewModel @Inject constructor(
                         if (result.data.isEmpty()) {
                             _usersUiState.value = UsersUiState.Empty
                         } else {
-                            _usersUiState.value = UsersUiState.Success(result.data)
+                            _usersUiState.value = UsersUiState.Success(result.data.toImmutableList())
                         }
                     }
                 }
             }
     }
-}
-
+}

presentation/src/main/java/viewModel/UIstate/UsersUiState.kt → presentation/src/main/java/viewModel/users/uistate/UsersUiState.kt

@@ -1,10 +1,11 @@
-package viewModel.UIstate
+package viewmodel.users.uistate
 
+import kotlinx.collections.immutable.ImmutableList
 import model.users.response.UsersResponseModel
 
 sealed interface UsersUiState {
     object Loading : UsersUiState
     object Empty : UsersUiState
-    data class Success(val data: List<UsersResponseModel>) : UsersUiState
+    data class Success(val data: ImmutableList<UsersResponseModel>) : UsersUiState
     object Fail : UsersUiState
 }

presentation/src/main/java/viewModel/login/AuthViewModel.kt → presentation/src/main/java/viewmodel/login/AuthViewModel.kt

@@ -11,8 +11,8 @@ import model.auth.request.GAuthLoginRequestBodyModel
 import model.auth.response.GAuthLoginResponseModel
 import usecase.auth.GAuthLoginUseCase
 import usecase.auth.SaveTokenUseCase
-import viewModel.login.uiState.LoginUiState
-import viewModel.login.uiState.SaveTokenUiState
+import viewmodel.login.uistate.LoginUiState
+import viewmodel.login.uistate.SaveTokenUiState
 import javax.inject.Inject
 
 @HiltViewModel
@@ -54,6 +54,4 @@ class AuthViewModel @Inject constructor(
                 _saveTokenUiState.value = SaveTokenUiState.Error(exception)
             }
     }
-
-
 }

presentation/src/main/res/values/string.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="stringResource">%s: %d</string>
-    <string name="CleanResource">%d회</string>
-    <string name="DemeritList">%s - %d회</string>
-    <string name="Rank">%d등</string>
+    <string name="stringResource">%1$s: %2$d</string>
+    <string name="CleanResource">%1$d회</string>
+    <string name="DemeritList">%1$s - %2$d회</string>
+    <string name="Rank">%1$d등</string>
 </resources>