From d3566293f49b81577ae2cd7719501f7fe3f39528 Mon Sep 17 00:00:00 2001
From: Taras Smakula <tarassmakula@gmail.com>
Date: Fri, 14 Jul 2023 18:50:03 +0300
Subject: [PATCH] Missing res
---
app/src/main/res/values/strings.xml | 4 ----
.../feature/change_password/ChangePasswordDialogFragment.kt | 2 +-
auth/src/main/res/values/strings.xml | 1 -
core/src/main/res/values/strings.xml | 1 +
.../org/futo/circles/settings/feature/SettingsFragment.kt | 3 +--
settings/src/main/res/values/strings.xml | 5 ++++-
6 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index db10f7a27..d4cd9c5e2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -138,7 +138,6 @@
<string name="deactivate_my_account">Deactivate my account</string>
<string name="settings">Settings</string>
<string name="user_id">User ID</string>
- <string name="profile_updated">Profile updated</string>
<string name="deactivate_message">This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user lD. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.</string>
<string name="deactivate">Deactivate</string>
<string name="active_login_sessions">Active login sessions</string>
@@ -185,9 +184,6 @@
<string name="edited_label">(Edited)</string>
<string name="edit_poll">Edit poll</string>
<string name="clear_cache_and_reload">Clear cache and reload</string>
- <string name="version_format">Version %s</string>
- <string name="developer_mode_enabled">Developer mode is enabled</string>
- <string name="developer_mode_disabled">Developer mode is disabled</string>
<string name="info">Info</string>
<string name="message">Message</string>
<string name="link">Link</string>
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/change_password/ChangePasswordDialogFragment.kt b/auth/src/main/java/org/futo/circles/auth/feature/change_password/ChangePasswordDialogFragment.kt
index af133a60b..ab80cbfe0 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/change_password/ChangePasswordDialogFragment.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/change_password/ChangePasswordDialogFragment.kt
@@ -58,7 +58,7 @@ class ChangePasswordDialogFragment :
private fun setupObservers() {
viewModel.responseLiveData.observeResponse(this,
success = {
- showSuccess(getString(R.string.password_changed))
+ showSuccess(getString(org.futo.circles.core.R.string.password_changed))
onBackPressed()
},
error = { message ->
diff --git a/auth/src/main/res/values/strings.xml b/auth/src/main/res/values/strings.xml
index a906f1544..bfb276169 100644
--- a/auth/src/main/res/values/strings.xml
+++ b/auth/src/main/res/values/strings.xml
@@ -105,7 +105,6 @@
<string name="new_password">New password</string>
<string name="old_password">Old Password</string>
<string name="repeat_new_password">Repeat new password</string>
- <string name="password_changed">Password changed</string>
<plurals name="days">
<item quantity="one">%1$d day</item>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 76060f182..db9f9e140 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -51,5 +51,6 @@
<string name="send_screenshot">Send screenshot</string>
<string name="save">Save</string>
<string name="select_items_from_list_below">Select items from list below</string>
+ <string name="password_changed">Password changed</string>
</resources>
\ No newline at end of file
diff --git a/settings/src/main/java/org/futo/circles/settings/feature/SettingsFragment.kt b/settings/src/main/java/org/futo/circles/settings/feature/SettingsFragment.kt
index ddd8fb8b8..00da3f1ca 100644
--- a/settings/src/main/java/org/futo/circles/settings/feature/SettingsFragment.kt
+++ b/settings/src/main/java/org/futo/circles/settings/feature/SettingsFragment.kt
@@ -8,7 +8,6 @@ import androidx.fragment.app.activityViewModels
import androidx.fragment.app.viewModels
import by.kirich1409.viewbindingdelegate.viewBinding
import dagger.hilt.android.AndroidEntryPoint
-import org.futo.circles.BuildConfig
import org.futo.circles.MainActivity
import org.futo.circles.auth.model.LogOut
import org.futo.circles.auth.model.SwitchUser
@@ -85,7 +84,7 @@ class SettingsFragment : Fragment(R.layout.fragment_settings) {
navigator.navigateToMatrixChangePassword()
}
viewModel.changePasswordResponseLiveData.observeResponse(this,
- success = { showSuccess(getString(R.string.password_changed)) },
+ success = { showSuccess(getString(org.futo.circles.core.R.string.password_changed)) },
error = { message ->
showError(message)
loadingDialog.dismiss()
diff --git a/settings/src/main/res/values/strings.xml b/settings/src/main/res/values/strings.xml
index 0f421f8e5..1f25a34bd 100644
--- a/settings/src/main/res/values/strings.xml
+++ b/settings/src/main/res/values/strings.xml
@@ -8,5 +8,8 @@
<string name="current_session">Current session</string>
<string name="other_sessions">Other sessions</string>
<string name="invalid_auth">Invalid auth</string>
-
+ <string name="profile_updated">Profile updated</string>
+ <string name="version_format">Version %s</string>
+ <string name="developer_mode_enabled">Developer mode is enabled</string>
+ <string name="developer_mode_disabled">Developer mode is disabled</string>
</resources>
\ No newline at end of file
--
GitLab