Update password dialog titles and subtitles; improve localization strings; set app_name as non-translatable; enable locale config generation

softartdev · softartdev · commit ee23b7a2cda3 · 2025-07-24T07:53:29.000+04:00
diff --git a/android-compose-app/build.gradle.kts b/android-compose-app/build.gradle.kts
@@ -24,8 +24,8 @@ android {
         applicationId = "com.softartdev.noteroom"
         minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
-        versionCode = 838
-        versionName = "8.3.8"
+        versionCode = 839
+        versionName = "8.3.9"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments["clearPackageData"] = "true"
         vectorDrawables.useSupportLibrary = true
@@ -63,6 +63,7 @@ android {
         execution = "ANDROIDX_TEST_ORCHESTRATOR"
         emulatorControl.enable = true
     }
+    androidResources.generateLocaleConfig = true
 }
 
 dependencies {
diff --git a/android-compose-app/src/main/res/resources.properties b/android-compose-app/src/main/res/resources.properties
@@ -0,0 +1 @@
+unqualifiedResLocale=en
diff --git a/android-compose-app/src/main/res/values-ru/strings.xml b/android-compose-app/src/main/res/values-ru/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources/>
diff --git a/android-compose-app/src/main/res/values/strings.xml b/android-compose-app/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Note Delight</string>
+    <string name="app_name" translatable="false">Note Delight</string>
 </resources>
diff --git a/core/presentation/src/androidUnitTest/kotlin/com/softartdev/notedelight/presentation/settings/security/change/ChangeViewModelTest.kt b/core/presentation/src/androidUnitTest/kotlin/com/softartdev/notedelight/presentation/settings/security/change/ChangeViewModelTest.kt
@@ -68,9 +68,9 @@ class ChangeViewModelTest {
             assertFalse(initialState.isNewPasswordError)
             assertFalse(initialState.isRepeatPasswordError)
             // Check initial label types
-            assertEquals(FieldLabel.ENTER, initialState.oldPasswordFieldLabel)
-            assertEquals(FieldLabel.ENTER, initialState.newPasswordFieldLabel)
-            assertEquals(FieldLabel.ENTER, initialState.repeatPasswordFieldLabel)
+            assertEquals(FieldLabel.ENTER_OLD_PASSWORD, initialState.oldPasswordFieldLabel)
+            assertEquals(FieldLabel.ENTER_NEW_PASSWORD, initialState.newPasswordFieldLabel)
+            assertEquals(FieldLabel.REPEAT_NEW_PASSWORD, initialState.repeatPasswordFieldLabel)
             assertNull(initialState.snackBarMessageType)
 
             cancelAndIgnoreRemainingEvents()
@@ -124,7 +124,7 @@ class ChangeViewModelTest {
             assertTrue(state.loading)
 
             state = awaitItem() // Error state
-            assertEquals(FieldLabel.EMPTY, state.oldPasswordFieldLabel)
+            assertEquals(FieldLabel.EMPTY_PASSWORD, state.oldPasswordFieldLabel)
             assertTrue(state.isOldPasswordError)
             assertFalse(state.isNewPasswordError)
             assertFalse(state.isRepeatPasswordError)
@@ -149,7 +149,7 @@ class ChangeViewModelTest {
             assertTrue(state.loading)
 
             state = awaitItem() // Error state
-            assertEquals(FieldLabel.EMPTY, state.newPasswordFieldLabel)
+            assertEquals(FieldLabel.EMPTY_PASSWORD, state.newPasswordFieldLabel)
             assertFalse(state.isOldPasswordError)
             assertTrue(state.isNewPasswordError)
             assertFalse(state.isRepeatPasswordError)
@@ -178,7 +178,7 @@ class ChangeViewModelTest {
             assertTrue(state.loading)
 
             state = awaitItem() // Error state
-            assertEquals(FieldLabel.NO_MATCH, state.repeatPasswordFieldLabel)
+            assertEquals(FieldLabel.PASSWORDS_NOT_MATCH, state.repeatPasswordFieldLabel)
             assertFalse(state.isOldPasswordError)
             assertFalse(state.isNewPasswordError)
             assertTrue(state.isRepeatPasswordError)
@@ -210,7 +210,7 @@ class ChangeViewModelTest {
             assertTrue(state.loading)
 
             state = awaitItem() // Error state
-            assertEquals(FieldLabel.INCORRECT, state.oldPasswordFieldLabel)
+            assertEquals(FieldLabel.INCORRECT_PASSWORD, state.oldPasswordFieldLabel)
             assertTrue(state.isOldPasswordError)
             assertFalse(state.isNewPasswordError)
             assertFalse(state.isRepeatPasswordError)
@@ -238,9 +238,9 @@ class ChangeViewModelTest {
             assertFalse(state.isOldPasswordError)
             assertFalse(state.isNewPasswordError)
             assertFalse(state.isRepeatPasswordError)
-            assertEquals(FieldLabel.ENTER, state.oldPasswordFieldLabel)
-            assertEquals(FieldLabel.ENTER, state.newPasswordFieldLabel)
-            assertEquals(FieldLabel.ENTER, state.repeatPasswordFieldLabel)
+            assertEquals(FieldLabel.ENTER_OLD_PASSWORD, state.oldPasswordFieldLabel)
+            assertEquals(FieldLabel.ENTER_NEW_PASSWORD, state.newPasswordFieldLabel)
+            assertEquals(FieldLabel.REPEAT_NEW_PASSWORD, state.repeatPasswordFieldLabel)
 
             cancelAndIgnoreRemainingEvents()
         }
diff --git a/core/presentation/src/androidUnitTest/kotlin/com/softartdev/notedelight/presentation/settings/security/confirm/ConfirmViewModelTest.kt b/core/presentation/src/androidUnitTest/kotlin/com/softartdev/notedelight/presentation/settings/security/confirm/ConfirmViewModelTest.kt
@@ -60,8 +60,8 @@ class ConfirmViewModelTest {
             assertTrue(initialState.repeatPassword.isEmpty())
             assertFalse(initialState.isPasswordError)
             assertFalse(initialState.isRepeatPasswordError)
-            assertEquals(FieldLabel.ENTER, initialState.passwordFieldLabel)
-            assertEquals(FieldLabel.ENTER, initialState.repeatPasswordFieldLabel)
+            assertEquals(FieldLabel.ENTER_PASSWORD, initialState.passwordFieldLabel)
+            assertEquals(FieldLabel.CONFIRM_PASSWORD, initialState.repeatPasswordFieldLabel)
             assertNull(initialState.snackBarMessageType)
 
             cancelAndIgnoreRemainingEvents()
@@ -77,8 +77,8 @@ class ConfirmViewModelTest {
             initialState.onEditPassword(password)
             var state = awaitItem()
             assertEquals(password, state.password)
-            assertEquals(FieldLabel.ENTER, state.passwordFieldLabel)
-            assertEquals(FieldLabel.ENTER, state.repeatPasswordFieldLabel)
+            assertEquals(FieldLabel.ENTER_PASSWORD, state.passwordFieldLabel)
+            assertEquals(FieldLabel.CONFIRM_PASSWORD, state.repeatPasswordFieldLabel)
             assertFalse(state.isPasswordError)
             assertFalse(state.isRepeatPasswordError)
 
@@ -111,8 +111,8 @@ class ConfirmViewModelTest {
             assertTrue(state.loading)
 
             state = awaitItem()
-            assertEquals(FieldLabel.ENTER, state.passwordFieldLabel)
-            assertEquals(FieldLabel.NO_MATCH, state.repeatPasswordFieldLabel)
+            assertEquals(FieldLabel.ENTER_PASSWORD, state.passwordFieldLabel)
+            assertEquals(FieldLabel.PASSWORDS_NOT_MATCH, state.repeatPasswordFieldLabel)
             assertTrue(state.isRepeatPasswordError)
             assertFalse(state.isPasswordError)
 
@@ -141,8 +141,8 @@ class ConfirmViewModelTest {
             assertTrue(state.loading)
 
             state = awaitItem()
-            assertEquals(FieldLabel.ENTER, state.passwordFieldLabel)
-            assertEquals(FieldLabel.NO_MATCH, state.repeatPasswordFieldLabel)
+            assertEquals(FieldLabel.ENTER_PASSWORD, state.passwordFieldLabel)
+            assertEquals(FieldLabel.PASSWORDS_NOT_MATCH, state.repeatPasswordFieldLabel)
             assertFalse(state.isPasswordError)
             assertTrue(state.isRepeatPasswordError)
 
@@ -161,7 +161,7 @@ class ConfirmViewModelTest {
 
             state = awaitItem() // Error state
             assertTrue(state.isPasswordError)
-            assertEquals(FieldLabel.EMPTY, state.passwordFieldLabel)
+            assertEquals(FieldLabel.EMPTY_PASSWORD, state.passwordFieldLabel)
 
             state = awaitItem()
             assertFalse(state.loading)
@@ -171,8 +171,8 @@ class ConfirmViewModelTest {
             state = awaitItem()
             assertFalse(state.isPasswordError)
             assertFalse(state.isRepeatPasswordError)
-            assertEquals(FieldLabel.ENTER, state.passwordFieldLabel)
-            assertEquals(FieldLabel.ENTER, state.repeatPasswordFieldLabel)
+            assertEquals(FieldLabel.ENTER_PASSWORD, state.passwordFieldLabel)
+            assertEquals(FieldLabel.CONFIRM_PASSWORD, state.repeatPasswordFieldLabel)
 
             cancelAndIgnoreRemainingEvents()
         }
diff --git a/core/presentation/src/androidUnitTest/kotlin/com/softartdev/notedelight/presentation/settings/security/enter/EnterViewModelTest.kt b/core/presentation/src/androidUnitTest/kotlin/com/softartdev/notedelight/presentation/settings/security/enter/EnterViewModelTest.kt
@@ -102,7 +102,7 @@ class EnterViewModelTest {
             assertTrue(resultState.loading)
 
             resultState = awaitItem()
-            assertEquals(FieldLabel.EMPTY, resultState.fieldLabel)
+            assertEquals(FieldLabel.EMPTY_PASSWORD, resultState.fieldLabel)
 
             resultState = awaitItem()
             assertTrue(resultState.isError)
@@ -122,7 +122,7 @@ class EnterViewModelTest {
             var resultState = awaitItem()
             assertFalse(resultState.loading)
             assertFalse(resultState.isError)
-            assertEquals(FieldLabel.ENTER, resultState.fieldLabel)
+            assertEquals(FieldLabel.ENTER_PASSWORD, resultState.fieldLabel)
 
             resultState.onEditPassword(password)
             resultState = awaitItem()
@@ -132,7 +132,7 @@ class EnterViewModelTest {
             assertTrue(resultState.loading)
 
             resultState = awaitItem()
-            assertEquals(FieldLabel.INCORRECT, resultState.fieldLabel)
+            assertEquals(FieldLabel.INCORRECT_PASSWORD, resultState.fieldLabel)
 
             resultState = awaitItem()
             assertTrue(resultState.isError)
diff --git a/core/presentation/src/commonMain/kotlin/com/softartdev/notedelight/presentation/settings/security/FieldLabel.kt b/core/presentation/src/commonMain/kotlin/com/softartdev/notedelight/presentation/settings/security/FieldLabel.kt
@@ -1,5 +1,12 @@
 package com.softartdev.notedelight.presentation.settings.security
 
 enum class FieldLabel {
-    ENTER, EMPTY, INCORRECT, NO_MATCH
+    ENTER_PASSWORD,
+    CONFIRM_PASSWORD,
+    ENTER_OLD_PASSWORD,
+    ENTER_NEW_PASSWORD,
+    REPEAT_NEW_PASSWORD,
+    INCORRECT_PASSWORD,
+    EMPTY_PASSWORD,
+    PASSWORDS_NOT_MATCH,
 }
diff --git a/core/presentation/src/commonMain/kotlin/com/softartdev/notedelight/presentation/settings/security/change/ChangeResult.kt b/core/presentation/src/commonMain/kotlin/com/softartdev/notedelight/presentation/settings/security/change/ChangeResult.kt
@@ -6,15 +6,15 @@ data class ChangeResult(
     val loading: Boolean = false,
     // Old password field
     val oldPassword: String = "",
-    val oldPasswordFieldLabel: FieldLabel = FieldLabel.ENTER,
+    val oldPasswordFieldLabel: FieldLabel = FieldLabel.ENTER_OLD_PASSWORD,
     val isOldPasswordError: Boolean = false,
     // New password field
     val newPassword: String = "",
-    val newPasswordFieldLabel: FieldLabel = FieldLabel.ENTER,
+    val newPasswordFieldLabel: FieldLabel = FieldLabel.ENTER_NEW_PASSWORD,
     val isNewPasswordError: Boolean = false,
     // Repeat new password field
     val repeatNewPassword: String = "",
-    val repeatPasswordFieldLabel: FieldLabel = FieldLabel.ENTER,
+    val repeatPasswordFieldLabel: FieldLabel = FieldLabel.REPEAT_NEW_PASSWORD,
     val isRepeatPasswordError: Boolean = false,
     // Common
     val snackBarMessageType: String? = null,
@@ -32,9 +32,9 @@ data class ChangeResult(
         isOldPasswordError = false,
         isNewPasswordError = false,
         isRepeatPasswordError = false,
-        oldPasswordFieldLabel = FieldLabel.ENTER,
-        newPasswordFieldLabel = FieldLabel.ENTER,
-        repeatPasswordFieldLabel = FieldLabel.ENTER
+        oldPasswordFieldLabel = FieldLabel.ENTER_OLD_PASSWORD,
+        newPasswordFieldLabel = FieldLabel.ENTER_NEW_PASSWORD,
+        repeatPasswordFieldLabel = FieldLabel.REPEAT_NEW_PASSWORD
     )
     fun hideSnackBarMessage(): ChangeResult = copy(snackBarMessageType = null)
 }
diff --git a/core/presentation/src/commonMain/kotlin/com/softartdev/notedelight/presentation/settings/security/change/ChangeViewModel.kt b/core/presentation/src/commonMain/kotlin/com/softartdev/notedelight/presentation/settings/security/change/ChangeViewModel.kt
@@ -58,14 +58,14 @@ class ChangeViewModel(
 
             when {
                 oldPassword.isEmpty() -> mutableStateFlow.update {
-                    it.copy(oldPasswordFieldLabel = FieldLabel.EMPTY, isOldPasswordError = true)
+                    it.copy(oldPasswordFieldLabel = FieldLabel.EMPTY_PASSWORD, isOldPasswordError = true)
                 }
                 newPassword.isEmpty() -> mutableStateFlow.update {
-                    it.copy(newPasswordFieldLabel = FieldLabel.EMPTY, isNewPasswordError = true)
+                    it.copy(newPasswordFieldLabel = FieldLabel.EMPTY_PASSWORD, isNewPasswordError = true)
                 }
                 newPassword != repeatNewPassword -> mutableStateFlow.update {
                     it.copy(
-                        repeatPasswordFieldLabel = FieldLabel.NO_MATCH,
+                        repeatPasswordFieldLabel = FieldLabel.PASSWORDS_NOT_MATCH,
                         isRepeatPasswordError = true
                     )
                 }
@@ -77,7 +77,7 @@ class ChangeViewModel(
                     }
                 }
                 else -> mutableStateFlow.update {
-                    it.copy(oldPasswordFieldLabel = FieldLabel.INCORRECT, isOldPasswordError = true)
+                    it.copy(oldPasswordFieldLabel = FieldLabel.INCORRECT_PASSWORD, isOldPasswordError = true)
                 }
             }
         } catch (e: Throwable) {
diff --git a/core/presentation/src/commonMain/kotlin/com/softartdev/notedelight/presentation/settings/security/confirm/ConfirmResult.kt b/core/presentation/src/commonMain/kotlin/com/softartdev/notedelight/presentation/settings/security/confirm/ConfirmResult.kt
@@ -6,8 +6,8 @@ data class ConfirmResult(
     val loading: Boolean = false,
     val password: String = "",
     val repeatPassword: String = "",
-    val passwordFieldLabel: FieldLabel = FieldLabel.ENTER,
-    val repeatPasswordFieldLabel: FieldLabel = FieldLabel.ENTER,
+    val passwordFieldLabel: FieldLabel = FieldLabel.ENTER_PASSWORD,
+    val repeatPasswordFieldLabel: FieldLabel = FieldLabel.CONFIRM_PASSWORD,
     val isPasswordError: Boolean = false,
     val isRepeatPasswordError: Boolean = false,
     val snackBarMessageType: String? = null,
@@ -22,8 +22,8 @@ data class ConfirmResult(
     fun hideErrors(): ConfirmResult = copy(
         isPasswordError = false,
         isRepeatPasswordError = false,
-        passwordFieldLabel = FieldLabel.ENTER,
-        repeatPasswordFieldLabel = FieldLabel.ENTER
+        passwordFieldLabel = FieldLabel.ENTER_PASSWORD,
+        repeatPasswordFieldLabel = FieldLabel.CONFIRM_PASSWORD
     )
     fun hideSnackBarMessage(): ConfirmResult = copy(snackBarMessageType = null)
 }
diff --git a/core/presentation/src/commonMain/kotlin/com/softartdev/notedelight/presentation/settings/security/confirm/ConfirmViewModel.kt b/core/presentation/src/commonMain/kotlin/com/softartdev/notedelight/presentation/settings/security/confirm/ConfirmViewModel.kt
@@ -49,13 +49,13 @@ class ConfirmViewModel(
             when {
                 password != repeatPassword -> mutableStateFlow.update {
                     it.copy(
-                        repeatPasswordFieldLabel = FieldLabel.NO_MATCH,
+                        repeatPasswordFieldLabel = FieldLabel.PASSWORDS_NOT_MATCH,
                         isRepeatPasswordError = true
                     )
                 }
                 password.isEmpty() -> mutableStateFlow.update {
                     it.copy(
-                        passwordFieldLabel = FieldLabel.EMPTY,
+                        passwordFieldLabel = FieldLabel.EMPTY_PASSWORD,
                         isPasswordError = true
                     )
                 }
diff --git a/core/presentation/src/commonMain/kotlin/com/softartdev/notedelight/presentation/settings/security/enter/EnterResult.kt b/core/presentation/src/commonMain/kotlin/com/softartdev/notedelight/presentation/settings/security/enter/EnterResult.kt
@@ -4,7 +4,7 @@ import com.softartdev.notedelight.presentation.settings.security.FieldLabel
 
 data class EnterResult(
     val loading: Boolean = false,
-    val fieldLabel: FieldLabel = FieldLabel.ENTER,
+    val fieldLabel: FieldLabel = FieldLabel.ENTER_PASSWORD,
     val password: String = "",
     val isPasswordVisible: Boolean = false,
     val isError: Boolean = false,
diff --git a/core/presentation/src/commonMain/kotlin/com/softartdev/notedelight/presentation/settings/security/enter/EnterViewModel.kt b/core/presentation/src/commonMain/kotlin/com/softartdev/notedelight/presentation/settings/security/enter/EnterViewModel.kt
@@ -34,7 +34,7 @@ class EnterViewModel(
 
     private fun onEditPassword(password: String) = viewModelScope.launch {
         mutableStateFlow.update(EnterResult::hideError)
-        mutableStateFlow.update { it.copy(fieldLabel = FieldLabel.ENTER) }
+        mutableStateFlow.update { it.copy(fieldLabel = FieldLabel.ENTER_PASSWORD) }
         mutableStateFlow.update { it.copy(password = password) }
     }
 
@@ -48,7 +48,7 @@ class EnterViewModel(
             val password = mutableStateFlow.value.password
             when {
                 password.isEmpty() -> {
-                    mutableStateFlow.update { it.copy(fieldLabel = FieldLabel.EMPTY) }
+                    mutableStateFlow.update { it.copy(fieldLabel = FieldLabel.EMPTY_PASSWORD) }
                     mutableStateFlow.update(EnterResult::showError)
                 }
                 checkPasswordUseCase(password) -> {
@@ -57,7 +57,7 @@ class EnterViewModel(
                     navigateUp()
                 }
                 else -> {
-                    mutableStateFlow.update { it.copy(fieldLabel = FieldLabel.INCORRECT) }
+                    mutableStateFlow.update { it.copy(fieldLabel = FieldLabel.INCORRECT_PASSWORD) }
                     mutableStateFlow.update(EnterResult::showError)
                 }
             }
diff --git a/desktop-compose-app/build.gradle.kts b/desktop-compose-app/build.gradle.kts
@@ -49,7 +49,7 @@ compose.desktop {
         nativeDistributions {
             targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
             packageName = "Note Delight"
-            packageVersion = "1.1.8"
+            packageVersion = "2.0.0"
             description = "Note app with encryption"
             copyright = "© 2023 SoftArtDev"
             macOS.iconFile.set(project.file("src/jvmMain/resources/app_icon.icns"))
diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -475,7 +475,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.9;
+				MARKETING_VERSION = 2.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -517,7 +517,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.9;
+				MARKETING_VERSION = 2.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
diff --git a/iosApp/iosApp/Info.plist b/iosApp/iosApp/Info.plist
@@ -22,7 +22,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.9</string>
+	<string>2.0</string>
 	<key>CFBundleVersion</key>
 	<string>17</string>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/shared/src/commonMain/composeResources/values-ru/strings.xml b/shared/src/commonMain/composeResources/values-ru/strings.xml
@@ -49,9 +49,12 @@
     <string name="enter_title">Введите заголовок</string>
     <string name="empty_title">Заголовок не должен быть пустым</string>
     <string name="create_note">Создать заметку</string>
-    <string name="dialog_title_change_password">Смена пароля</string>
-    <string name="dialog_title_conform_password">Подтверждение пароля</string>
-    <string name="dialog_title_enter_password">Ввод пароля</string>
+    <string name="confirm_password_dialog_title">Установка пароля</string>
+    <string name="confirm_password_dialog_subtitle">Придумайте пароль и введите его ниже.</string>
+    <string name="changing_password_dialog_title">Смена пароля</string>
+    <string name="changing_password_dialog_subtitle">Введите старый пароль, затем придумайте новый.</string>
+    <string name="enter_password_dialog_title">Ввод пароля</string>
+    <string name="enter_password_dialog_subtitle">Введите текущий пароль для отключения защиты.</string>
     <string name="dialog_title_change_title">Редактирование заголовка</string>
     <string name="copy">Копировать</string>
 </resources>
diff --git a/shared/src/commonMain/composeResources/values/strings.xml b/shared/src/commonMain/composeResources/values/strings.xml
diff --git a/shared/src/commonMain/kotlin/com/softartdev/notedelight/ui/dialog/security/ChangePasswordDialog.kt b/shared/src/commonMain/kotlin/com/softartdev/notedelight/ui/dialog/security/ChangePasswordDialog.kt
diff --git a/shared/src/commonMain/kotlin/com/softartdev/notedelight/ui/dialog/security/ConfirmPasswordDialog.kt b/shared/src/commonMain/kotlin/com/softartdev/notedelight/ui/dialog/security/ConfirmPasswordDialog.kt
diff --git a/shared/src/commonMain/kotlin/com/softartdev/notedelight/ui/dialog/security/EnterPasswordDialog.kt b/shared/src/commonMain/kotlin/com/softartdev/notedelight/ui/dialog/security/EnterPasswordDialog.kt
diff --git a/shared/src/commonMain/kotlin/com/softartdev/notedelight/ui/dialog/security/fieldLabelRes.kt b/shared/src/commonMain/kotlin/com/softartdev/notedelight/ui/dialog/security/fieldLabelRes.kt

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<?xml version="1.0" encoding="utf-8"?>`
	`2`	`+<resources/>`
Original file line number	Diff line number	Diff line change
`@@ -58,14 +58,14 @@ class ChangeViewModel(`
`58`	`58`
`59`	`59`	`when {`
`60`	`60`	`oldPassword.isEmpty() -> mutableStateFlow.update {`
`61`		`- it.copy(oldPasswordFieldLabel = FieldLabel.EMPTY, isOldPasswordError = true)`
	`61`	`+ it.copy(oldPasswordFieldLabel = FieldLabel.EMPTY_PASSWORD, isOldPasswordError = true)`
`62`	`62`	`}`
`63`	`63`	`newPassword.isEmpty() -> mutableStateFlow.update {`
`64`		`- it.copy(newPasswordFieldLabel = FieldLabel.EMPTY, isNewPasswordError = true)`
	`64`	`+ it.copy(newPasswordFieldLabel = FieldLabel.EMPTY_PASSWORD, isNewPasswordError = true)`
`65`	`65`	`}`
`66`	`66`	`newPassword != repeatNewPassword -> mutableStateFlow.update {`
`67`	`67`	`it.copy(`
`68`		`- repeatPasswordFieldLabel = FieldLabel.NO_MATCH,`
	`68`	`+ repeatPasswordFieldLabel = FieldLabel.PASSWORDS_NOT_MATCH,`
`69`	`69`	`isRepeatPasswordError = true`
`70`	`70`	`)`
`71`	`71`	`}`
`@@ -77,7 +77,7 @@ class ChangeViewModel(`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`	`else -> mutableStateFlow.update {`
`80`		`- it.copy(oldPasswordFieldLabel = FieldLabel.INCORRECT, isOldPasswordError = true)`
	`80`	`+ it.copy(oldPasswordFieldLabel = FieldLabel.INCORRECT_PASSWORD, isOldPasswordError = true)`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`	`} catch (e: Throwable) {`