From 5d100deeef8d7379cf0b1cd7f071b877fc9bfe7b Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Thu, 4 Oct 2018 16:05:47 +0200 Subject: [PATCH] Hide confirm username button after confirming --- .../habitica/helpers/RemoteConfigManager.java | 6 ----- .../habitica/ui/activities/MainActivity.kt | 5 +---- .../AuthenticationPreferenceFragment.kt | 22 +++++-------------- .../preferences/PreferencesFragment.kt | 21 ++++++++++-------- 4 files changed, 18 insertions(+), 36 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemoteConfigManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemoteConfigManager.java index d11cbfc80..316fffab4 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemoteConfigManager.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemoteConfigManager.java @@ -24,7 +24,6 @@ public class RemoteConfigManager { private Boolean enableNewShops = false; private String shopSpriteSuffix = ""; private Integer maxChatLength = 3000; - private Boolean enableChangeUsername = false; private String REMOTE_STRING_KEY = "remote-string"; public RemoteConfigManager(Context context) { @@ -47,8 +46,6 @@ public class RemoteConfigManager { public Integer maxChatLength() { return maxChatLength; } - public Boolean enableChangeUsername() { return true; } - private void loadFromPreferences () { String storedPreferences = PreferenceManager.getDefaultSharedPreferences(context) .getString(REMOTE_STRING_KEY, ""); @@ -73,9 +70,6 @@ public class RemoteConfigManager { if (obj.has("maxChatLength")) { maxChatLength = obj.getInt("maxChatLength"); } - if (obj.has("enableChangeUsername")) { - enableChangeUsername = obj.getBoolean("enableChangeUsername"); - } } catch (JSONException e) { e.printStackTrace(); } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt index 8a4da9f76..ea81588d8 100755 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt @@ -399,10 +399,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction { YesterdailyDialog.showDialogIfNeeded(this, user?.id, userRepository, taskRepository) drawerFragment?.setMessagesCount(this.user?.inbox?.newMessages ?: 0) - if (remoteConfigManager.enableChangeUsername()) { - drawerFragment?.setSettingsCount(if (this.user?.flags?.isVerifiedUsername != true) 1 else 0 ) - } - + drawerFragment?.setSettingsCount(if (this.user?.flags?.isVerifiedUsername != true) 1 else 0 ) } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt index 4faecb5e4..47b1fd631 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt @@ -45,15 +45,14 @@ class AuthenticationPreferenceFragment: BasePreferencesFragment() { HabiticaBaseApplication.component?.inject(this) super.onCreate(savedInstanceState) - if (configManager.enableChangeUsername()) { - findPreference("login_name").title = context?.getString(R.string.username) - findPreference("confirm_username").isVisible = user?.flags?.isVerifiedUsername != true - } + findPreference("login_name").title = context?.getString(R.string.username) + findPreference("confirm_username").isVisible = user?.flags?.isVerifiedUsername != true } private fun updateUserFields() { configurePreference(findPreference("login_name"), user?.authentication?.localAuthentication?.username) configurePreference(findPreference("email"), user?.authentication?.localAuthentication?.email) + findPreference("confirm_username").isVisible = user?.flags?.isVerifiedUsername != true } private fun configurePreference(preference: Preference?, value: String?) { @@ -121,23 +120,12 @@ class AuthenticationPreferenceFragment: BasePreferencesFragment() { val view = inflater?.inflate(R.layout.dialog_edittext_confirm_pw, null) val loginNameEditText = view?.findViewById(R.id.editText) loginNameEditText?.setText(user?.authentication?.localAuthentication?.username) - val passwordEditText = view?.findViewById(R.id.passwordEditText) - if (configManager.enableChangeUsername()) { - passwordEditText?.visibility = View.GONE - val passwordTitleTextView = view?.findViewById(R.id.passwordTitleTextView) - passwordTitleTextView?.visibility = View.GONE - } context.notNull { context -> - var builder = AlertDialog.Builder(context) - builder = if (configManager.enableChangeUsername()) { - builder.setTitle(R.string.change_username) - } else { - builder.setTitle(R.string.change_login_name) - } + var builder = AlertDialog.Builder(context).setTitle(R.string.change_username) val dialog = builder.setPositiveButton(R.string.change) { thisDialog, _ -> thisDialog.dismiss() - userRepository.updateLoginName(loginNameEditText?.text.toString(), passwordEditText?.text.toString()) + userRepository.updateLoginName(loginNameEditText?.text.toString()) .subscribe(Consumer { configurePreference(findPreference("login_name"), loginNameEditText?.text.toString()) }, RxErrorHandler.handleEmptyError()) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt index a72506035..88d5fbbac 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt @@ -45,6 +45,11 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare override fun onCreate(savedInstanceState: Bundle?) { HabiticaBaseApplication.component?.inject(this) super.onCreate(savedInstanceState) + + val userID = preferenceManager.sharedPreferences.getString(context?.getString(R.string.SP_userID), null) + if (userID != null) { + compositeSubscription.add(userRepository.getUser(userID).subscribe(Consumer { this@PreferencesFragment.setUser(it) }, RxErrorHandler.handleEmptyError())) + } } override fun setupPreferences() { @@ -241,15 +246,13 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare cdsTimePreference?.text = user?.preferences?.dayStart.toString() + ":00" findPreference("dailyDueDefaultView").setDefaultValue(user?.preferences?.dailyDueDefaultView) - if (configManager.enableChangeUsername()) { - val preference = findPreference("authentication") - if (user?.flags?.isVerifiedUsername == true) { - preference.layoutResource = R.layout.preference_child_summary - preference.summary = context?.getString(R.string.authentication_summary) - } else { - preference.layoutResource = R.layout.preference_child_summary_error - preference.summary = context?.getString(R.string.username_not_confirmed) - } + val preference = findPreference("authentication") + if (user?.flags?.isVerifiedUsername == true) { + preference.layoutResource = R.layout.preference_child_summary + preference.summary = context?.getString(R.string.authentication_summary) + } else { + preference.layoutResource = R.layout.preference_child_summary_error + preference.summary = context?.getString(R.string.username_not_confirmed) } } }