di_mbwork

2025-03-25 14:47:18 +03:00 · 2025-03-25 14:47:18 +03:00 · d354217dda
commit d354217dda
parent 74e05a9501
6 changed files with 128 additions and 101 deletions
--- a/app/src/main/java/com/example/shoesapptest/MainActivity.kt
+++ b/app/src/main/java/com/example/shoesapptest/MainActivity.kt
@ -12,42 +12,50 @@ import com.example.shoesapp.ui.theme.MatuleTheme
 import com.example.shoesapptest.data.local.DataStore
 import com.example.shoesapptest.data.remote.network.RetrofitClient
 import com.example.shoesapptest.data.repository.AuthRepository
+import com.example.shoesapptest.di.appModules
 import com.example.shoesapptest.domain.usecase.AuthUseCase
 import com.example.shoesapptest.screen.forgotpassword.ForgotPassScreen
 import com.example.shoesapptest.screen.regscreen.RegisterAccountScreen
-import com.example.shoesapptest.screen.regscreen.RegistrationScreen
+import org.koin.core.context.GlobalContext
+import org.koin.core.context.startKoin

 class MainActivity : ComponentActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        enableEdgeToEdge()
+
        setContent {
            MatuleTheme {
+
+                if (GlobalContext.getOrNull() == null) {
+                    startKoin {
+                        modules(appModules)
+                    }
+                }
+
                val navController = rememberNavController()
-                val dataStore = DataStore(applicationContext)
-                val repository = AuthRepository(RetrofitClient.auth)
-                val authUseCase = AuthUseCase(dataStore, repository)

                NavHost(
                    navController = navController,
-                    startDestination = "signin"
+                    startDestination = Screen.SignIn.route
                ) {
-                    composable("signin") {
+                    composable(Screen.SignIn.route) {
                        SigninScreen(
                            onNavigationToRegScreen = {
-                                navController.navigate("registration")
+                                navController.navigate(Screen.Registration.route)
                            },
                            navController = navController
                        )
                    }
-                    composable("forgotpass") {
-                        ForgotPassScreen(onNavigateToSignInScreen = {
-                            navController.navigate("signin")
-                        })
+                    composable(Screen.ForgotPass.route) {
+                        ForgotPassScreen(
+                            onNavigateToSignInScreen = {
+                                navController.popBackStack()
+                            }
+                        )
                    }
-                    composable("registration") {
+                    composable(Screen.Registration.route) {
                        RegisterAccountScreen(
-                            registrationScreen = RegistrationScreen("Test"),
                            onNavigationToSigninScreen = {
                                navController.popBackStack()
                            }
--- a/app/src/main/java/com/example/shoesapptest/Screen.kt
+++ b/app/src/main/java/com/example/shoesapptest/Screen.kt
@ -0,0 +1,8 @@
+package com.example.shoesapptest
+
+
+sealed class Screen(val route: String) {
+    object SignIn : Screen("signin")
+    object ForgotPass : Screen("forgotpass")
+    object Registration : Screen("registration")
+}
--- a/app/src/main/java/com/example/shoesapptest/di/appModules.kt
+++ b/app/src/main/java/com/example/shoesapptest/di/appModules.kt
@ -4,6 +4,7 @@ import com.example.shoesapptest.data.local.DataStore
 import com.example.shoesapptest.data.remote.network.RetrofitClient
 import com.example.shoesapptest.data.remote.network.auth.AuthRemoteSource
 import com.example.shoesapptest.data.repository.AuthRepository
+import com.example.shoesapptest.domain.usecase.AuthUseCase
 import com.example.shoesapptest.screen.regscreen.RegistrationViewModel
 import org.koin.core.module.dsl.viewModel
 import org.koin.dsl.module
@ -12,5 +13,6 @@ val appModules = module {
    single{ DataStore(get())}
    single <AuthRemoteSource> {RetrofitClient.auth}
    single <AuthRepository> {AuthRepository(get()) }
+    single { AuthUseCase(get (),get()) }
    viewModel { RegistrationViewModel(get()) }
 }
--- a/app/src/main/java/com/example/shoesapptest/screen/regscreen/RegisterAccScreen.kt
+++ b/app/src/main/java/com/example/shoesapptest/screen/regscreen/RegisterAccScreen.kt
@ -1,6 +1,7 @@
 package com.example.shoesapptest.screen.regscreen

 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@ -16,13 +17,17 @@ import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.ClickableText
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.Checkbox
+import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@ -51,25 +56,19 @@ import com.example.shoesapptest.screen.regscreen.component.RegisterButton
 import com.example.shoesapptest.screen.regscreen.component.RegistrationTextField
 import com.example.shoesapptest.screen.regscreen.component.TitleAndSubTitle
 import com.example.shoesapptest.screen.signin.component.AuthTextField
+import org.koin.compose.viewmodel.koinViewModel

-data class RegistrationScreen(val sampleText: String)

@Composable
 fun RegisterAccountScreen(
-    registrationScreen: RegistrationScreen,
-    onNavigationToSigninScreen: () -> Unit
+    onNavigationToSigninScreen: () -> Unit,
+    viewModel: RegistrationViewModel = koinViewModel()
 ) {
-    val dataStore = DataStore(LocalContext.current)
-    val repository = AuthRepository(RetrofitClient.auth)
-    val authUseCase = AuthUseCase(dataStore, repository)
-    val registrationViewModel: RegistrationViewModel = viewModel(
-        factory = object : ViewModelProvider.Factory {
-            override fun <T : ViewModel> create(modelClass: Class<T>): T {
-                return RegistrationViewModel(authUseCase) as T
-            }
-        }
-    )
+
+    val snackbarHostState = remember { SnackbarHostState() }
+
    Scaffold(
+        snackbarHost = { SnackbarHost(snackbarHostState) },
        topBar = {
            Row(
                modifier = Modifier
@ -77,7 +76,7 @@ fun RegisterAccountScreen(
                    .fillMaxWidth()
                    .height(40.dp)
            ) {
-                IconButton(onClick = {}) {
+                IconButton(onClick = onNavigationToSigninScreen) {
                    Icon(
                        painter = painterResource(R.drawable.back_arrow),
                        contentDescription = null
@ -90,7 +89,11 @@ fun RegisterAccountScreen(
                modifier = Modifier
                    .padding(bottom = 50.dp)
                    .fillMaxWidth()
-                    .height(40.dp),
+                    .height(40.dp)
+                    .clickable(
+                        interactionSource = remember { MutableInteractionSource() },
+                        indication = null
+                    ) { onNavigationToSigninScreen() },
                horizontalArrangement = Arrangement.Center,
                verticalAlignment = Alignment.CenterVertically
            ) {
@ -102,73 +105,76 @@ fun RegisterAccountScreen(
            }
        }
    ) { paddingValues ->
-        RegisterAccountContent(
-            paddingValues = paddingValues,
-            registrationViewModel = registrationViewModel,
-            registrationScreen = registrationScreen,
-            onNavigationToSigninScreen = onNavigationToSigninScreen
-        )
-    }
-}
+        val state = viewModel.registrationScreenState.value

-@Composable
-fun RegisterAccountContent(
-    paddingValues: PaddingValues,
-    registrationViewModel: RegistrationViewModel,
-    registrationScreen: RegistrationScreen,
-    onNavigationToSigninScreen: () -> Unit
-) {
-    val reg = registrationViewModel.registrationScreenState.value
-    Column(
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(20.dp)
-    ) {
-        TitleAndSubTitle(
-            title = "Регистрация",
-            subText = "Заполните Свои данные или продолжите через социальные медиа"
-        )
+        LaunchedEffect(state.isSignedIn) {
+            if (state.isSignedIn) {
+                onNavigationToSigninScreen()
+            }
+        }

-        Spacer(modifier = Modifier.height(20.dp))
+        LaunchedEffect(state.errorMessage) {
+            state.errorMessage?.let {
+                snackbarHostState.showSnackbar(it)
+                viewModel.setErrorMessage(null)
+            }
+        }

-        RegistrationTextField(
-            value = reg.name,
-            onChangeValue = { registrationViewModel.setName(it) },
-            isError = false,
-            supportingText = { Text(text = "Неверное имя пользователя") },
-            placeholder = { Text(text = stringResource(R.string.PasswordPlaceHolder)) },
-            label = { Text(text = "Ваше имя") }
-        )
+        Column(
+            modifier = Modifier
+                .padding(paddingValues)
+                .fillMaxWidth()
+                .padding(20.dp)
+        ) {
+            TitleAndSubTitle(
+                title = "Регистрация",
+                subText = "Заполните Свои данные или продолжите через социальные медиа"
+            )

-        RegistrationTextField(
-            value = reg.email,
-            onChangeValue = { registrationViewModel.setEmail(it) },
-            isError = registrationViewModel.emailHasError,
-            supportingText = { Text(text = stringResource(R.string.LoginError)) },
-            placeholder = { Text(text = stringResource(R.string.template_email)) },
-            label = { Text(text = stringResource(R.string.email)) },
-        )
+            Spacer(modifier = Modifier.height(20.dp))

-        RegistrationTextField(
-            value = reg.password,
-            onChangeValue = { registrationViewModel.setPassword(it) },
-            isError = false,
-            supportingText = { Text(text = stringResource(R.string.PasswordError)) },
-            placeholder = { Text(text = stringResource(R.string.PasswordPlaceHolder)) },
-            label = { Text(text = stringResource(R.string.Password)) }
-        )
+            RegistrationTextField(
+                value = state.name,
+                onChangeValue = { viewModel.setName(it) },
+                isError = false,
+                supportingText = { Text(text = "Неверное имя пользователя") },
+                placeholder = { Text(text = stringResource(R.string.PasswordPlaceHolder)) },
+                label = { Text(text = "Ваше имя") }
+            )

-        SimpleCheckbox()
+            RegistrationTextField(
+                value = state.email,
+                onChangeValue = { viewModel.setEmail(it) },
+                isError = state.emailHasError,
+                supportingText = { Text(text = stringResource(R.string.LoginError)) },
+                placeholder = { Text(text = stringResource(R.string.template_email)) },
+                label = { Text(text = stringResource(R.string.email)) },
+            )

-        Text(registrationScreen.sampleText)
-        RegisterButton(onClick = {registrationViewModel.register { onNavigationToSigninScreen() }}) {
-            Text(text = stringResource(R.string.Registration))
+            RegistrationTextField(
+                value = state.password,
+                onChangeValue = { viewModel.setPassword(it) },
+                isError = false,
+                supportingText = { Text(text = stringResource(R.string.PasswordError)) },
+                placeholder = { Text(text = stringResource(R.string.PasswordPlaceHolder)) },
+                label = { Text(text = stringResource(R.string.Password)) }
+            )
+
+            SimpleCheckbox()
+
+            RegisterButton(onClick = { viewModel.register { } }) {
+                if (state.isLoading) {
+                    CircularProgressIndicator()
+                } else {
+                    Text(text = stringResource(R.string.Registration))
+                }
+            }
        }
    }
 }

@Composable
-fun SimpleCheckbox() {
+private fun SimpleCheckbox() {
    val isChecked = remember { mutableStateOf(false) }

    Row(
@ -181,11 +187,8 @@ fun SimpleCheckbox() {
            checked = isChecked.value,
            onCheckedChange = { isChecked.value = it }
        )
-        ClickableText(
-            text = AnnotatedString(
-                "Даю согласие на обработку персональных данных"
-            ),
-            onClick = {},
+        Text(
+            text = "Даю согласие на обработку персональных данных",
            style = MatuleTheme.typography.bodyRegular16.copy(color = MatuleTheme.colors.text),
            modifier = Modifier.padding(start = 8.dp)
        )
--- a/app/src/main/java/com/example/shoesapptest/screen/regscreen/RegistrationViewModel.kt
+++ b/app/src/main/java/com/example/shoesapptest/screen/regscreen/RegistrationViewModel.kt
@ -9,14 +9,9 @@ import com.example.shoesapptest.domain.usecase.AuthUseCase
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch

-class RegistrationViewModel(private val authUseCase: AuthUseCase) : ViewModel() {
-    private val _registrationScreenState = mutableStateOf(RegistrationScreenState())
-    val registrationScreenState = _registrationScreenState
-
-
-    val emailHasError: Boolean
-        get() = _registrationScreenState.value.emailHasError

+class RegistrationViewModel(val authUseCase: AuthUseCase) : ViewModel() {
+    val registrationScreenState = mutableStateOf(RegistrationScreenState())

    fun setEmail(email: String) {
        registrationScreenState.value = registrationScreenState.value.copy(
@ -33,7 +28,7 @@ class RegistrationViewModel(private val authUseCase: AuthUseCase) : ViewModel()
        registrationScreenState.value = registrationScreenState.value.copy(name = name)
    }

-    private fun setErrorMessage(message: String) {
+    fun setErrorMessage(message: String?) {
        registrationScreenState.value = registrationScreenState.value.copy(errorMessage = message)
    }

--- a/app/src/main/java/com/example/shoesapptest/screen/signin/SigninScreen.kt
+++ b/app/src/main/java/com/example/shoesapptest/screen/signin/SigninScreen.kt
@ -47,8 +47,12 @@ import com.example.shoesapptest.screen.signin.component.AuthTextField
 import com.example.shoesapptest.screen.signin.component.TitleWithSubtitleText

@Composable
-fun SigninScreen(onNavigationToRegScreen: () -> Unit, navController: NavController) {
+fun SigninScreen(
+    onNavigationToRegScreen: () -> Unit,
+    navController: NavController
+) {
    val signInViewModel: SignInViewMode = viewModel()
+
    Scaffold(
        topBar = {
            Row(
@ -57,7 +61,7 @@ fun SigninScreen(onNavigationToRegScreen: () -> Unit, navController: NavControll
                    .fillMaxWidth()
                    .height(40.dp)
            ) {
-                IconButton(onClick = {}) {
+                IconButton(onClick = { navController.popBackStack() }) {
                    Icon(
                        painter = painterResource(R.drawable.back_arrow),
                        contentDescription = null
@ -73,17 +77,24 @@ fun SigninScreen(onNavigationToRegScreen: () -> Unit, navController: NavControll
                    .padding(bottom = 50.dp)
                    .fillMaxWidth()
                    .height(40.dp)
+                    .clickable(
+                        interactionSource = remember { MutableInteractionSource() },
+                        indication = null
+                    ) { onNavigationToRegScreen() }
            ) {
                Text(
                    stringResource(R.string.sign_up),
                    style = MatuleTheme.typography.bodyRegular16.copy(color = MatuleTheme.colors.text),
-                    textAlign = TextAlign.Center,
-                    modifier = Modifier.clickable { onNavigationToRegScreen() }
+                    textAlign = TextAlign.Center
                )
            }
        }
    ) { paddingValues ->
-        SignInContent(paddingValues, signInViewModel, navController)
+        SignInContent(
+            paddingValues = paddingValues,
+            signInViewMode = signInViewModel,
+            navController = navController
+        )
    }
 }