diff --git a/app/src/main/java/org/sopt/and/MainActivity.kt b/app/src/main/java/org/sopt/and/MainActivity.kt index d28aa84e..5435890a 100644 --- a/app/src/main/java/org/sopt/and/MainActivity.kt +++ b/app/src/main/java/org/sopt/and/MainActivity.kt @@ -16,10 +16,9 @@ import org.sopt.and.signup.SignUpScreen import org.sopt.and.signin.SignInScreen import org.sopt.and.ui.theme.ANDANDROIDTheme -import org.sopt.and.viewmodel.SignViewModel +import org.sopt.and.presentation.viewmodel.SignViewModel import dagger.hilt.android.AndroidEntryPoint -import dagger.hilt.android.HiltAndroidApp @AndroidEntryPoint class MainActivity : ComponentActivity() { diff --git a/app/src/main/java/org/sopt/and/MainScreen.kt b/app/src/main/java/org/sopt/and/MainScreen.kt index 81adb7a4..cd721e29 100644 --- a/app/src/main/java/org/sopt/and/MainScreen.kt +++ b/app/src/main/java/org/sopt/and/MainScreen.kt @@ -22,7 +22,7 @@ import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.compose.rememberNavController import org.sopt.and.navigation.BottomNavigationGraph import org.sopt.and.navigation.BottomNavigation -import org.sopt.and.viewmodel.SignViewModel +import org.sopt.and.presentation.viewmodel.SignViewModel @Composable fun MainScreen(signViewModel: SignViewModel) { diff --git a/app/src/main/java/org/sopt/and/myinfo/MyScreen.kt b/app/src/main/java/org/sopt/and/myinfo/MyScreen.kt index e614936d..bf7e0b14 100644 --- a/app/src/main/java/org/sopt/and/myinfo/MyScreen.kt +++ b/app/src/main/java/org/sopt/and/myinfo/MyScreen.kt @@ -2,7 +2,6 @@ package org.sopt.and.myinfo import android.annotation.SuppressLint import android.util.Log -import androidx.annotation.ColorRes import androidx.compose.foundation.background import androidx.compose.foundation.layout.* import androidx.compose.material.icons.Icons @@ -15,7 +14,6 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment @@ -26,7 +24,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import kotlinx.coroutines.launch -import org.sopt.and.viewmodel.SignViewModel +import org.sopt.and.presentation.viewmodel.SignViewModel enum class BottomNavItem(val icon: ImageVector, val description: String) { Home(Icons.Default.Home, "홈"), diff --git a/app/src/main/java/org/sopt/and/navigation/BottomNavigationGraph.kt b/app/src/main/java/org/sopt/and/navigation/BottomNavigationGraph.kt index 32a73af0..a2d3bd21 100644 --- a/app/src/main/java/org/sopt/and/navigation/BottomNavigationGraph.kt +++ b/app/src/main/java/org/sopt/and/navigation/BottomNavigationGraph.kt @@ -7,7 +7,7 @@ import androidx.navigation.compose.composable import org.sopt.and.home.HomeScreen import org.sopt.and.myinfo.MyScreen import org.sopt.and.search.SearchScreen -import org.sopt.and.viewmodel.SignViewModel +import org.sopt.and.presentation.viewmodel.SignViewModel @Composable diff --git a/app/src/main/java/org/sopt/and/presentation/viewmodel/SignViewModel.kt b/app/src/main/java/org/sopt/and/presentation/viewmodel/SignViewModel.kt index 55bf5aa0..d383f0e6 100644 --- a/app/src/main/java/org/sopt/and/presentation/viewmodel/SignViewModel.kt +++ b/app/src/main/java/org/sopt/and/presentation/viewmodel/SignViewModel.kt @@ -1,4 +1,4 @@ -package org.sopt.and.viewmodel +package org.sopt.and.presentation.viewmodel import android.app.Application import android.content.SharedPreferences @@ -155,11 +155,11 @@ class SignViewModel @Inject constructor( private fun isPasswordComplexEnough(password: String): Boolean { val criteriaCount = listOf( - Constants.LOWER_CASE_REGEX.containsMatchIn(password), - Constants.UPPER_CASE_REGEX.containsMatchIn(password), - Constants.DIGIT_REGEX.containsMatchIn(password), - Constants.SPECIAL_REGEX.containsMatchIn(password) + LOWER_CASE_REGEX.containsMatchIn(password), + UPPER_CASE_REGEX.containsMatchIn(password), + DIGIT_REGEX.containsMatchIn(password), + SPECIAL_REGEX.containsMatchIn(password) ).count { it } - return criteriaCount >= Constants.PASSWORD_CRITERIA_COUNT + return criteriaCount >= PASSWORD_CRITERIA_COUNT } } \ No newline at end of file diff --git a/app/src/main/java/org/sopt/and/signin/SignInScreen.kt b/app/src/main/java/org/sopt/and/signin/SignInScreen.kt index fcf209b9..290ec9d3 100644 --- a/app/src/main/java/org/sopt/and/signin/SignInScreen.kt +++ b/app/src/main/java/org/sopt/and/signin/SignInScreen.kt @@ -12,7 +12,7 @@ import kotlinx.coroutines.launch import org.sopt.and.R import org.sopt.and.components.AuthSignButton -import org.sopt.and.viewmodel.SignViewModel +import org.sopt.and.presentation.viewmodel.SignViewModel import org.sopt.and.components.CustomTextField import org.sopt.and.components.SignTopBar diff --git a/app/src/main/java/org/sopt/and/signup/SignUpScreen.kt b/app/src/main/java/org/sopt/and/signup/SignUpScreen.kt index a4ea66d2..2c58e9c2 100644 --- a/app/src/main/java/org/sopt/and/signup/SignUpScreen.kt +++ b/app/src/main/java/org/sopt/and/signup/SignUpScreen.kt @@ -1,6 +1,5 @@ package org.sopt.and.signup -import android.widget.Toast import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* @@ -19,7 +18,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.sopt.and.R import org.sopt.and.components.AuthSignButton -import org.sopt.and.viewmodel.SignViewModel +import org.sopt.and.presentation.viewmodel.SignViewModel import org.sopt.and.components.CustomTextField import org.sopt.and.components.SignTopBar