dependency updates, refactoring, bug fixes

Mikailo01 · Sep 22, 2024 · e99177c · e99177c
1 parent cd70aac
commit e99177c
Show file tree

Hide file tree

Showing 39 changed files with 327 additions and 173 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -11,15 +11,15 @@ plugins {
 
 android {
     namespace = "com.bytecause.lenslex"
-    compileSdk = 34
+    compileSdk = 35
     android.buildFeatures.buildConfig = true
 
     defaultConfig {
         applicationId = "com.bytecause.lenslex"
         minSdk = 24
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 1
-        versionName = "1.0"
+        versionName = "1.0.0-rc1"
 
         testInstrumentationRunner = "com.bytecause.lenslex.InstrumentationTestRunner"
         vectorDrawables {

diff --git a/app/src/main/java/com/bytecause/lenslex/data/repository/WordsRepositoryImpl.kt b/app/src/main/java/com/bytecause/lenslex/data/repository/WordsRepositoryImpl.kt
@@ -24,6 +24,7 @@ class WordsRepositoryImpl(
 
     private fun user(): FirebaseUser? = auth.getAuth().currentUser
 
+    @Suppress("UNCHECKED_CAST")
     override fun getWords(
         originLangCode: String,
         targetLangCode: String
@@ -63,6 +64,7 @@ class WordsRepositoryImpl(
         awaitClose { listener?.remove() }
     }
 
+    @Suppress("UNCHECKED_CAST")
     private fun documentToWords(document: DocumentSnapshot): Words {
         return document.data?.let { field ->
             Words(

diff --git a/app/src/main/java/com/bytecause/lenslex/ui/components/EmailField.kt b/app/src/main/java/com/bytecause/lenslex/ui/components/EmailField.kt
@@ -12,6 +12,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
@@ -27,8 +28,13 @@ fun EmailField(
     emailValue: String,
     isEmailError: Boolean,
     modifier: Modifier = Modifier,
+    shouldHideSoftKeyboard: Boolean = false,
     onEmailValueChanged: (String) -> Unit
 ) {
+    val keyboardController = LocalSoftwareKeyboardController.current
+
+    if (shouldHideSoftKeyboard) keyboardController?.hide()
+
     OutlinedTextField(
         modifier = modifier.fillMaxWidth(),
         value = emailValue,

diff --git a/app/src/main/java/com/bytecause/lenslex/ui/components/NetworkUnavailableDialog.kt b/app/src/main/java/com/bytecause/lenslex/ui/components/NetworkUnavailableDialog.kt
@@ -17,6 +17,7 @@ import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.bytecause.lenslex.R
 
@@ -55,4 +56,10 @@ fun NetworkUnavailableDialog(
                 .height(15.dp))
         }
     }
+}
+
+@Composable
+@Preview
+private fun NetworkUnavailableDialogPreview() {
+    NetworkUnavailableDialog(text = "", onTryAgainClick = {}, onDismiss = {})
 }
diff --git a/app/src/main/java/com/bytecause/lenslex/ui/components/PasswordField.kt b/app/src/main/java/com/bytecause/lenslex/ui/components/PasswordField.kt
@@ -16,6 +16,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction

diff --git a/app/src/main/java/com/bytecause/lenslex/ui/components/SignIn.kt b/app/src/main/java/com/bytecause/lenslex/ui/components/SignIn.kt
@@ -19,7 +19,7 @@ import androidx.compose.ui.unit.dp
 import com.bytecause.lenslex.R
 import com.bytecause.lenslex.navigation.Screen
 import com.bytecause.lenslex.ui.events.LoginUiEvent
-import com.bytecause.lenslex.ui.screens.uistate.LoginState
+import com.bytecause.lenslex.ui.screens.model.LoginState
 import com.bytecause.lenslex.util.CredentialValidationResult
 import com.bytecause.lenslex.util.PasswordValidationResult
 import com.bytecause.lenslex.util.TestTags

diff --git a/app/src/main/java/com/bytecause/lenslex/ui/components/SignUp.kt b/app/src/main/java/com/bytecause/lenslex/ui/components/SignUp.kt
@@ -16,7 +16,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.bytecause.lenslex.R
 import com.bytecause.lenslex.ui.events.LoginUiEvent
-import com.bytecause.lenslex.ui.screens.uistate.LoginState
+import com.bytecause.lenslex.ui.screens.model.LoginState
 import com.bytecause.lenslex.util.CredentialValidationResult
 import com.bytecause.lenslex.util.PasswordValidationResult
 

diff --git a/app/src/main/java/com/bytecause/lenslex/ui/events/AccountSettingsUiEvent.kt b/app/src/main/java/com/bytecause/lenslex/ui/events/AccountSettingsUiEvent.kt
@@ -8,16 +8,18 @@ import com.google.firebase.auth.AuthCredential
 sealed interface AccountSettingsUiEvent {
     data object OnNavigateBack : AccountSettingsUiEvent
     data object OnDeleteAccountButtonClick : AccountSettingsUiEvent
-    data object OnConfirmConfirmationDialog : AccountSettingsUiEvent
+    data object OnConfirmDeleteConfirmationDialog : AccountSettingsUiEvent
     data object OnDismissConfirmationDialog : AccountSettingsUiEvent
     data object OnLaunchReauthenticationGoogleIntent : AccountSettingsUiEvent
     data object OnCredentialsDialogDismiss : AccountSettingsUiEvent
     data class OnShowSnackBar(val message: String) : AccountSettingsUiEvent
     data class OnLinkGoogleProvider(val value: AuthCredential) : AccountSettingsUiEvent
     data class OnReauthenticateWithGoogle(val value: AuthCredential) : AccountSettingsUiEvent
     data class OnShowCredentialDialog(val value: CredentialType) : AccountSettingsUiEvent
+    data class OnShowReauthorizationDialog(val boolean: Boolean) : AccountSettingsUiEvent
+    data class OnReauthorizationDialogDoneClick(val credentials: Credentials) : AccountSettingsUiEvent
     data class OnLinkButtonClick(val value: Provider) : AccountSettingsUiEvent
-    data class OnEnteredCredential(val value: Credentials) : AccountSettingsUiEvent
+    data class OnEnteredCredential(val credentials: Credentials) : AccountSettingsUiEvent
     data class OnDialogCredentialChanged(val value: Credentials.Sensitive) : AccountSettingsUiEvent
 }
 

diff --git a/app/src/main/java/com/bytecause/lenslex/ui/interfaces/CredentialType.kt b/app/src/main/java/com/bytecause/lenslex/ui/interfaces/CredentialType.kt
@@ -1,7 +1,6 @@
 package com.bytecause.lenslex.ui.interfaces
 
 sealed interface CredentialType {
-    data object Reauthorization : CredentialType
     data object AccountLink : CredentialType
     data object Username : CredentialType
     data object Email : CredentialType

diff --git a/app/src/main/java/com/bytecause/lenslex/ui/screens/AccountScreen.kt b/app/src/main/java/com/bytecause/lenslex/ui/screens/AccountScreen.kt
@@ -61,7 +61,7 @@ import com.bytecause.lenslex.ui.components.RowItem
 import com.bytecause.lenslex.ui.components.TopAppBar
 import com.bytecause.lenslex.ui.events.AccountUiEffect
 import com.bytecause.lenslex.ui.events.AccountUiEvent
-import com.bytecause.lenslex.ui.screens.uistate.AccountState
+import com.bytecause.lenslex.ui.screens.model.AccountState
 import com.bytecause.lenslex.ui.screens.viewmodel.AccountViewModel
 import com.bytecause.lenslex.util.BlurTransformation
 import com.bytecause.lenslex.util.compressImage