From ddb1650b01e37b95e49671239b3f398ac743f431 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Fri, 22 Apr 2022 12:27:11 +0200 Subject: [PATCH] fix hiding FB login --- Habitica/res/xml/remote_config_defaults.xml | 4 ++++ .../com/habitrpg/android/habitica/helpers/AppConfigManager.kt | 4 ++++ .../habitrpg/android/habitica/ui/activities/LoginActivity.kt | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Habitica/res/xml/remote_config_defaults.xml b/Habitica/res/xml/remote_config_defaults.xml index 0da9826af..1509d0db7 100644 --- a/Habitica/res/xml/remote_config_defaults.xml +++ b/Habitica/res/xml/remote_config_defaults.xml @@ -104,6 +104,10 @@ enableTeamBoards false + + hideFacebook + false + enableNewArmoire diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt index 9979cb65d..a1aeb915d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt @@ -154,4 +154,8 @@ class AppConfigManager(contentRepository: ContentRepository?) { fun enableNewArmoire(): Boolean { return remoteConfig.getBoolean("enableNewArmoire") } + + fun hideFacebook(): Boolean { + return remoteConfig.getBoolean("hideFacebook") + } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt index c3706bcfb..6131642fb 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt @@ -224,7 +224,7 @@ class LoginActivity : BaseActivity() { } binding.password.imeOptions = EditorInfo.IME_ACTION_DONE binding.fbLoginButton.setText(R.string.login_btn_fb) - binding.fbLoginButton.visibility = View.VISIBLE + binding.fbLoginButton.visibility = if (configManager.hideFacebook()) View.GONE else View.VISIBLE binding.googleLoginButton.setText(R.string.login_btn_google) } this.resetLayout()