From 8b06ccdaa227cbb419a2dcd806cab4a7d949fc5f Mon Sep 17 00:00:00 2001
From: michael <ikits2002@gmail.com>
Date: Tue, 18 Apr 2023 01:50:35 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=D1=8B=20=D0=B0=D1=83?=
 =?UTF-8?q?=D0=BD=D1=82=D0=B8=D1=84=D0=B8=D0=BA=D0=B0=D1=86=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/ru/megboyzz/dnevnik/MainActivity.kt  |  7 ++-
 .../authorization/AuthorizationManager.kt     |  2 +
 .../megboyzz/dnevnik/screens/LoginScreen.kt   | 51 ++++++++++++-------
 .../viewmodel/AuthorizationViewModel.kt       |  5 +-
 4 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/ru/megboyzz/dnevnik/MainActivity.kt b/app/src/main/java/ru/megboyzz/dnevnik/MainActivity.kt
index 7472a8f..70b3a4b 100644
--- a/app/src/main/java/ru/megboyzz/dnevnik/MainActivity.kt
+++ b/app/src/main/java/ru/megboyzz/dnevnik/MainActivity.kt
@@ -53,12 +53,17 @@ class MainActivity : ComponentActivity() {
         GlobalScope.launch(Dispatchers.IO) {
 
             val credentialsDao = app.database.credentialsDao()
+            val globalUserContext = app.database.globalUserContextDao()
 
             if(credentialsDao.credentialsIsExists()) {
                 val credentials = credentialsDao.getCredentials()
-                if (!credentials.rememberMe)
+                if (!credentials.rememberMe) {
                     credentialsDao.deleteCredentials()
+                    globalUserContext.deleteGlobalUserContext()
+                }
             }
+
+
         }
 
     }
diff --git a/app/src/main/java/ru/megboyzz/dnevnik/authorization/AuthorizationManager.kt b/app/src/main/java/ru/megboyzz/dnevnik/authorization/AuthorizationManager.kt
index 8e1b295..5515af6 100644
--- a/app/src/main/java/ru/megboyzz/dnevnik/authorization/AuthorizationManager.kt
+++ b/app/src/main/java/ru/megboyzz/dnevnik/authorization/AuthorizationManager.kt
@@ -1,5 +1,6 @@
 package ru.megboyzz.dnevnik.authorization
 
+import android.util.Log
 import com.google.gson.Gson
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import org.jsoup.Connection
@@ -88,6 +89,7 @@ class AuthorizationManager(dataBase: AppDataBase) {
                     .execute()
 
             }.onFailure {
+                Log.e("Auth", it.message.toString())
                 return AuthorizationStatus.NO_INTERNET
             }.onSuccess { response1 ->
                 val htmlByLines = response1.body().split("\n")
diff --git a/app/src/main/java/ru/megboyzz/dnevnik/screens/LoginScreen.kt b/app/src/main/java/ru/megboyzz/dnevnik/screens/LoginScreen.kt
index 08f2081..502bf07 100644
--- a/app/src/main/java/ru/megboyzz/dnevnik/screens/LoginScreen.kt
+++ b/app/src/main/java/ru/megboyzz/dnevnik/screens/LoginScreen.kt
@@ -1,5 +1,8 @@
 package ru.megboyzz.dnevnik.screens
 
+import androidx.compose.foundation.layout.Column
+import androidx.compose.material.Button
+import androidx.compose.material.Text
 import androidx.compose.runtime.*
 import androidx.compose.ui.platform.LocalContext
 import androidx.lifecycle.viewmodel.compose.viewModel
@@ -52,27 +55,41 @@ fun LoginScreen(navController: NavController) {
 
     if(loginStatus.value == AuthorizationStatus.LOGGED)
         navController.navigate(AppNavRoute.Marks)
+    Column() {
+        Button(onClick = {
+            login.value = "08012002@mail.ru"
+            password.value = "1282565121024QWEasdfZXC"
+        }) {
+            Text("Я")
+        }
+        Button(onClick = {
+            login.value = "kitsekaterina"
+            password.value = "k12345"
+        }) {
+            Text("Катя")
+        }
 
-    LoginScreenContent(
-        login = login.value,
-        onLoginChange = { login.value = it },
+        LoginScreenContent(
+            login = login.value,
+            onLoginChange = { login.value = it },
 
-        password = password.value,
-        onPasswordChange = { password.value = it },
+            password = password.value,
+            onPasswordChange = { password.value = it },
 
-        isError = loginStatus.value == AuthorizationStatus.WRONG_CREDENTIALS,
-        onErrorChange = {  },
+            isError = loginStatus.value == AuthorizationStatus.WRONG_CREDENTIALS,
+            onErrorChange = { },
 
-        isLoading = isLoading,
+            isLoading = isLoading,
 
-        isRememberMe = rememberMe.value,
-        onRememberChange = { rememberMe.value = it },
+            isRememberMe = rememberMe.value,
+            onRememberChange = { rememberMe.value = it },
 
-        onSignIn = {
-            if(loginStatus.value != AuthorizationStatus.LOGGED)
-                authorizationViewModel.login()
-        },
-        onSignUp = { /*TODO*/ },
-        onForgetPassword = { /* TODO */ }
-    )
+            onSignIn = {
+                if (loginStatus.value != AuthorizationStatus.LOGGED)
+                    authorizationViewModel.login()
+            },
+            onSignUp = { /*TODO*/ },
+            onForgetPassword = { /* TODO */ }
+        )
+    }
 }
diff --git a/app/src/main/java/ru/megboyzz/dnevnik/viewmodel/AuthorizationViewModel.kt b/app/src/main/java/ru/megboyzz/dnevnik/viewmodel/AuthorizationViewModel.kt
index f2608dd..c4bce3a 100644
--- a/app/src/main/java/ru/megboyzz/dnevnik/viewmodel/AuthorizationViewModel.kt
+++ b/app/src/main/java/ru/megboyzz/dnevnik/viewmodel/AuthorizationViewModel.kt
@@ -1,5 +1,6 @@
 package ru.megboyzz.dnevnik.viewmodel
 
+import android.util.Log
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
@@ -33,7 +34,9 @@ class AuthorizationViewModel(application: App) : AndroidViewModel(application) {
         viewModelScope.launch(Dispatchers.IO) {
 
             loginStatus.emit(AuthorizationStatus.LOGGING)
-            loginStatus.emit(authManager.login(login.value, password.value, rememberMe.value))
+            val login1 = authManager.login(login.value, password.value, rememberMe.value)
+            Log.i("Auth", login1.toString())
+            loginStatus.emit(login1)
 
         }