diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index db10f7a2775271c71101028342ed0e76a2cb1036..d4cd9c5e2d1ce1e0904b2f66b5f67414aa300183 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 af133a60be76e41a58478d32a1681746582378fb..ab80cbfe043d9d11ec5edff7298198002bf56041 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 a906f15447aa9d130885a09e04f272c782233c43..bfb276169c3fbd9e2c4806398e05dbb0606511ab 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 76060f182302d4d9352e10475a4f5c6aecfa2432..db9f9e140243619586888686fa43a8e27247a019 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 ddd8fb8b8cc50eb5e9d9783c96fe12d013941abb..00da3f1cacc892aa8a18513381b175d8f209ade7 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 0f421f8e5a05e9b4a0ace3e1b890954607fbdf17..1f25a34bd64fa82e6c248f474829dd62cc9bb953 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