diff --git a/Habitica/build.gradle b/Habitica/build.gradle index dc9b49cc5..8b98c2ff3 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -149,7 +149,7 @@ android { multiDexEnabled true resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW" - versionCode 2250 + versionCode 2253 versionName "2.1.1" } diff --git a/Habitica/res/navigation/navigation.xml b/Habitica/res/navigation/navigation.xml index ac984552e..15bd80aec 100644 --- a/Habitica/res/navigation/navigation.xml +++ b/Habitica/res/navigation/navigation.xml @@ -251,6 +251,10 @@ + + insufficientGemPurchase false + + showSubscriptionBanner + false + \ No newline at end of file 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 0857fce51..4546ce2f3 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 @@ -70,4 +70,8 @@ class AppConfigManager { fun insufficientGemPurchase(): Boolean { return remoteConfig.getBoolean("insufficientGemPurchase") } + + fun showSubscriptionBanner(): Boolean { + return remoteConfig.getBoolean("showSubscriptionBanner") + } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt index 1a0b8df64..b06372464 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt @@ -18,6 +18,7 @@ import com.habitrpg.android.habitica.data.SocialRepository import com.habitrpg.android.habitica.data.UserRepository import com.habitrpg.android.habitica.extensions.getThemeColor import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler +import com.habitrpg.android.habitica.helpers.AppConfigManager import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.models.inventory.Quest import com.habitrpg.android.habitica.models.inventory.QuestContent @@ -50,6 +51,8 @@ class NavigationDrawerFragment : DialogFragment() { lateinit var inventoryRepository: InventoryRepository @Inject lateinit var userRepository: UserRepository + @Inject + lateinit var configManager: AppConfigManager private var drawerLayout: androidx.drawerlayout.widget.DrawerLayout? = null private var fragmentContainerView: View? = null @@ -271,9 +274,12 @@ class NavigationDrawerFragment : DialogFragment() { items.add(HabiticaDrawerItem(R.id.newsFragment, SIDEBAR_NEWS, context.getString(R.string.sidebar_news))) items.add(HabiticaDrawerItem(R.id.FAQOverviewFragment, SIDEBAR_HELP, context.getString(R.string.sidebar_help))) items.add(HabiticaDrawerItem(R.id.aboutFragment, SIDEBAR_ABOUT, context.getString(R.string.sidebar_about))) - items.add(HabiticaDrawerItem(R.id.subscriptionPurchaseActivity, SIDEBAR_SUBSCRIPTION_PROMO)) } - items.last().isPromo = true + if (configManager.showSubscriptionBanner()) { + val item = HabiticaDrawerItem(R.id.subscriptionPurchaseActivity, SIDEBAR_SUBSCRIPTION_PROMO) + item.isPromo = true + items.add(item) + } adapter.updateItems(items) }