From 3646831f4d447306fe9c671cd1802d5768a9bda8 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 15 Jan 2020 18:31:57 +0100
Subject: [PATCH 01/62] Allow guild summary to be searched

---
 .../ui/adapter/social/PublicGuildsRecyclerViewAdapter.kt      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.kt
index 106016e3d..b6f927827 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.kt
@@ -96,7 +96,11 @@ class PublicGuildsRecyclerViewAdapter(data: OrderedRealmCollection<Group>?, auto
                 unfilteredData?.let {
                     if (constraint.isNotEmpty()) {
                         updateData(it.where()
+                                .beginGroup()
                                 .contains("name", constraint.toString(), Case.INSENSITIVE)
+                                .or()
+                                .contains("summary", constraint.toString(), Case.INSENSITIVE)
+                                .endGroup()
                                 .findAll())
                     }
                 }

From 48a99e141268abc3c7926c4b275c8d5d1bf2c10c Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 15 Jan 2020 18:32:17 +0100
Subject: [PATCH 02/62] improve empty task view

---
 .../layout/fragment_refresh_recyclerview.xml  | 16 +----
 Habitica/res/values/strings.xml               |  7 ++
 Habitica/res/values/styles.xml                |  2 -
 .../tasks/TaskRecyclerViewFragment.kt         | 67 +++++++++++++------
 4 files changed, 56 insertions(+), 36 deletions(-)

diff --git a/Habitica/res/layout/fragment_refresh_recyclerview.xml b/Habitica/res/layout/fragment_refresh_recyclerview.xml
index ce1745c57..64d3c0e80 100644
--- a/Habitica/res/layout/fragment_refresh_recyclerview.xml
+++ b/Habitica/res/layout/fragment_refresh_recyclerview.xml
@@ -25,14 +25,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:layout_marginTop="30dp"
-            android:gravity="center"
+            android:layout_marginTop="60dp"
             android:visibility="gone"
-            tools:visibility="visible">
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
+            tools:visibility="visible"
                 style="@style/EmptyView">
                 <TextView
                     android:layout_width="wrap_content"
@@ -48,13 +43,6 @@
                     android:gravity="center"
                     tools:text="No Items" />
             </LinearLayout>
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/justin_textbox"
-                android:layout_marginTop="16dp"
-                />
-        </LinearLayout>
 
     </FrameLayout>
 </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 97a96591a..b7c231502 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -487,6 +487,13 @@
     <string name="empty_title_todos">You don\'t have any To-Dos</string>
     <string name="empty_description_todos">To-Dos are tasks that only need to be completed once. Add checklists to your To-Dos to increase their value.</string>
     <string name="empty_title_rewards">You don\'t have any Rewards</string>
+    <string name="empty_title_habits_filtered">No Habits</string>
+    <string name="empty_description_habits_filtered">There aren\'t any Habits visible with your current filters.</string>
+    <string name="empty_title_dailies_filtered">No Dailies</string>
+    <string name="empty_description_dailies_filtered">There aren\'t any Dailies visible with your current filters.</string>
+    <string name="empty_title_todos_filtered">No To-Dos</string>
+    <string name="empty_description_todos_filtered">There aren\'t any To-Dos visible with your current filters.</string>
+    <string name="empty_title_rewards_filtered">No Rewards</string>
     <string name="reset_walkthrough">Reset Tutorials</string>
     <string name="read_community_guidelines">Review our <u>Community Guidelines</u> before posting</string>
     <string name="maintenance">Maintenance</string>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 8e66f75c9..5e78d1f5b 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -310,9 +310,7 @@
 
     <style name="EmptyView">
         <item name="android:padding">@dimen/section_top_padding</item>
-        <item name="android:layout_gravity">center</item>
         <item name="android:gravity">center</item>
-        <item name="android:background">@color/white</item>
         <item name="android:layout_marginLeft">20dp</item>
         <item name="android:layout_marginRight">20dp</item>
     </style>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
index adc5213e2..da21c70c5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
@@ -277,26 +277,7 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
             }
         })
 
-        if (this.classType != null) {
-            binding.recyclerView.setEmptyView(binding.emptyView)
-            when (this.classType) {
-                Task.TYPE_HABIT -> {
-                    binding.emptyViewTitle.setText(R.string.empty_title_habits)
-                    binding.emptyViewDescription.setText(R.string.empty_description_habits)
-                }
-                Task.TYPE_DAILY -> {
-                    binding.emptyViewTitle.setText(R.string.empty_title_dailies)
-                    binding.emptyViewDescription.setText(R.string.empty_description_dailies)
-                }
-                Task.TYPE_TODO -> {
-                    binding.emptyViewTitle.setText(R.string.empty_title_todos)
-                    binding.emptyViewDescription.setText(R.string.empty_description_todos)
-                }
-                Task.TYPE_REWARD -> {
-                    binding.emptyViewTitle.setText(R.string.empty_title_rewards)
-                }
-            }
-        }
+        setEmptyLabels()
 
         if (Task.TYPE_REWARD == className) {
             compositeSubscription.add(taskRepository.getTasks(this.className, userID)
@@ -304,6 +285,50 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
         }
     }
 
+    private fun setEmptyLabels() {
+        if (this.classType != null) {
+            binding.recyclerView.setEmptyView(binding.emptyView)
+            if (taskFilterHelper.howMany(classType) > 0) {
+                when (this.classType) {
+                    Task.TYPE_HABIT -> {
+                        binding.emptyViewTitle.setText(R.string.empty_title_habits_filtered)
+                        binding.emptyViewDescription.setText(R.string.empty_description_habits_filtered)
+                    }
+                    Task.TYPE_DAILY -> {
+                        binding.emptyViewTitle.setText(R.string.empty_title_dailies_filtered)
+                        binding.emptyViewDescription.setText(R.string.empty_description_dailies_filtered)
+                    }
+                    Task.TYPE_TODO -> {
+                        binding.emptyViewTitle.setText(R.string.empty_title_todos_filtered)
+                        binding.emptyViewDescription.setText(R.string.empty_description_todos_filtered)
+                    }
+                    Task.TYPE_REWARD -> {
+                        binding.emptyViewTitle.setText(R.string.empty_title_rewards)
+                    }
+                }
+            } else {
+                when (this.classType) {
+                    Task.TYPE_HABIT -> {
+                        binding.emptyViewTitle.setText(R.string.empty_title_habits)
+                        binding.emptyViewDescription.setText(R.string.empty_description_habits)
+                    }
+                    Task.TYPE_DAILY -> {
+                        binding.emptyViewTitle.setText(R.string.empty_title_dailies)
+                        binding.emptyViewDescription.setText(R.string.empty_description_dailies)
+                    }
+                    Task.TYPE_TODO -> {
+                        binding.emptyViewTitle.setText(R.string.empty_title_todos)
+                        binding.emptyViewDescription.setText(R.string.empty_description_todos)
+                    }
+                    Task.TYPE_REWARD -> {
+                        binding.emptyViewTitle.setText(R.string.empty_title_rewards)
+                    }
+                }
+            }
+
+        }
+    }
+
     private fun scoreTask(task: Task, direction: TaskDirection) {
         compositeSubscription.add(taskRepository.taskChecked(user, task, direction == TaskDirection.UP, false) { result ->
             handleTaskResult(result, task.value.toInt())
@@ -330,6 +355,8 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
         taskFilterHelper.setActiveFilter(classType ?: "", activeFilter)
         recyclerAdapter?.filter()
 
+        setEmptyLabels()
+
         if (activeFilter == Task.FILTER_COMPLETED) {
             compositeSubscription.add(taskRepository.retrieveCompletedTodos(userID).subscribe(Consumer {}, RxErrorHandler.handleEmptyError()))
         }

From a8914d4b956886798727beef7c0ed1ee8a636a56 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 15 Jan 2020 19:24:06 +0100
Subject: [PATCH 03/62] Improve background handling

---
 Habitica/res/navigation/navigation.xml                    | 7 ++++++-
 Habitica/res/values/styles.xml                            | 4 ++--
 .../ui/adapter/CustomizationRecyclerViewAdapter.kt        | 2 +-
 .../ui/fragments/inventory/shops/ShopsFragment.kt         | 7 +++++++
 .../android/habitica/ui/views/shops/PurchaseDialog.kt     | 8 ++++----
 .../habitica/ui/views/shops/PurchaseDialogContent.kt      | 6 ++++++
 6 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/Habitica/res/navigation/navigation.xml b/Habitica/res/navigation/navigation.xml
index 88c24f4ec..4c754d467 100644
--- a/Habitica/res/navigation/navigation.xml
+++ b/Habitica/res/navigation/navigation.xml
@@ -110,7 +110,12 @@
     <fragment
         android:id="@+id/shopsFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.inventory.shops.ShopsFragment"
-        android:label="@string/sidebar_shops" />
+        android:label="@string/sidebar_shops" >
+        <argument
+            android:name="selectedTab"
+            app:argType="integer"
+            android:defaultValue="0" />
+    </fragment>
     <fragment
         android:id="@+id/avatarOverviewFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarOverviewFragment"
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 5e78d1f5b..b6b545f14 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -272,11 +272,11 @@
     </style>
 
     <style name="AlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
-        <item name="colorAccent">@color/brand_100</item>
+        <item name="colorAccent">@color/brand_400</item>
     </style>
 
     <style name="HabiticaAlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
-        <item name="colorAccent">@color/brand_100</item>
+        <item name="colorAccent">@color/brand_400</item>
         <item name="android:windowFrame">@null</item>
         <item name="android:windowIsFloating">true</item>
         <item name="android:windowContentOverlay">@null</item>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
index 2443010bf..97cd93b1b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
@@ -163,7 +163,7 @@ class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerVi
                     val dialog = HabiticaAlertDialog(itemView.context)
                     dialog.setMessage(R.string.purchase_from_timetravel_shop)
                     dialog.addButton(R.string.go_shopping, true) { _, _ ->
-                        MainNavigationController.navigate(R.id.shopsFragment)
+                        MainNavigationController.navigate(R.id.shopsFragment, bundleOf(Pair("selectedTab", 3)))
                     }
                     dialog.addButton(R.string.reward_dialog_dismiss, false)
                     dialog.show()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.kt
index 1b9b08c8d..51abb2240 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.kt
@@ -39,6 +39,13 @@ class ShopsFragment : BaseMainFragment() {
         setViewPagerAdapter()
         toolbarAccessoryContainer?.addView(currencyView)
 
+        arguments?.let {
+            val args = ShopsFragmentArgs.fromBundle(it)
+            if (args.selectedTab > 0) {
+                viewPager.currentItem = args.selectedTab
+            }
+        }
+
         compositeSubscription.add(userRepository.getUser().subscribe(Consumer { updateCurrencyView(it) }, RxErrorHandler.handleEmptyError()))
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
index f0114ca20..733c844fd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
@@ -206,7 +206,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
             val gemsLeft = if (shopItem.limitedNumberLeft != null) shopItem.limitedNumberLeft else 0
             if ((gemsLeft == 0 && shopItem.purchaseType == "gems") || shopItem.canAfford(user, false)) {
                 val observable: Flowable<Any>
-                if (shopIdentifier != null && shopIdentifier == Shop.TIME_TRAVELERS_SHOP || "mystery_set" == shopItem.purchaseType) {
+                if (shopIdentifier != null && shopIdentifier == Shop.TIME_TRAVELERS_SHOP || "mystery_set" == shopItem.purchaseType || shopItem.currency == "hourglasses") {
                     observable = if (shopItem.purchaseType == "gear") {
                         inventoryRepository.purchaseMysterySet(shopItem.key)
                     } else {
@@ -253,7 +253,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
                         .flatMap { userRepository.retrieveUser(withTasks = false, forced = true) }
                         .flatMap { inventoryRepository.retrieveInAppRewards() }
                         .subscribe({
-                            if (item.isTypeGear) {
+                            if (item.isTypeGear || item.currency == "hourglasses") {
                                 EventBus.getDefault().post(GearPurchasedEvent(item))
                             }
                         }) { throwable ->
@@ -280,9 +280,9 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
 
     private fun setBuyButtonEnabled(enabled: Boolean) {
         if (enabled) {
-            buyButton.alpha = 0.5f
-        } else {
             buyButton.alpha = 1.0f
+        } else {
+            buyButton.alpha = 0.5f
         }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogContent.kt
index b4189d4bd..0cf7b2576 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogContent.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogContent.kt
@@ -8,11 +8,13 @@ import android.widget.TextView
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.drawee.view.SimpleDraweeView
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.dpToPx
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.shops.ShopItem
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import com.habitrpg.android.habitica.ui.helpers.bindView
 
+
 abstract class PurchaseDialogContent : LinearLayout {
 
     private val imageView: SimpleDraweeView by bindView(R.id.imageView)
@@ -43,6 +45,10 @@ abstract class PurchaseDialogContent : LinearLayout {
                     .setAutoPlayAnimations(true)
                     .build()
             imageView.controller = controller
+            val params = imageView.layoutParams
+            params.height = 147.dpToPx(context)
+            params.width = 140.dpToPx(context)
+            imageView.layoutParams = params
         } else {
             DataBindingUtils.loadImage(imageView, item.imageName)
         }

From a5f5e98aad811c3397a0e12ba499447710537ab2 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 21 Jan 2020 14:54:17 +0100
Subject: [PATCH 04/62] Attempt workaround for apple sign in

---
 Habitica/build.gradle                         |  10 +-
 Habitica/res/layout/activity_login.xml        |   9 ++
 Habitica/res/values/strings.xml               |   1 +
 .../android/habitica/api/ApiService.kt        |   2 +
 .../android/habitica/data/ApiClient.kt        |   2 +
 .../data/implementation/ApiClientImpl.kt      |   4 +
 .../habitica/helpers/SignInWebViewClient.kt   |  64 +++++++++++
 .../helpers/SignInWebViewDialogFragment.kt    | 103 ++++++++++++++++++
 .../helpers/SignInWithAppleService.kt         |  89 +++++++++++++++
 .../habitica/ui/activities/LoginActivity.kt   |  27 ++++-
 10 files changed, 303 insertions(+), 8 deletions(-)
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SignInWebViewClient.kt
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SignInWebViewDialogFragment.kt
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SignInWithAppleService.kt

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 0cabe7d08..c3c83f52f 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -17,7 +17,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'io.fabric.tools:gradle:1.31.0'
+        classpath 'io.fabric.tools:gradle:1.+'
         classpath('com.noveogroup.android:check:1.2.5') {
             exclude module: 'checkstyle'
             exclude module: 'pmd-java'
@@ -115,10 +115,10 @@ dependencies {
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.2'
     releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.2'
     //Push Notifications
-    implementation 'com.google.firebase:firebase-core:17.2.1'
+    implementation 'com.google.firebase:firebase-core:17.2.2'
     implementation 'com.google.firebase:firebase-messaging:20.1.0'
     implementation 'com.google.firebase:firebase-config:19.1.0'
-    implementation 'com.google.firebase:firebase-perf:19.0.4'
+    implementation 'com.google.firebase:firebase-perf:19.0.5'
     implementation 'com.google.android.gms:play-services-auth:17.0.0'
     implementation 'io.realm:android-adapters:3.1.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
@@ -135,6 +135,8 @@ dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'
 
+    implementation 'com.willowtreeapps:signinwithapplebutton:0.2'
+
     implementation project(':shared')
 }
 
@@ -152,7 +154,7 @@ android {
         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 2346
-        versionName "2.4.2"
+        versionName "2.5"
     }
 
     viewBinding {
diff --git a/Habitica/res/layout/activity_login.xml b/Habitica/res/layout/activity_login.xml
index a7d91600d..96bf5d711 100644
--- a/Habitica/res/layout/activity_login.xml
+++ b/Habitica/res/layout/activity_login.xml
@@ -213,6 +213,15 @@
                         android:drawableLeft="@drawable/google_icon"
                         style="@style/LoginButton"/>
 
+                    <Button
+                        android:id="@+id/apple_login_button"
+                        android:layout_width="match_parent"
+                        android:layout_marginTop="@dimen/spacing_large"
+                        android:layout_height="@dimen/diamond_button_height"
+                        android:text="@string/login_btn_apple"
+                        android:drawableLeft="@drawable/google_icon"
+                        style="@style/LoginButton"/>
+
                     <Button
                         android:id="@+id/forgot_password"
                         android:layout_width="match_parent"
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index b7c231502..7893f6526 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -461,6 +461,7 @@
     <string name="not_owned">Not owned</string>
     <string name="login_btn_fb">Login with Facebook</string>
     <string name="login_btn_google">Login with Google</string>
+    <string name="login_btn_apple">Sign in with Apple</string>
     <string name="register_btn_fb">Sign up with Facebook</string>
     <string name="register_btn_google">Sign up with Google</string>
     <string name="action_back">Back</string>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
index b166b4556..e512fe1d3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
@@ -138,6 +138,8 @@ interface ApiService {
     @POST("user/auth/social")
     fun connectSocial(@Body auth: UserAuthSocial): Flowable<HabitResponse<UserAuthResponse>>
 
+    @POST("user/auth/apple")
+    fun loginApple(@Body auth: Map<String, Any>): Flowable<HabitResponse<UserAuthResponse>>
 
     @POST("user/sleep")
     fun sleep(): Flowable<HabitResponse<Boolean>>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
index 3ecd884f3..98a3d2177 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
@@ -103,6 +103,8 @@ interface ApiClient {
     fun connectUser(username: String, password: String): Flowable<UserAuthResponse>
 
     fun connectSocial(network: String, userId: String, accessToken: String): Flowable<UserAuthResponse>
+    fun loginApple(authToken: String): Flowable<UserAuthResponse>
+
     fun sleep(): Flowable<Boolean>
 
     fun revive(): Flowable<User>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
index d9763c4ad..60f7dcaf6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
@@ -174,6 +174,10 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
         return this.apiService.connectSocial(auth).compose(configureApiCallObserver())
     }
 
+    override fun loginApple(authToken: String): Flowable<UserAuthResponse> {
+        return apiService.loginApple(mapOf(Pair("code", authToken))).compose(configureApiCallObserver())
+    }
+
     override fun accept(throwable: Throwable) {
         val throwableClass = throwable.javaClass
         if (SocketTimeoutException::class.java.isAssignableFrom(throwableClass)) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SignInWebViewClient.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SignInWebViewClient.kt
new file mode 100644
index 000000000..cbca5f2a1
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SignInWebViewClient.kt
@@ -0,0 +1,64 @@
+package com.habitrpg.android.habitica.helpers
+
+import android.net.Uri
+import android.os.Build
+import android.util.Log
+import android.webkit.WebResourceRequest
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import androidx.annotation.RequiresApi
+
+class SignInWebViewClient(
+        private val attempt: SignInWithAppleService.AuthenticationAttempt,
+        private val callback: (SignInWithAppleResult) -> Unit
+) : WebViewClient() {
+
+    // for API levels < 24
+    override fun shouldOverrideUrlLoading(view: WebView?, url: String?): Boolean {
+        return isUrlOverridden(view, Uri.parse(url))
+    }
+
+    @RequiresApi(Build.VERSION_CODES.N)
+    override fun shouldOverrideUrlLoading(view: WebView?, request: WebResourceRequest?): Boolean {
+        return isUrlOverridden(view, request?.url)
+    }
+
+    private fun isUrlOverridden(view: WebView?, url: Uri?): Boolean {
+        return when {
+            url == null -> {
+                false
+            }
+            url.toString().contains("appleid.apple.com") -> {
+                view?.loadUrl(url.toString())
+                true
+            }
+            (url.toString().contains(attempt.redirectUri) || url.toString().contains("userID")) -> {
+                Log.d("Apple Sign in", "Web view was forwarded to redirect URI")
+
+                val userID = url.getQueryParameter("userID")
+                val apiKey = url.getQueryParameter("key")
+
+                when {
+                    userID == null || apiKey == null -> {
+                        callback(SignInWithAppleResult.Failure(IllegalArgumentException("data not returned")))
+                    }
+                    else -> {
+                        callback(SignInWithAppleResult.Success(userID, apiKey, url.getQueryParameter("newUser") == "true"))
+                    }
+                }
+
+                true
+            }
+            else -> {
+                false
+            }
+        }
+    }
+
+}
+
+sealed class SignInWithAppleResult {
+    data class Success(val userID: String, val apiKey: String, val newUser: Boolean) : SignInWithAppleResult()
+    data class Failure(val error: Throwable) : SignInWithAppleResult()
+    object Cancel : SignInWithAppleResult()
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SignInWebViewDialogFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SignInWebViewDialogFragment.kt
new file mode 100644
index 000000000..b500877b9
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SignInWebViewDialogFragment.kt
@@ -0,0 +1,103 @@
+package com.habitrpg.android.habitica.helpers
+
+import android.content.DialogInterface
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.webkit.WebView
+import androidx.fragment.app.DialogFragment
+import com.habitrpg.android.habitica.R
+
+class SignInWebViewDialogFragment : DialogFragment() {
+
+    companion object {
+        private const val AUTHENTICATION_ATTEMPT_KEY = "authenticationAttempt"
+        private const val WEB_VIEW_KEY = "webView"
+
+        fun newInstance(authenticationAttempt: SignInWithAppleService.AuthenticationAttempt): SignInWebViewDialogFragment {
+            val fragment = SignInWebViewDialogFragment()
+            fragment.arguments = Bundle().apply {
+                putParcelable(AUTHENTICATION_ATTEMPT_KEY, authenticationAttempt)
+            }
+            return fragment
+        }
+    }
+
+    private lateinit var authenticationAttempt: SignInWithAppleService.AuthenticationAttempt
+    private var callback: ((SignInWithAppleResult) -> Unit)? = null
+
+    private val webViewIfCreated: WebView?
+        get() = view as? WebView
+
+    fun configure(callback: (SignInWithAppleResult) -> Unit) {
+        this.callback = callback
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        authenticationAttempt = arguments?.getParcelable(AUTHENTICATION_ATTEMPT_KEY)!!
+        setStyle(STYLE_NORMAL, R.style.sign_in_with_apple_button_DialogTheme)
+    }
+
+    override fun onCreateView(
+            inflater: LayoutInflater,
+            container: ViewGroup?,
+            savedInstanceState: Bundle?
+    ): View? {
+        super.onCreateView(inflater, container, savedInstanceState)
+
+        val webView = WebView(context).apply {
+            settings.apply {
+                javaScriptEnabled = true
+                javaScriptCanOpenWindowsAutomatically = true
+            }
+        }
+
+        webView.webViewClient = SignInWebViewClient(authenticationAttempt, ::onCallback)
+
+        if (savedInstanceState != null) {
+            savedInstanceState.getBundle(WEB_VIEW_KEY)?.run {
+                webView.restoreState(this)
+            }
+        } else {
+            webView.loadUrl(authenticationAttempt.authenticationUri)
+        }
+
+        return webView
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putBundle(
+                WEB_VIEW_KEY,
+                Bundle().apply {
+                    webViewIfCreated?.saveState(this)
+                }
+        )
+    }
+
+    override fun onStart() {
+        super.onStart()
+
+        dialog?.window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
+    }
+
+    override fun onCancel(dialog: DialogInterface) {
+        super.onCancel(dialog)
+        onCallback(SignInWithAppleResult.Cancel)
+    }
+
+    // SignInWithAppleCallback
+
+    private fun onCallback(result: SignInWithAppleResult) {
+        dialog?.dismiss()
+        val callback = callback
+        if (callback == null) {
+            Log.e("Apple Sign in", "Callback is not configured")
+            return
+        }
+        callback(result)
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SignInWithAppleService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SignInWithAppleService.kt
new file mode 100644
index 000000000..4cb72216d
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SignInWithAppleService.kt
@@ -0,0 +1,89 @@
+package com.habitrpg.android.habitica.helpers
+
+import android.net.Uri
+import android.os.Parcel
+import android.os.Parcelable
+import androidx.fragment.app.FragmentManager
+import com.willowtreeapps.signinwithapplebutton.SignInWithAppleConfiguration
+import java.util.*
+
+class SignInWithAppleService(
+        private val fragmentManager: FragmentManager,
+        private val fragmentTag: String,
+        private val configuration: SignInWithAppleConfiguration,
+        private val callback: (SignInWithAppleResult) -> Unit
+) {
+
+    init {
+        val fragmentIfShown =
+                fragmentManager.findFragmentByTag(fragmentTag) as? SignInWebViewDialogFragment
+        fragmentIfShown?.configure(callback)
+    }
+
+    data class AuthenticationAttempt(
+            val authenticationUri: String,
+            val redirectUri: String,
+            val state: String
+    ) : Parcelable {
+        constructor(parcel: Parcel) : this(
+                parcel.readString() ?: "invalid",
+                parcel.readString() ?: "invalid",
+                parcel.readString() ?: "invalid"
+        )
+
+        override fun writeToParcel(parcel: Parcel, flags: Int) {
+            parcel.writeString(authenticationUri)
+            parcel.writeString(redirectUri)
+            parcel.writeString(state)
+        }
+
+        override fun describeContents(): Int {
+            return 0
+        }
+
+        companion object CREATOR : Parcelable.Creator<AuthenticationAttempt> {
+
+            override fun createFromParcel(parcel: Parcel) = AuthenticationAttempt(parcel)
+
+            override fun newArray(size: Int): Array<AuthenticationAttempt?> = arrayOfNulls(size)
+
+            /*
+            The authentication page URI we're creating is based off the URI constructed by Apple's JavaScript SDK,
+            which is why certain fields (like the version, v) are included in the URI construction.
+
+            We have to build this URI ourselves because Apple's behavior in JavaScript is to POST the response,
+            while we need a GET so we can retrieve the authentication code and verify the state
+            merely by intercepting the URL.
+
+            See the Sign In With Apple Javascript SDK for comparison:
+            https://developer.apple.com/documentation/signinwithapplejs/configuring_your_webpage_for_sign_in_with_apple
+            */
+            fun create(
+                    configuration: SignInWithAppleConfiguration,
+                    state: String = UUID.randomUUID().toString()
+            ): AuthenticationAttempt {
+                val authenticationUri = Uri
+                        .parse("https://appleid.apple.com/auth/authorize")
+                        .buildUpon().apply {
+                            appendQueryParameter("response_type", "code")
+                            appendQueryParameter("v", "1.1.6")
+                            appendQueryParameter("client_id", configuration.clientId)
+                            appendQueryParameter("redirect_uri", configuration.redirectUri)
+                            appendQueryParameter("scope", configuration.scope)
+                            appendQueryParameter("state", state)
+                            appendQueryParameter("response_mode", "form_post")
+                        }
+                        .build()
+                        .toString()
+
+                return AuthenticationAttempt(authenticationUri, configuration.redirectUri, state)
+            }
+        }
+    }
+
+    fun show() {
+        val fragment = SignInWebViewDialogFragment.newInstance(AuthenticationAttempt.create(configuration))
+        fragment.configure(callback)
+        fragment.show(fragmentManager, fragmentTag)
+    }
+}
\ No newline at end of file
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 6cb9e185b..a7e83d8e9 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
@@ -31,6 +31,7 @@ import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
 import com.google.android.gms.common.GooglePlayServicesUtil
 import com.google.android.gms.common.Scopes
+import com.habitrpg.android.habitica.BuildConfig
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.api.HostConfig
@@ -40,10 +41,7 @@ import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.extensions.addCancelButton
 import com.habitrpg.android.habitica.extensions.addCloseButton
 import com.habitrpg.android.habitica.extensions.addOkButton
-import com.habitrpg.android.habitica.helpers.AmplitudeManager
-import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.KeyHelper
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.*
 import com.habitrpg.android.habitica.models.auth.UserAuthResponse
 import com.habitrpg.android.habitica.proxy.CrashlyticsProxy
 import com.habitrpg.android.habitica.ui.helpers.bindView
@@ -51,6 +49,7 @@ import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.login.LockableScrollView
 import com.habitrpg.android.habitica.ui.views.login.LoginBackgroundView
+import com.willowtreeapps.signinwithapplebutton.SignInWithAppleConfiguration
 import io.reactivex.Flowable
 import io.reactivex.exceptions.Exceptions
 import io.reactivex.functions.Consumer
@@ -96,6 +95,7 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
     private val forgotPasswordButton: Button by bindView(R.id.forgot_password)
     private val facebookLoginButton: Button by bindView(R.id.fb_login_button)
     private val googleLoginButton: Button by bindView(R.id.google_login_button)
+    private val appleLoginButton: Button by bindView(R.id.apple_login_button)
 
     private var callbackManager = CallbackManager.Factory.create()
     private var googleEmail: String? = null
@@ -177,6 +177,25 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
         forgotPasswordButton.setOnClickListener { onForgotPasswordClicked() }
         facebookLoginButton.setOnClickListener { handleFacebookLogin() }
         googleLoginButton.setOnClickListener { handleGoogleLogin() }
+        appleLoginButton.setOnClickListener {
+            val configuration = SignInWithAppleConfiguration(
+                    clientId = BuildConfig.APPLE_AUTH_CLIENT_ID,
+                    redirectUri = "https://habitrpg-delta.herokuapp.com/api/v4/user/auth/apple",
+                    scope = "name email"
+            )
+            val fragmentTag = "SignInWithAppleButton-SignInWebViewDialogFragment"
+
+            SignInWithAppleService(supportFragmentManager, fragmentTag, configuration) { result ->
+                when (result) {
+                    is SignInWithAppleResult.Success -> {
+                        val response = UserAuthResponse()
+                        response.id = result.userID
+                        response.apiToken = result.apiKey
+                        response.newUser = result.newUser
+                    }
+                }
+            }.show()
+        }
     }
 
     private fun setupFacebookLogin() {

From 7bcc4062b44a9e2652cfb38bc09a3a5735a64490 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 23 Jan 2020 17:45:19 +0100
Subject: [PATCH 05/62] Fix crash

# Conflicts:
#	Habitica/build.gradle
---
 .../com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt | 4 ++++
 .../ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt
index d29ae2a96..fa048f726 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt
@@ -4,6 +4,7 @@ import com.habitrpg.android.habitica.models.tasks.Task
 import io.realm.Case
 import io.realm.OrderedRealmCollection
 import io.realm.RealmQuery
+import io.realm.Sort
 import java.util.*
 
 class TaskFilterHelper {
@@ -115,6 +116,9 @@ class TaskFilterHelper {
                     Task.FILTER_COMPLETED -> query = query.equalTo("completed", true)
                 }
             }
+            if (activeFilter != Task.FILTER_DATED) {
+                query = query.sort("position", Sort.ASCENDING, "dateCreated", Sort.DESCENDING)
+            }
         }
         return query
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt
index e3fcafabe..661b72ce5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt
@@ -146,7 +146,7 @@ abstract class RealmBaseTasksRecyclerViewAdapter<VH : BaseTaskViewHolder>(
         if (taskFilterHelper != null) {
             val query = taskFilterHelper.createQuery(unfilteredData)
             if (query != null) {
-                updateData(query.sort("position").findAll())
+                updateData(query.findAll())
             }
         }
     }

From f8fe4d49e6259cf42948fe136b7077752e5c0425 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Fri, 24 Jan 2020 15:05:52 +0100
Subject: [PATCH 06/62] Add settings for email notifications

---
 Habitica/res/values/strings.xml               |  7 +-
 Habitica/res/xml/preferences_fragment.xml     | 81 ++++++++++++++++++-
 .../habitica/components/UserComponent.java    |  3 +
 .../user/EmailNotificationsPreference.kt      | 19 +++++
 .../habitica/models/user/Preferences.kt       |  1 +
 .../habitica/ui/activities/PrefsActivity.kt   |  7 +-
 .../EmailNotificationsPreferencesFragment.kt  | 80 ++++++++++++++++++
 .../preferences/PreferencesFragment.kt        | 13 ++-
 8 files changed, 202 insertions(+), 9 deletions(-)
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/user/EmailNotificationsPreference.kt
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt

diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 7893f6526..b1a069c2d 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -25,7 +25,7 @@
 
     <string name="pref_cds_header">Custom Day Start</string>
 
-    <string name="pref_push_notifications_checkbox">User Push Notifications</string>
+    <string name="pref_push_notifications_checkbox">Use Push Notifications</string>
     <string name="push_notifications">Push Notifications</string>
     <string name="push_notifications_sum">Set your push notifications settings</string>
     <string name="preference_push_you_won_challenge">You won a Challenge!</string>
@@ -936,4 +936,9 @@
     <string name="learn_more">Learn more</string>
     <string name="purchase_from_timetravel_shop">You can purchase this customization from the Time Travelers shop</string>
     <string name="go_shopping">Go shopping</string>
+    <string name="emails">Email Notifications</string>
+    <string name="pref_emails_checkbox">Use Email Notifications</string>
+    <string name="preference_email_subscription_reminder">Subscription Reminders</string>
+    <string name="preference_email_kicked_group">Kicked from group</string>
+    <string name="preference_email_onboarding">Guidance with setting up your Habitica Account</string>
 </resources>
diff --git a/Habitica/res/xml/preferences_fragment.xml b/Habitica/res/xml/preferences_fragment.xml
index 1adcef4e7..f88a0744a 100644
--- a/Habitica/res/xml/preferences_fragment.xml
+++ b/Habitica/res/xml/preferences_fragment.xml
@@ -273,9 +273,88 @@
                     android:title="@string/preference_push_unjoined_guild_mention"
                     android:layout="@layout/preference_child_summary"/>
             </PreferenceCategory>
-
         </PreferenceScreen>
+    </PreferenceCategory>
 
+
+    <PreferenceCategory
+        android:title="@string/emails"
+        android:layout="@layout/preference_category">
+
+        <CheckBoxPreference
+            android:key="useEmails"
+            android:defaultValue="true"
+            android:title="@string/pref_emails_checkbox"
+            android:layout="@layout/preference_child_summary"/>
+
+        <PreferenceScreen
+            android:key="emailNotifications"
+            android:title="@string/emails"
+            android:layout="@layout/preference_child_summary">
+
+            <PreferenceCategory android:title="@string/emails">
+                <CheckBoxPreference
+                    android:key="preference_email_you_won_challenge"
+                    android:defaultValue="true"
+                    android:title="@string/preference_push_you_won_challenge"
+                    android:layout="@layout/preference_child_summary"/>
+                <CheckBoxPreference
+                    android:key="preference_email_onboarding"
+                    android:defaultValue="true"
+                    android:title="@string/preference_email_onboarding"
+                    android:layout="@layout/preference_child_summary"/>
+                <CheckBoxPreference
+                    android:key="preference_email_received_a_private_message"
+                    android:defaultValue="true"
+                    android:title="@string/preference_push_received_a_private_message"
+                    android:layout="@layout/preference_child_summary"/>
+                <CheckBoxPreference
+                    android:key="preference_email_gifted_gems"
+                    android:defaultValue="true"
+                    android:title="@string/preference_push_gifted_gems"
+                    android:layout="@layout/preference_child_summary"/>
+                <CheckBoxPreference
+                    android:key="preference_email_gifted_subscription"
+                    android:defaultValue="true"
+                    android:title="@string/preference_push_gifted_subscription"
+                    android:layout="@layout/preference_child_summary"/>
+                <CheckBoxPreference
+                    android:key="preference_email_invited_to_party"
+                    android:defaultValue="true"
+                    android:title="@string/preference_push_invited_to_party"
+                    android:layout="@layout/preference_child_summary"/>
+                <CheckBoxPreference
+                    android:key="preference_email_invited_to_guild"
+                    android:defaultValue="true"
+                    android:title="@string/preference_push_invited_to_guild"
+                    android:layout="@layout/preference_child_summary"/>
+                <CheckBoxPreference
+                    android:key="preference_email_kicked_group"
+                    android:defaultValue="true"
+                    android:title="@string/preference_email_kicked_group"
+                    android:layout="@layout/preference_child_summary"/>
+                <CheckBoxPreference
+                    android:key="preference_email_your_quest_has_begun"
+                    android:defaultValue="true"
+                    android:title="@string/preference_push_your_quest_has_begun"
+                    android:layout="@layout/preference_child_summary"/>
+                <CheckBoxPreference
+                    android:key="preference_email_invited_to_quest"
+                    android:defaultValue="true"
+                    android:title="@string/preference_push_invited_to_quest"
+                    android:layout="@layout/preference_child_summary"/>
+                <CheckBoxPreference
+                    android:key="preference_email_important_announcements"
+                    android:defaultValue="true"
+                    android:title="@string/preference_push_important_announcements"
+                    android:layout="@layout/preference_child_summary"/>
+                <CheckBoxPreference
+                    android:key="preference_email_subscription_reminder"
+                    android:defaultValue="true"
+                    android:title="@string/preference_email_subscription_reminder"
+                    android:layout="@layout/preference_child_summary"/>
+            </PreferenceCategory>
+        </PreferenceScreen>
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
index 5ed847c18..9188749dc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
@@ -42,6 +42,7 @@ import com.habitrpg.android.habitica.ui.adapter.tasks.RewardsRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.adapter.tasks.TodosRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.AboutFragment;
 import com.habitrpg.android.habitica.ui.fragments.AchievementsFragment;
+import com.habitrpg.android.habitica.ui.fragments.preferences.EmailNotificationsPreferencesFragment;
 import com.habitrpg.android.habitica.ui.fragments.purchases.GemsPurchaseFragment;
 import com.habitrpg.android.habitica.ui.fragments.NavigationDrawerFragment;
 import com.habitrpg.android.habitica.ui.fragments.NewsFragment;
@@ -328,4 +329,6 @@ public interface UserComponent {
     void inject(@NotNull GiftPurchaseGemsFragment giftPurchaseGemsFragment);
 
     void inject(@NotNull GiftBalanceGemsFragment giftBalanceGemsFragment);
+
+    void inject(@NotNull EmailNotificationsPreferencesFragment emailNotificationsPreferencesFragment);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/EmailNotificationsPreference.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/EmailNotificationsPreference.kt
new file mode 100644
index 000000000..f12b85dc9
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/EmailNotificationsPreference.kt
@@ -0,0 +1,19 @@
+package com.habitrpg.android.habitica.models.user
+
+import io.realm.RealmObject
+
+open class EmailNotificationsPreference : RealmObject() {
+    var unsubscribeFromAll: Boolean = false
+    var invitedParty: Boolean = false
+    var invitedQuest: Boolean = false
+    var majorUpdates: Boolean = false
+    var wonChallenge: Boolean = false
+    var invitedGuild: Boolean = false
+    var newPM: Boolean = false
+    var questStarted: Boolean = false
+    var giftedGems: Boolean = false
+    var giftedSubscription: Boolean = false
+    var subscriptionReminders: Boolean = false
+    var onboarding: Boolean = false
+    var kickedGroup: Boolean = false
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
index 968232525..ef7644cda 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
@@ -33,6 +33,7 @@ open class Preferences : RealmObject(), AvatarPreferences {
     var timezoneOffset: Int = 0
     var timezoneOffsetAtLastCron: Int = 0
     var pushNotifications: PushNotificationsPreference? = null
+    var emailNotifications: EmailNotificationsPreference? = null
     var autoEquip: Boolean = true
 
     override fun getBackground(): String? {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.kt
index a068a6d64..74bd3fe44 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.kt
@@ -5,11 +5,7 @@ import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceScreen
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
-import com.habitrpg.android.habitica.ui.fragments.preferences.APIPreferenceFragment
-import com.habitrpg.android.habitica.ui.fragments.preferences.AuthenticationPreferenceFragment
-import com.habitrpg.android.habitica.ui.fragments.preferences.PreferencesFragment
-import com.habitrpg.android.habitica.ui.fragments.preferences.ProfilePreferencesFragment
-import com.habitrpg.android.habitica.ui.fragments.preferences.PushNotificationsPreferencesFragment
+import com.habitrpg.android.habitica.ui.fragments.preferences.*
 import kotlinx.android.synthetic.main.activity_prefs.*
 
 class PrefsActivity : BaseActivity(), PreferenceFragmentCompat.OnPreferenceStartScreenCallback {
@@ -60,6 +56,7 @@ class PrefsActivity : BaseActivity(), PreferenceFragmentCompat.OnPreferenceStart
                 "authentication" -> AuthenticationPreferenceFragment()
                 "api" -> APIPreferenceFragment()
                 "pushNotifications" -> PushNotificationsPreferencesFragment()
+                "emailNotifications" -> EmailNotificationsPreferencesFragment()
                 else -> null
             }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt
new file mode 100644
index 000000000..41048a0a0
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt
@@ -0,0 +1,80 @@
+package com.habitrpg.android.habitica.ui.fragments.preferences
+
+import android.content.SharedPreferences
+import android.os.Bundle
+import androidx.preference.CheckBoxPreference
+import com.habitrpg.android.habitica.HabiticaBaseApplication
+import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.models.user.User
+import io.reactivex.functions.Consumer
+
+class EmailNotificationsPreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnSharedPreferenceChangeListener {
+
+    private var isInitialSet: Boolean = true
+    private var isSettingUser: Boolean = false
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        HabiticaBaseApplication.userComponent?.inject(this)
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        preferenceScreen.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        preferenceScreen.sharedPreferences.unregisterOnSharedPreferenceChangeListener(this)
+    }
+
+    override fun setupPreferences() { /* no-on */ }
+
+    override fun setUser(user: User?) {
+        super.setUser(user)
+        isSettingUser = !isInitialSet
+        updatePreference("preference_email_you_won_challenge", user?.preferences?.emailNotifications?.wonChallenge)
+        updatePreference("preference_email_received_a_private_message", user?.preferences?.emailNotifications?.newPM)
+        updatePreference("preference_email_gifted_gems", user?.preferences?.emailNotifications?.giftedGems)
+        updatePreference("preference_email_gifted_subscription", user?.preferences?.emailNotifications?.giftedSubscription)
+        updatePreference("preference_email_invited_to_party", user?.preferences?.emailNotifications?.invitedParty)
+        updatePreference("preference_email_invited_to_guild", user?.preferences?.emailNotifications?.invitedGuild)
+        updatePreference("preference_email_your_quest_has_begun", user?.preferences?.emailNotifications?.questStarted)
+        updatePreference("preference_email_invited_to_quest", user?.preferences?.emailNotifications?.invitedQuest)
+        updatePreference("preference_email_important_announcements", user?.preferences?.emailNotifications?.majorUpdates)
+        updatePreference("preference_email_kicked_group", user?.preferences?.emailNotifications?.kickedGroup)
+        updatePreference("preference_email_onboarding", user?.preferences?.emailNotifications?.onboarding)
+        updatePreference("preference_email_subscription_reminders", user?.preferences?.emailNotifications?.subscriptionReminders)
+        isSettingUser = false
+        isInitialSet = false
+    }
+
+    private fun updatePreference(key: String, isChecked: Boolean?) {
+        val preference = (findPreference(key) as? CheckBoxPreference)
+        preference?.isChecked = isChecked == true
+    }
+
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+        if (isSettingUser) {
+            return
+        }
+        val pathKey = when (key) {
+            "preference_email_you_won_challenge" -> "wonChallenge"
+            "preference_email_received_a_private_message" -> "newPM"
+            "preference_email_gifted_gems" -> "giftedGems"
+            "preference_email_gifted_subscription" -> "giftedSubscription"
+            "preference_email_invited_to_party" -> "invitedParty"
+            "preference_email_invited_to_guild" -> "invitedGuild"
+            "preference_email_your_quest_has_begun" -> "questStarted"
+            "preference_email_invited_to_quest" -> "invitedQuest"
+            "preference_email_important_announcements" -> "majorUpdates"
+            "preference_email_kicked_group" -> "kickedGroup"
+            "preference_email_onboarding" -> "onboarding"
+            "preference_email_subscription_reminders" -> "subscriptionReminders"
+            else -> null
+        }
+        if (pathKey != null) {
+            compositeSubscription.add(userRepository.updateUser(user, "preferences.emailNotifications.$pathKey", sharedPreferences.getBoolean(key, false)).subscribe(Consumer {  }, RxErrorHandler.handleEmptyError()))
+        }
+    }
+}
\ No newline at end of file
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 634185767..37a0ca815 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
@@ -44,6 +44,7 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
 
     private var timePreference: TimePreference? = null
     private var pushNotificationsPreference: PreferenceScreen? = null
+    private var emailNotificationsPreference: PreferenceScreen? = null
     private var classSelectionPreference: Preference? = null
     private var serverUrlPreference: ListPreference? = null
 
@@ -60,8 +61,12 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
 
 
         pushNotificationsPreference = findPreference("pushNotifications") as? PreferenceScreen
-        val userPushNotifications = preferenceManager.sharedPreferences.getBoolean("usePushNotifications", true)
-        pushNotificationsPreference?.isEnabled = userPushNotifications
+        val usePushNotifications = preferenceManager.sharedPreferences.getBoolean("usePushNotifications", true)
+        pushNotificationsPreference?.isEnabled = usePushNotifications
+
+        emailNotificationsPreference = findPreference("emailNotifications") as? PreferenceScreen
+        val useEmailNotifications = preferenceManager.sharedPreferences.getBoolean("useEmailNotifications", true)
+        emailNotificationsPreference?.isEnabled = useEmailNotifications
 
 
         classSelectionPreference = findPreference("choose_class")
@@ -161,6 +166,10 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
                     pushNotificationManager.removePushDeviceUsingStoredToken()
                 }
             }
+            "useEmailNotifications" -> {
+                val useEmailNotifications = sharedPreferences.getBoolean(key, false)
+                emailNotificationsPreference?.isEnabled = useEmailNotifications
+            }
             "cds_time" -> {
                 val timeval = sharedPreferences.getString("cds_time", "00:00")
                 val pieces = timeval?.split(":".toRegex())?.dropLastWhile { it.isEmpty() }?.toTypedArray()

From 5b3b25a0d32e7bf4eb84f869a8f3d34520502545 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Fri, 24 Jan 2020 17:01:55 +0100
Subject: [PATCH 07/62] Update skill design

---
 Habitica/res/drawable/circle_gray300.xml      |  4 +
 Habitica/res/layout/fragment_skills.xml       |  1 +
 Habitica/res/layout/skill_list_item.xml       | 67 +++++++++----
 Habitica/res/values/colors.xml                |  1 +
 Habitica/res/values/strings.xml               |  3 +-
 .../RealmUserLocalRepository.kt               |  1 -
 .../ui/adapter/SkillsRecyclerViewAdapter.kt   | 95 ++++++++++++++-----
 .../ui/fragments/skills/SkillsFragment.kt     | 10 +-
 8 files changed, 130 insertions(+), 52 deletions(-)
 create mode 100644 Habitica/res/drawable/circle_gray300.xml

diff --git a/Habitica/res/drawable/circle_gray300.xml b/Habitica/res/drawable/circle_gray300.xml
new file mode 100644
index 000000000..ba3d669da
--- /dev/null
+++ b/Habitica/res/drawable/circle_gray300.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <solid android:color="@color/gray_300" />
+</shape>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_skills.xml b/Habitica/res/layout/fragment_skills.xml
index e10ba38a8..22d0a0906 100644
--- a/Habitica/res/layout/fragment_skills.xml
+++ b/Habitica/res/layout/fragment_skills.xml
@@ -5,5 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:scrollbarSize="3dp"
+    android:background="@color/white"
     android:scrollbarThumbVertical="@color/scrollbarThumb"
     android:scrollbars="vertical" />
diff --git a/Habitica/res/layout/skill_list_item.xml b/Habitica/res/layout/skill_list_item.xml
index 78f8dadef..9dc866268 100644
--- a/Habitica/res/layout/skill_list_item.xml
+++ b/Habitica/res/layout/skill_list_item.xml
@@ -1,17 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    style="@style/RowWrapper"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal">
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/layout_rounded_bg_gray_700"
+        android:clipToPadding="true"
+        android:clipChildren="true"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="4dp">
+
         <com.facebook.drawee.view.SimpleDraweeView
             android:id="@+id/skill_image"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:layout_gravity="center_vertical" />
-
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="8dp"/>
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -20,7 +30,9 @@
             android:layout_marginRight="8dp"
             android:layout_weight="1"
             android:gravity="center_vertical"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="12dp">
 
             <TextView
                 android:id="@+id/skill_text"
@@ -36,20 +48,33 @@
                 style="@style/Caption2.Regular"
                 tools:text="This is the spell description"/>
         </LinearLayout>
-    <Button
-        android:id="@+id/price_button"
-        android:layout_width="wrap_content"
-        android:layout_height="32dp"
-        android:minWidth="64dp"
-        android:layout_gravity="center_vertical"
-        android:gravity="left|center_vertical"
-        android:drawablePadding="5dp"
-        android:background="@drawable/rounded_purple_square"
-        android:paddingLeft="12dp"
-        android:paddingStart="12dp"
-        android:paddingRight="12dp"
-        android:paddingEnd="12dp"
+        <LinearLayout
+            android:id="@+id/button_wrapper"
+            android:layout_width="48dp"
+            android:layout_height="match_parent"
+            android:background="@color/blue_500"
+            android:orientation="vertical"
+            android:gravity="center">
+            <ImageView
+                android:id="@+id/button_icon_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+            <TextView
+                android:id="@+id/price_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+    </LinearLayout>
+    <TextView
+        android:id="@+id/count_label"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentStart="true"
+        android:layout_marginStart="13dp"
+        android:background="@drawable/circle_gray300"
+        tools:text="1"
         android:textColor="@color/white"
-        tools:text="150"
-        android:textSize="15sp" />
-</LinearLayout>
\ No newline at end of file
+        android:gravity="center"
+        />
+</RelativeLayout>
\ No newline at end of file
diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml
index a3a799e93..295b8cd59 100644
--- a/Habitica/res/values/colors.xml
+++ b/Habitica/res/values/colors.xml
@@ -125,6 +125,7 @@
     <color name="black_20_alpha">#33000000</color>
     <color name="black_50_alpha">#89000000</color>
     <color name="gray_20_alpha">#331a181d</color>
+    <color name="blue_500_24">#3CA9DCF6</color>
     <color name="light_gray_bg">#F6F4F8</color>
 
     <color name="skin_ddc994">#ddc994</color>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index b1a069c2d..07a4501fe 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -367,7 +367,7 @@
     <string name="gem_purchase_listitem3">Quests that reward you with pet eggs</string>
     <string name="gem_purchase_listitem4">The ability to change your class before level 100</string>
     <string name="support_habitica">Support Habitica</string>
-    <string name="skill_transformation_use">use</string>
+    <string name="skill_transformation_use">Use</string>
     <string name="hatching_market_info">Not getting the right drops? Check out the Market!</string>
     <string name="feeding_market_info">Need different food? Buy more from the market!</string>
     <string name="open_market">Open Market</string>
@@ -941,4 +941,5 @@
     <string name="preference_email_subscription_reminder">Subscription Reminders</string>
     <string name="preference_email_kicked_group">Kicked from group</string>
     <string name="preference_email_onboarding">Guidance with setting up your Habitica Account</string>
+    <string name="skill_unlocks_at">Skill unlocks at level %d</string>
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt
index 648f0e195..75ec17204 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt
@@ -132,7 +132,6 @@ class RealmUserLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
         val habitClass = if (user.preferences?.disableClasses == true) "none" else user.stats?.habitClass
         return realm.where(Skill::class.java)
                 .equalTo("habitClass", habitClass)
-                .lessThanOrEqualTo("lvl", user.stats?.lvl ?: 0)
                 .findAll()
                 .asFlowable()
                 .filter { it.isLoaded }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.kt
index 80cfdc999..7f3334777 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.kt
@@ -5,7 +5,7 @@ import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
+import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
@@ -13,6 +13,7 @@ import com.facebook.drawee.view.SimpleDraweeView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.models.Skill
+import com.habitrpg.android.habitica.models.user.SpecialItems
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
@@ -24,11 +25,21 @@ class SkillsRecyclerViewAdapter : RecyclerView.Adapter<SkillsRecyclerViewAdapter
     private val useSkillSubject = PublishSubject.create<Skill>()
     val useSkillEvents = useSkillSubject.toFlowable(BackpressureStrategy.DROP)
 
-    var mana: Double = 0.toDouble()
-     set(value) {
-         field = value
-         notifyDataSetChanged()
-     }
+    var mana: Double = 0.0
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+    var level: Int = 0
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+    var specialItems: SpecialItems? = null
+    set(value) {
+        field = value
+        notifyDataSetChanged()
+    }
     private var skillList: List<Skill> = emptyList()
 
     fun setSkillList(skillList: List<Skill>) {
@@ -51,18 +62,23 @@ class SkillsRecyclerViewAdapter : RecyclerView.Adapter<SkillsRecyclerViewAdapter
     inner class SkillViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
 
         private val magicDrawable: Drawable
+        private val lockDrawable: Drawable
         private val skillImageView: SimpleDraweeView by bindView(R.id.skill_image)
         private val skillNameTextView: TextView by bindView(R.id.skill_text)
         private val skillNotesTextView: TextView by bindView(R.id.skill_notes)
-        private val priceButton: Button by bindView(itemView, R.id.price_button)
+        private val buttonWrapper: ViewGroup by bindView(itemView, R.id.button_wrapper)
+        private val priceLabel: TextView by bindView(itemView, R.id.price_label)
+        private val buttonIconView: ImageView by bindView(itemView, R.id.button_icon_view)
+        private val countLabel: TextView by bindView(itemView, R.id.count_label)
 
         var skill: Skill? = null
 
         var context: Context = itemView.context
 
         init {
-            priceButton.setOnClickListener(this)
+            buttonWrapper.setOnClickListener(this)
             magicDrawable = BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfMagic())
+            lockDrawable = BitmapDrawable(context.resources, HabiticaIconsHelper.imageOfLocked(ContextCompat.getColor(context, R.color.gray_400)))
         }
 
         fun bind(skill: Skill) {
@@ -70,31 +86,62 @@ class SkillsRecyclerViewAdapter : RecyclerView.Adapter<SkillsRecyclerViewAdapter
             skillNameTextView.text = skill.text
             skillNotesTextView.text = skill.notes
 
+            skillNameTextView.setTextColor(ContextCompat.getColor(context, R.color.gray_50))
+            skillNotesTextView.setTextColor(ContextCompat.getColor(context, R.color.gray_200))
+            skillNotesTextView.visibility = View.VISIBLE
+            priceLabel.visibility = View.VISIBLE
+
             if ("special" == skill.habitClass) {
-                priceButton.setText(R.string.skill_transformation_use)
-
-                priceButton.setCompoundDrawables(null, null, null, null)
+                countLabel.visibility = View.VISIBLE
+                countLabel.text = getOwnedCount(skill.key).toString()
+                priceLabel.setText(R.string.skill_transformation_use)
+                priceLabel.setTextColor(ContextCompat.getColor(context, R.color.brand_400))
+                buttonIconView.setImageDrawable(null)
+                buttonWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.gray_600))
+                buttonIconView.alpha = 1.0f
+                priceLabel.alpha = 1.0f
             } else {
-                priceButton.text = skill.mana?.toString()
+                countLabel.visibility = View.GONE
+                priceLabel.text = skill.mana?.toString()
+                priceLabel.setTextColor(ContextCompat.getColor(context, R.color.blue_10))
+                buttonIconView.setImageDrawable(magicDrawable)
 
-                priceButton.setCompoundDrawablesWithIntrinsicBounds(magicDrawable, null, null, null)
+                if (skill.mana ?: 0 > mana) {
+                    buttonWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.gray_600))
+                    buttonIconView.alpha = 0.3f
+                    priceLabel.alpha = 0.3f
+                } else {
+                    buttonWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.blue_500_24))
+                    buttonIconView.alpha = 1.0f
+                    priceLabel.alpha = 1.0f
+                }
+                if ((skill.lvl ?: 0) > level) {
+                    buttonWrapper.setBackgroundColor(ContextCompat.getColor(context, R.color.gray_600))
+                    skillNameTextView.setTextColor(ContextCompat.getColor(context, R.color.task_gray))
+                    skillNameTextView.text = context.getString(R.string.skill_unlocks_at, skill.lvl)
+                    skillNotesTextView.visibility = View.GONE
+                    buttonIconView.setImageDrawable(lockDrawable)
+                    priceLabel.visibility = View.GONE
+                }
             }
             DataBindingUtils.loadImage(skillImageView, "shop_" + skill.key)
 
-            if (skill.mana ?: 0 > mana) {
-                priceButton.isEnabled = false
-                priceButton.setBackgroundResource(R.color.task_gray)
-                skillNameTextView.setTextColor(ContextCompat.getColor(context, R.color.task_gray))
-                skillNotesTextView.setTextColor(ContextCompat.getColor(context, R.color.task_gray))
-            } else {
-                skillNameTextView.setTextColor(ContextCompat.getColor(context, android.R.color.black))
-                skillNotesTextView.setTextColor(ContextCompat.getColor(context, android.R.color.black))
-                priceButton.isEnabled = true
-            }
         }
 
         override fun onClick(v: View) {
-            skill?.let { useSkillSubject.onNext(it) }
+            if ((skill?.lvl ?: 0) <= level) {
+                skill?.let { useSkillSubject.onNext(it) }
+            }
+        }
+
+        private fun getOwnedCount(key: String): Int {
+            return when (key) {
+                "snowball" -> specialItems?.snowball
+                "shinySeed" -> specialItems?.shinySeed
+                "seafoam" -> specialItems?.seafoam
+                "spookySparkles" -> specialItems?.spookySparkles
+                else -> 0
+            } ?: 0
         }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt
index b2ab0e10b..101dcd56a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt
@@ -67,8 +67,6 @@ class SkillsFragment : BaseMainFragment() {
 
         resetViews()
 
-        recyclerView.invalidateItemDecorations()
-        recyclerView.addItemDecoration(androidx.recyclerview.widget.DividerItemDecoration(getActivity(), androidx.recyclerview.widget.DividerItemDecoration.VERTICAL))
         recyclerView.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(activity)
         recyclerView.adapter = adapter
         recyclerView.itemAnimator = SafeDefaultItemAnimator()
@@ -78,9 +76,12 @@ class SkillsFragment : BaseMainFragment() {
         if (user == null || adapter == null) {
             return
         }
-        adapter?.mana = this.user?.stats?.mp ?: 0.toDouble()
+        adapter?.mana = this.user?.stats?.mp ?: 0.0
+        adapter?.level = this.user?.stats?.lvl ?: 0
+        adapter?.specialItems = this.user?.items?.special
         user?.let { user ->
-            Observable.concat(userRepository.getSkills(user).firstElement().toObservable().flatMap { Observable.fromIterable(it) }, userRepository.getSpecialItems(user).firstElement().toObservable().flatMap { Observable.fromIterable(it) })
+            Observable.concat(userRepository.getSkills(user).firstElement().toObservable().flatMap { Observable.fromIterable(it) },
+                    userRepository.getSpecialItems(user).firstElement().toObservable().flatMap { Observable.fromIterable(it) })
                     .toList()
                     .subscribe(Consumer { skills -> adapter?.setSkillList(skills) }, RxErrorHandler.handleEmptyError())
         }
@@ -121,7 +122,6 @@ class SkillsFragment : BaseMainFragment() {
     }
 
 
-
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         if (data != null) {

From 38a463b0cb246833b80c74f27db72deb28308528 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 29 Jan 2020 15:47:13 +0100
Subject: [PATCH 08/62] Work on sign in with apple

---
 Habitica/build.gradle                            |   2 +-
 Habitica/res/drawable-hdpi/apple_icon.png        | Bin 0 -> 597 bytes
 Habitica/res/drawable-mdpi/apple_icon.png        | Bin 0 -> 460 bytes
 Habitica/res/drawable-xhdpi/apple_icon.png       | Bin 0 -> 788 bytes
 Habitica/res/drawable-xxhdpi/apple_icon.png      | Bin 0 -> 1171 bytes
 Habitica/res/drawable-xxxhdpi/apple_icon.png     | Bin 0 -> 1624 bytes
 Habitica/res/layout/activity_login.xml           |   2 +-
 .../habitica/helpers/SignInWebViewClient.kt      |   7 +++++++
 .../habitica/ui/activities/LoginActivity.kt      |   2 +-
 9 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 Habitica/res/drawable-hdpi/apple_icon.png
 create mode 100644 Habitica/res/drawable-mdpi/apple_icon.png
 create mode 100644 Habitica/res/drawable-xhdpi/apple_icon.png
 create mode 100644 Habitica/res/drawable-xxhdpi/apple_icon.png
 create mode 100644 Habitica/res/drawable-xxxhdpi/apple_icon.png

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index c3c83f52f..f7ec3c9bd 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -153,7 +153,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 2346
+        versionCode 2360
         versionName "2.5"
     }
 
diff --git a/Habitica/res/drawable-hdpi/apple_icon.png b/Habitica/res/drawable-hdpi/apple_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..849330315ff0a60b7264b5185ed29653ba049162
GIT binary patch
literal 597
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1?!3HGL9{Yy@DaPU;cPEB*=VV?2IWDOYo@u_m
z3|c@o2Loe!CIbsd2@p#GF#`kh0!9XAAk7F8TfhXDl~}+GXG?<=E}hC>3skn>)5S5w
zgLmyzUk#T)iMHoaJ(s2kO>)xg-nezc;(*C#b#ipp=)8Tq)+6O)n@(!#@|>JEPt-ll
zT*BPE0vB~kp0_TpUsilxXHND0sypxZe6M+5{(fhApU*MFRadjjbq-Ek?E2ZrM|~kn
z*Xw7-vhNZsc=s25OTK;ZSX@)0w9T($yJ`+K)NX6;y16DsI_coSWtE)AUhn(Ke*Nb&
z<Hgo-Q?40vE$wxZn=-$8Uij|`ceD-OH95a%G<?w_G>7%`iMNf7(;o1hsc?vBm5gYs
z-f)z4k({2~9gevBVL#;Gwx2w@z`0w9W$p7M1+_h4E8cV48sxWzdnjwoXz`EFZZeqO
zw)y==NxPl%Gdi~zU+U7m?7{oX_hMnpvUk_kgfhQ<ZsNq7w2<w+;Z@%gfo3VwRvqlt
zRFmkRy)~;KwTttZ_M2t*j#Zgj<cSD9vzq=bbJ6Ejay*+puw}N@?FfE#;SlGF_4}jq
zr{9X->uFZ9__o57;F?zNJzM?+Dy&(0BSER?oAH_A1;zH6GDprZGd>sm;dkL-=dHd2
z=c`hk1o!FqeyNYhu4dl${%en2j;X1u+OtG{zeIK}fp=V=$}SkLx2<QAUNBd<+g@<a
VS~<?D1Yb~;db;|#taD0e0sz3R@+SZQ

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-mdpi/apple_icon.png b/Habitica/res/drawable-mdpi/apple_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e05abc747cb002dce6ffff11ec84d9471a6de56
GIT binary patch
literal 460
zcmeAS@N?(olHy`uVBq!ia0vp^0zfRp!3HFQtmCqP6k~CayA#8@b22Z19GBDx&op0O
z1}z|)gMqO<lYs@K1c;@8n1O+L0V4x5kY)slEntGn3M^oTvxPtk{iZ5S0xC1}ba4!^
z5S%)BzaNvMKzsT5mJ3pgXRHvN+S?c*_<>hPN9UvCn+nD(D=i_R`3-IMQ!gH4Z#d$`
zYvRJSAs}L(<<7Hr1Mj?3iBBv0_Fa0~opnKci9IV12;Z?dF<Hom{{y%54v%+fYYb!#
zGpXE?{PZ{1=ljB|Gx#j`uMhBY_ho6nQo5tXkSCFEc|a4_9|!rWsMn%D?G3~qGG8)W
z`f+;RraETHHB4Phl`QEK_-<Nzm`BPtzR^6|!1m*a)W^__d%P9j3Kz>p7`rk&|JdgI
zSMvIahSWU|15Sr;Qe?jO_S9O9&*pEYPGkJEx7Nufwk^b2*p)Htfpok?$${QkhAW>I
zx6IwvdEI5XMPk&Kj2J&7$0^=_G<vNkcux}bX1PA`rkz^mhC=VG1Li#sSf7ZVa$a>%
fO3w0^wq=j*cahosLWeiJ1BIlgtDnm{r-UW|nuVgq

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xhdpi/apple_icon.png b/Habitica/res/drawable-xhdpi/apple_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..1394177cb2d7a58357486c9fd63cedc549bba4c7
GIT binary patch
literal 788
zcmeAS@N?(olHy`uVBq!ia0vp^3P7yF!3HE>yta4*q!^2X+?^QKos)S9<hZ0pc&7RK
zGH3zW91M)@nG7r-B|t0%#0(6~3m6%gfixpXYylHoR$&1%oUH;<7|C|Tn1O+*&eO#)
zB!YAAblZ&JK#}90R~>Wp4&<s6-lZWSzObpwFR0+f1;dgev0Dp+9SbG}S(RwUT7^u>
zaEy^@X_8Ee{^M}Lb75MSREGD(Fx^Y*uiy79u031(eeaTj_tqaC-z$Ds`~UyR)4x4}
zG`k=E-p9T@L55Ao%Y53Q4_Y-$qRGAeo3=0?kGm0YZtKSLlWO+xq?soK8{b!Y-(i30
zkd_+z!X-1kXKh!wAHlSE&cQuSYxjP<C{~tWvea~g$GoiycjvIA$$vKqNZI%P{oU@(
zP9FqbOHK%m`eyUq`tkpSzjh}RD>#c4s-{0sS&}H{CA0nHjT!|V{>kDC?nlM1>^&g5
z^q39r-3jfg7m}wQV)01+cyQU`4>Geljb?LgxO67%+nU3+2J=hB`VNX0$R4itckWiP
z@CxsL*z}}NxqE($yko$Q$G?)Ve~~w6+t1V`FO-p>_2a}rpSbyRm%MMDH2J2~s^vRm
z!%IqcvgN&YW&asGdFKxg=I1gJuO_+fT~L(yV2zhd-~B~fmNu%~i@9CMtK+U4wZ^^f
zY!RE7j+CossjIFBv;875-D}l5?)uO8vZOKca?{gWf?wQvXO&#z`ql5{<(DK8`t!n9
z$B(_j)|+3*JpH_i`D*VT&dFWb5_=bSzLE|!{m}8~{SvDK>9gEF@A?rct?={kpM@eq
z9F-cptu+>^Z$Ajf98WnBBU-TU^^L#!zm`vp&q(>maK<Vp$slEw_!8#{^%mQbr5sBy
zzTWoLQhI&!9KGm|k_#Vy)!QBUgFPu%oc&J9tajtAlcZ|Y@*j#$ar`HFvU#br(SqaI
zT$b;)bnR29Okv*SA)L$eS7E>O|ARa>-9pL#Q?FG&Q2NuvWRtkxB)3OazIa{1grvWs
PpcLup>gTe~DWM4fG7L_4

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxhdpi/apple_icon.png b/Habitica/res/drawable-xxhdpi/apple_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f4b3916113479a4d93d2998fb1459c462015e72
GIT binary patch
literal 1171
zcmV;E1Z?|>P)<h;3K|Lk000e1NJLTq001xm001@!1^@s6fm<4y00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91HUIzs091FGtN;K5{YgYYRA>d&np=oXQ5eVP3=xS3
zG2<FjN-4vL1{rx^ln1%Iks1vz9!R7-DlepXP$DG63yqo~%1lVPU*g4s$zfb(hG`<g
z;Q0NI*{3yo_BnganUl5VtN-k^*Z$VGe&1SquYEa_C~|12RB9I8SD{IXL}I5y6#K4$
zPM{j}2nE(*AHks~wB_hdKy7SaIK;B+8rW*|)qpmOSL~uV@`7|3`e_n}%G(^F#dizn
z1k@e^Hg}cS<oHOAJb<e+X(P%<9ihc{3+&toV6&=?opJGz9C-kD(xeTQ|FFNp5n6n=
zz!jrx=f2=;<D)qA0I&>2*$*mf9HQBE4dkK-`g_#Pu!~^lHQ3HAFRwqeYC)ao0Xl=4
zc;-=k!7O1DiBTJh-zrprrgckgo6%Er2|WNV#Wt%EM{Q=JWvCh{)+jUrCDHS4T_n~+
z%KbAs9EbLxRupG%aX5tLhI^&10_{gF$kv|VSc|L%IoxLv4cDO0C?9)Gqf_V@YR)Hs
z(Wa5I{hb=;L1>>5z=vWd5VL!Ya#RJ5Cww4|V0cg6lrVF#S%Jew_G`>KkIG|VSsv!e
zTp++}b-06ug`GUu{|Li6R;FuV7V|!Ekb^$L>t3<|_%~sA?Wa#6M!$;kk|+nqbwBBU
zZ8mtZ1=qkP$DrA|-wyoUYzI}ZF9bu_wjtdSeX<Y0OeTS@Tu_>UdB`_-F&~eEmy;6E
z>f@uGwSiIs1%14=>D0nU4}~u+{L(Wp+Q#ue`?PWTXa$Nj&A`Z5umA6$Ma9aLK+b1)
zt0;wcvOX)6Kx^Uq?{~x!miIw6QG886@N))o0%F%IY^?b@0|H;qX%zc#sRa7}@*F!(
zc{xm^)sDE9>GuIL)uXB!_-5Y#s^XrIb&xd!vg`jg-u)d8Q3C^9mW|B!1jJo}ZjnS~
zR1!e~jU4pxh88f7r*MNLcB38_w)sx1_syk23y-(&V4Kc$@kNZm45)lqe+Gah19-8T
z3DmQn8~_QNG#N7qkkxMv95D}iSk?faHn}nhbXO{YcGJPL@@@wDyUEle0S@Y0{w~wO
zqw;-N&V_k0t59%&WlD9o(fpv!lkH*#_-2@;#|-EoPP!j#LAoY<vAQUD!SzZ&l{i0U
zvsYygOsDnMK67v?>34!A<l0vE89rzL`52URn8Ch)CGRcpGtegoNnD`M$Wz=*rq?QD
z9t_F^DyQ6lCIodkwps*q4K*Wu8rLK7B&45+N|BA7$7uuCV$ScPHi0reBvFd$QIvI2
zc@=F&k&x8uUk?_d1LzfsvJNV>0$Q8Z44BdAppyNSNN;fZB=ZbiX0-Zr2Pckxj#aFw
l=oiwg)e|TElu6mj{sJG)2dnq_vTgtX002ovPDHLkV1l<j2p9kW

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxxhdpi/apple_icon.png b/Habitica/res/drawable-xxxhdpi/apple_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4b1bafebf677db7282995275f7627c6ae09f042
GIT binary patch
literal 1624
zcmV-e2B-OnP)<h;3K|Lk000e1NJLTq002M$002k`1^@s6MmqDe00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91K%fHv1ONa40RR91NB{r;0Cph>aR2}X!bwCyRCod1oNI_yMHt6>bx}W9
znQlpzR?8+9QfZrZgTz?qMmGc@GwH)tAHoj`k`(nN3koVxgdkF*4_iv6kx&*v7FkM3
zW)W*Qyd+*Cu|zZ7e*bOH%h@?|&O39KUC+z||D7{4&phw*e`e;qGjq<nwX*_|?(Xgj
zaP?|18LX|<YP$n*y}X-{9u8)MP2e<0<d*VQ18E7<IpFt%v5{UE2n~NXA$mFZ#2{>D
z$NO6jpam?afkP%+BY%SYumI@zxd^G5;HW{?mfhrMxmbHharNNT!m@==dIyYj_{5D4
zI^n25ei+zh>uO8cG0Mh<!_L7|2t8vVnpgCagUN7IU^yBb$zyAj|3N;w-d|#nEXvLb
zr)wQOh3#)ej8k>5I+_ee4RY6{2o_zwO=VL!%p5(1)Pf?`y>*=fP5w--111#2>J)X)
zgE{Q_{w>f8w~C%!lQRN#P~J9J%+BQ8s-;LC<9a=K6MQ(By`FX=<xk^FdP&pgN}xju
z9afwN4uGFQ7bLn!bA|S;RE_|Df`jOvFqP36L)ndB3b+)E2AUpw!FOP%KwH@uc)_72
za5s1hG}^fQg3ile1{mt<9lEVxG589&ik8xkfpc9y$4d{xL%>|H3zU%qG+G930GUxo
z**GvCd<ps^+AFLC&MU@@GiGEk)=XI^xYevHnb+|B0DJ?^2kqc`(9jojT;&jok1{p1
z!z`4-4~6_RTCWA6p1`ce_YMMaGA|0b>j21i&}ehO<i&X&cug01VjTgHzmo><0c(Ap
zu?m+z$0&Hx=3j;&<S#+-YoM>3SY$s$t|bWjOhSF80OWPpxCX>TUN^$YHu4Hap8$|w
z0%AIIe-=KoAb*(DD)lKq?_Y$*PhhxJGrYn@5Pz|e+vySTL`3A5xsX?IdPV@fe>T@z
z$7^jKy6k{J8v*#og-9|2?m{^R^5Xo6D|sm=0f^<mQCsOPBIYXE<Y*dbJsyLs@Fh_r
z04+4q-9L2s8v@OYfa5+yGzG5mX;5L^t-j>NMFE&pVNyP>>F)0>3cx7uR@H2<w~Si~
zz&T|aR<O;{GCsu=fKqRbC;&QTjX|`R@fHQ(FYi{>Y%s2jTMB@_KVy(m-)0KH{utQ9
zVJeHdi+#B$05Plr6W;eG7p|!SphsD;$iuyR8)rTWKo>aa+@jiwQ*m#ukBiBH$W|J)
z`82Gsu1<a@vM+GDxoZSSzW6_h;;+6A-(V^v+zLr0N}m;Kg;#k$E-!U)JDCF75FG?f
zE{y`xc>!M+GaXLn`P?%CP|ynopXMnAT)qh3-)B1L<qfMOQ$UsLts3DM-Ufy31mQv3
zeW7Oxh$EF_NcMmc%10{S!mFJTuSWnqQXc^n>hV!$Z+WbVrh;Ccs7pNny(P=*HE~|7
zGH;0WDUk4GDs16;dXkSQ?S@M$0qC>zH%EZ@#ySetndC**HUji?SUbd0CoD2rQJF#j
zwwu0XMgU5BVR50U7<hhzjl4KzMnFQ8d%?$C&rI?Gr&<N-X|Z0*%SdJfq%<DqI)-iX
z@;vh5ni~Kb{Xo6bhC+raDtcJ*RFQAFQ$UTF1|vy!f(gn8DEHBk?-u!;I|9^*#yT>8
z0Gv`jFnPTZdGRR>fD|zDImy$y4oH5)*ZD5~7EXc008>GF>%cupS%p)L+Ua!M_bxs*
z904+dF)br?*r?r9l|^59^IXY`h*JQhh*3R#y&e1tswxZcQ*VYki_;WHTVpzmC;t(c
zm@fCcRxtHHK=d`GSM+4_Lg3sX=%z(IzYy}Tqzeb^njnk<8-c4FM^Q&p9Y91gLb-lL
z-VRoPeZW=po8mh%1_!!;57i4+4}smlCi+hg8-V^7h<e#s(3kC-fPQn7XJ0?MUJ9C>
z4O<kwr+{e#2Q+MN2Kw2HPF(b0LU-V849O#;{SxfU$16Y!xD04{z6)%|zBX?ClK%kh
WW$FR|(-3R`0000<MNUMnLSTYng27P$

literal 0
HcmV?d00001

diff --git a/Habitica/res/layout/activity_login.xml b/Habitica/res/layout/activity_login.xml
index 96bf5d711..41a5795ec 100644
--- a/Habitica/res/layout/activity_login.xml
+++ b/Habitica/res/layout/activity_login.xml
@@ -219,7 +219,7 @@
                         android:layout_marginTop="@dimen/spacing_large"
                         android:layout_height="@dimen/diamond_button_height"
                         android:text="@string/login_btn_apple"
-                        android:drawableLeft="@drawable/google_icon"
+                        android:drawableLeft="@drawable/apple_icon"
                         style="@style/LoginButton"/>
 
                     <Button
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SignInWebViewClient.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SignInWebViewClient.kt
index cbca5f2a1..5e8297b52 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SignInWebViewClient.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SignInWebViewClient.kt
@@ -4,9 +4,11 @@ import android.net.Uri
 import android.os.Build
 import android.util.Log
 import android.webkit.WebResourceRequest
+import android.webkit.WebResourceResponse
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import androidx.annotation.RequiresApi
+import com.habitrpg.android.habitica.BuildConfig
 
 class SignInWebViewClient(
         private val attempt: SignInWithAppleService.AuthenticationAttempt,
@@ -23,6 +25,11 @@ class SignInWebViewClient(
         return isUrlOverridden(view, request?.url)
     }
 
+    override fun shouldInterceptRequest(view: WebView?, request: WebResourceRequest?): WebResourceResponse? {
+        request?.requestHeaders?.let { it["Authorization"] = "Basic " + BuildConfig.STAGING_KEY }
+        return super.shouldInterceptRequest(view, request)
+    }
+
     private fun isUrlOverridden(view: WebView?, url: Uri?): Boolean {
         return when {
             url == null -> {
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 a7e83d8e9..500603e13 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
@@ -180,7 +180,7 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
         appleLoginButton.setOnClickListener {
             val configuration = SignInWithAppleConfiguration(
                     clientId = BuildConfig.APPLE_AUTH_CLIENT_ID,
-                    redirectUri = "https://habitrpg-delta.herokuapp.com/api/v4/user/auth/apple",
+                    redirectUri = "${hostConfig.address}/api/v4/user/auth/apple",
                     scope = "name email"
             )
             val fragmentTag = "SignInWithAppleButton-SignInWebViewDialogFragment"

From f79f54c219c1310bab049a14ceae40535a09af36 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 29 Jan 2020 17:15:12 +0100
Subject: [PATCH 09/62] if there is an error sending a message, put it back
 into input

---
 Habitica/res/layout/activity_login.xml                | 11 ++++++-----
 .../habitica/ui/fragments/social/ChatFragment.kt      |  4 +++-
 .../ui/fragments/social/InboxMessageListFragment.kt   |  7 +++++--
 .../android/habitica/ui/viewmodels/GroupViewModel.kt  |  9 ++++++---
 .../android/habitica/ui/views/social/ChatBarView.kt   |  6 +++++-
 5 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/Habitica/res/layout/activity_login.xml b/Habitica/res/layout/activity_login.xml
index 41a5795ec..f216f1e8d 100644
--- a/Habitica/res/layout/activity_login.xml
+++ b/Habitica/res/layout/activity_login.xml
@@ -201,7 +201,7 @@
                         android:layout_marginTop="@dimen/spacing_xlarge"
                         android:layout_height="@dimen/diamond_button_height"
                         android:text="@string/login_btn_fb"
-                        android:drawableLeft="@drawable/facebook_icon"
+                        android:drawableStart="@drawable/facebook_icon"
                         style="@style/LoginButton"/>
 
                     <Button
@@ -210,7 +210,7 @@
                         android:layout_marginTop="@dimen/spacing_large"
                         android:layout_height="@dimen/diamond_button_height"
                         android:text="@string/login_btn_google"
-                        android:drawableLeft="@drawable/google_icon"
+                        android:drawableStart="@drawable/google_icon"
                         style="@style/LoginButton"/>
 
                     <Button
@@ -219,8 +219,9 @@
                         android:layout_marginTop="@dimen/spacing_large"
                         android:layout_height="@dimen/diamond_button_height"
                         android:text="@string/login_btn_apple"
-                        android:drawableLeft="@drawable/apple_icon"
-                        style="@style/LoginButton"/>
+                        android:drawableStart="@drawable/apple_icon"
+                        style="@style/LoginButton"
+                        android:visibility="gone"/>
 
                     <Button
                         android:id="@+id/forgot_password"
@@ -231,7 +232,7 @@
                         android:text="@string/forgot_pw_btn"
                         android:layout_gravity="center_horizontal"
                         android:textColor="@color/white_75_alpha"
-                        android:background="@color/transparent"/>
+                        android:background="@color/transparent" />
 
                 </LinearLayout>
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt
index 5592c7786..30799ee45 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt
@@ -209,8 +209,10 @@ class ChatFragment : BaseFragment() {
     }
 
     private fun sendChatMessage(chatText: String) {
-        viewModel?.postGroupChat(chatText) {
+        viewModel?.postGroupChat(chatText, {
             recyclerView?.scrollToPosition(0)
+        }) {
+            chatBarView.message = chatText
         }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt
index a494408e6..1dbf353e8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt
@@ -123,9 +123,12 @@ class InboxMessageListFragment : BaseMainFragment(), androidx.swiperefreshlayout
             socialRepository.postPrivateMessage(userID, chatText)
                     .delay(200, TimeUnit.MILLISECONDS)
                     .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(Consumer {
+                    .subscribe({
                 recyclerView?.scrollToPosition(0)
-            }, RxErrorHandler.handleEmptyError())
+            }, { error ->
+                        RxErrorHandler.reportError(error)
+                        chatBarView.message = chatText
+                    })
             KeyboardUtil.dismissKeyboard(getActivity())
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt
index c7c187c6a..61e07998b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt
@@ -200,11 +200,14 @@ open class GroupViewModel : BaseViewModel() {
         disposable.add(socialRepository.deleteMessage(chatMessage).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
     }
 
-    fun postGroupChat(chatText: String, onComplete: () -> Unit?) {
+    fun postGroupChat(chatText: String, onComplete: () -> Unit, onError: () -> Unit) {
         groupIDSubject.value?.value?.let {
-            socialRepository.postGroupChat(it, chatText).subscribe(Consumer {
+            socialRepository.postGroupChat(it, chatText).subscribe({
                 onComplete()
-            }, RxErrorHandler.handleEmptyError())
+            }, { error ->
+                RxErrorHandler.reportError(error)
+                onError()
+            })
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt
index 97be64169..b25d82eb8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt
@@ -55,6 +55,10 @@ class ChatBarView : LinearLayout {
             autocompleteAdapter?.groupID = value
         }
 
+    var message: String?
+    get() = chatEditText.text.toString()
+    set(value) = chatEditText.setText(value)
+
     constructor(context: Context) : super(context) {
         setupView(context)
     }
@@ -115,7 +119,7 @@ class ChatBarView : LinearLayout {
     }
 
     private fun sendButtonPressed() {
-        val chatText = chatEditText.text.toString()
+        val chatText = message ?: ""
         if (chatText.isNotEmpty()) {
             chatEditText.text = null
             sendAction?.invoke(chatText)

From d604f7812d09b6749ef3e94b154867ee8789c026 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 29 Jan 2020 17:19:19 +0100
Subject: [PATCH 10/62] =?UTF-8?q?Don=E2=80=99t=20show=20loading=20thingy?=
 =?UTF-8?q?=20when=20using=20skills?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/fragments/skills/SkillsFragment.kt        | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt
index 101dcd56a..9e881f079 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt
@@ -104,7 +104,6 @@ class SkillsFragment : BaseMainFragment() {
     }
 
     private fun displaySkillResult(usedSkill: Skill?, response: SkillResponse) {
-        removeProgressDialog()
         adapter?.mana = response.user.stats?.mp ?: 0.0
         val activity = activity ?: return
         if ("special" == usedSkill?.habitClass) {
@@ -144,23 +143,12 @@ class SkillsFragment : BaseMainFragment() {
         if (skill == null) {
             return
         }
-        displayProgressDialog()
         val observable: Flowable<SkillResponse> = if (taskId != null) {
             userRepository.useSkill(user, skill.key, skill.target, taskId)
         } else {
             userRepository.useSkill(user, skill.key, skill.target)
         }
-        compositeSubscription.add(observable.subscribe({ skillResponse -> this.displaySkillResult(skill, skillResponse) }) { removeProgressDialog() })
+        compositeSubscription.add(observable.subscribe(Consumer { skillResponse -> this.displaySkillResult(skill, skillResponse) },
+                RxErrorHandler.handleEmptyError()))
     }
-
-    private fun displayProgressDialog() {
-        progressDialog?.dismiss()
-        @Suppress("DEPRECATION")
-        progressDialog = ProgressDialog.show(activity, context?.getString(R.string.skill_progress_title), null, true)
-    }
-
-    private fun removeProgressDialog() {
-        progressDialog?.dismiss()
-    }
-
 }

From a488fab400d7f4a29a8eaf15f70e59d58bd74c1b Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 30 Jan 2020 17:21:59 +0100
Subject: [PATCH 11/62] Make app cancel sub if user cancelled in play store

---
 Habitica/build.gradle                         |  2 +-
 .../android/habitica/api/ApiService.kt        |  3 ++
 .../android/habitica/data/ApiClient.kt        |  1 +
 .../data/implementation/ApiClientImpl.kt      |  4 +++
 .../habitica/helpers/PurchaseHandler.kt       | 21 ++++++++++++
 .../purchases/SubscriptionFragment.kt         | 33 ++++++++++++++-----
 6 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index f7ec3c9bd..aff6dc78d 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -153,7 +153,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 2360
+        versionCode 2362
         versionName "2.5"
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
index e512fe1d3..db6cfab56 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
@@ -250,6 +250,9 @@ interface ApiService {
     @POST("/iap/android/subscribe")
     fun validateSubscription(@Body request: SubscriptionValidationRequest): Flowable<HabitResponse<Void>>
 
+    @GET("/iap/android/subscribe/cancel")
+    fun cancelSubscription(): Flowable<HabitResponse<Void>>
+
     @POST("/iap/android/norenew-subscribe")
     fun validateNoRenewSubscription(@Body request: PurchaseValidationRequest): Flowable<HabitResponse<Void>>
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
index 98a3d2177..6ae204161 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
@@ -63,6 +63,7 @@ interface ApiClient {
     fun purchaseQuest(key: String): Flowable<Any>
     fun validateSubscription(request: SubscriptionValidationRequest): Flowable<Any>
     fun validateNoRenewSubscription(request: PurchaseValidationRequest): Flowable<Any>
+    fun cancelSubscription(): Flowable<Any>
 
     fun sellItem(itemType: String, itemKey: String): Flowable<User>
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
index 60f7dcaf6..309d16b10 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
@@ -347,6 +347,10 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
         }
     }
 
+    override fun cancelSubscription(): Flowable<Any> {
+        return apiService.cancelSubscription().compose(configureApiCallObserver())
+    }
+
     override fun purchaseHourglassItem(type: String, itemKey: String): Flowable<Any> {
         return apiService.purchaseHourglassItem(type, itemKey).compose(configureApiCallObserver())
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt
index 548cf315d..ada17a27b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt
@@ -115,6 +115,27 @@ class PurchaseHandler(activity: Activity, val crashlyticsProxy: CrashlyticsProxy
         }
     }
 
+    fun checkForSubscription(onSubscriptionFound: ((Purchase) -> Unit)) {
+        billingRequests?.getPurchases(ProductTypes.SUBSCRIPTION, null, object : RequestListener<Purchases> {
+            override fun onSuccess(result: Purchases) {
+                var lastPurchase: Purchase? = null
+                for (purchase in result.list) {
+                    if (lastPurchase != null && lastPurchase.time > purchase.time) {
+                        continue
+                    } else {
+                        lastPurchase = purchase
+                    }
+                }
+                if (lastPurchase != null) {
+                    onSubscriptionFound(lastPurchase)
+                }
+            }
+
+            override fun onError(response: Int, e: java.lang.Exception) {
+            }
+        })
+    }
+
     private fun checkIfPendingPurchases() {
         billingRequests?.getAllPurchases(ProductTypes.IN_APP, object : RequestListener<Purchases> {
             override fun onSuccess(purchases: Purchases) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
index 13f67e6e1..d3fbda00e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
@@ -8,6 +8,7 @@ import android.view.ViewGroup
 import androidx.core.view.isVisible
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
+import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.databinding.FragmentSubscriptionBinding
@@ -26,6 +27,7 @@ import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionVi
 import io.reactivex.functions.Consumer
 import org.greenrobot.eventbus.Subscribe
 import org.solovyev.android.checkout.Inventory
+import org.solovyev.android.checkout.Purchase
 import org.solovyev.android.checkout.Sku
 import javax.inject.Inject
 
@@ -40,6 +42,8 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
     lateinit var appConfigManager: AppConfigManager
     @Inject
     lateinit var inventoryRepository: InventoryRepository
+    @Inject
+    lateinit var apiClient: ApiClient
 
     private var selectedSubscriptionSku: Sku? = null
     private var skus: List<Sku> = emptyList()
@@ -48,6 +52,7 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
 
     private var user: User? = null
     private var hasLoadedSubscriptionOptions: Boolean = false
+    private var purchasedSubscription: Purchase? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
@@ -82,17 +87,15 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
 
         binding.refreshLayout.setOnRefreshListener { refresh() }
 
-        if (appConfigManager.useNewMysteryBenefits()) {
-            compositeSubscription.add(inventoryRepository.getLatestMysteryItem().subscribe(Consumer {
-                DataBindingUtils.loadImage(binding.subBenefitsMysteryItemIcon, "shop_set_mystery_${it.key?.split("_")?.last()}")
-                binding.subBenefitsMysteryItemText.text = context?.getString(R.string.subscribe_listitem3_description_new, it.text)
-            }, RxErrorHandler.handleEmptyError()))
-        }
+        compositeSubscription.add(inventoryRepository.getLatestMysteryItem().subscribe(Consumer {
+            DataBindingUtils.loadImage(binding.subBenefitsMysteryItemIcon, "shop_set_mystery_${it.key?.split("_")?.last()}")
+            binding.subBenefitsMysteryItemText.text = context?.getString(R.string.subscribe_listitem3_description_new, it.text)
+        }, RxErrorHandler.handleEmptyError()))
     }
 
     override fun onResume() {
         super.onResume()
-        refresh();
+        refresh()
     }
 
     private fun refresh() {
@@ -165,6 +168,11 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
 
     override fun setPurchaseHandler(handler: PurchaseHandler?) {
         this.purchaseHandler = handler
+
+        handler?.checkForSubscription {
+            purchasedSubscription = it
+            checkIfNeedsCancellation()
+        }
     }
 
     private fun purchaseSubscription() {
@@ -178,6 +186,7 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
     fun setUser(newUser: User) {
         user = newUser
         this.updateSubscriptionInfo()
+        checkIfNeedsCancellation()
     }
 
     private fun updateSubscriptionInfo() {
@@ -208,10 +217,18 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
         }
     }
 
+    private fun checkIfNeedsCancellation() {
+        if (user?.purchased?.plan?.isActive == true) {
+            compositeSubscription.add(apiClient.cancelSubscription().subscribe(Consumer {
+                        refresh()
+            }, RxErrorHandler.handleEmptyError()))
+        }
+    }
+
     private fun showSubscriptionOptions() {
         binding.subscriptionOptions.visibility = View.VISIBLE
         binding.subscriptionOptions.postDelayed({
-            binding.scrollView.smoothScrollTo(0, binding.subscriptionOptions.top ?: 0)
+            binding.scrollView.smoothScrollTo(0, binding.subscriptionOptions.top)
         }, 500)
     }
 

From 641264c65a2796767932478cea48817f3fda6615 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Fri, 31 Jan 2020 14:15:16 +0100
Subject: [PATCH 12/62] Improve display of unlock condition

---
 Habitica/res/layout/row_shopitem.xml                         | 5 +++--
 .../android/habitica/ui/views/shops/PurchaseDialog.kt        | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Habitica/res/layout/row_shopitem.xml b/Habitica/res/layout/row_shopitem.xml
index 65a66d8c9..eec6f396a 100644
--- a/Habitica/res/layout/row_shopitem.xml
+++ b/Habitica/res/layout/row_shopitem.xml
@@ -25,7 +25,8 @@
         <LinearLayout
             android:id="@+id/buyButton"
             android:layout_width="match_parent"
-            android:layout_height="32dp"
+            android:layout_height="wrap_content"
+            android:minHeight="40dp"
             android:gravity="center"
             android:background="@drawable/layout_rounded_bg_shopitem_price">
             <com.habitrpg.android.habitica.ui.views.CurrencyView
@@ -44,7 +45,7 @@
                 android:gravity="center_horizontal"
                 android:layout_gravity="center_horizontal"
                 style="@style/Body1"
-                android:textSize="12sp"
+                android:textSize="11sp"
                 android:textColor="@color/gray_300"
                 />
         </LinearLayout>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
index 733c844fd..e80e0b4c0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
@@ -70,6 +70,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
                 priceLabel.currency = shopItem.currency
             } else {
                 setBuyButtonEnabled(false)
+                buyLabel.text = shopItem.unlockCondition?.readableUnlockConditionId()?.let { context.getString(it) }
             }
 
             if (shopItem.isLimited) {

From ca9c1d14f0e510141841290b39b05ed23330a556 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Mon, 3 Feb 2020 12:24:18 +0100
Subject: [PATCH 13/62] Improve task searching

---
 Habitica/build.gradle                                      | 2 +-
 .../habitrpg/android/habitica/helpers/TaskFilterHelper.kt  | 7 ++++++-
 build.gradle                                               | 2 +-
 gradle/wrapper/gradle-wrapper.properties                   | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index aff6dc78d..919105e6a 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -153,7 +153,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 2362
+        versionCode 2364
         versionName "2.5"
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt
index fa048f726..7b9c6db69 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt
@@ -100,7 +100,12 @@ class TaskFilterHelper {
                 query = query.`in`("tags.id", tagsId.toTypedArray())
             }
             if (searchQuery?.isNotEmpty() == true) {
-                query = query.beginsWith("text", searchQuery ?: "", Case.INSENSITIVE)
+                query = query
+                        .beginGroup()
+                        .contains("text", searchQuery ?: "", Case.INSENSITIVE)
+                        .or()
+                        .contains("notes", searchQuery ?: "", Case.INSENSITIVE)
+                        .endGroup()
             }
             if (activeFilter != null && activeFilter != Task.FILTER_ALL) {
                 when (activeFilter) {
diff --git a/build.gradle b/build.gradle
index 7e30c061f..9a98d2e41 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0-rc01'
+        classpath 'com.android.tools.build:gradle:4.0.0-alpha09'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.google.gms:google-services:4.3.3'
         classpath "io.realm:realm-gradle-plugin:6.0.2"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 761aae694..1ea99e237 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Oct 15 18:23:38 CEST 2018
+#Sun Feb 02 18:26:34 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-rc-1-all.zip

From b0b7fbed4f279c7219dbff167c95d5e6636e6969 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 4 Feb 2020 09:19:34 +0100
Subject: [PATCH 14/62] Tweak empty task state

---
 .../layout/fragment_refresh_recyclerview.xml  | 69 +++++++++++--------
 .../tasks/TaskRecyclerViewFragment.kt         | 10 ++-
 build.gradle                                  |  2 +-
 3 files changed, 51 insertions(+), 30 deletions(-)

diff --git a/Habitica/res/layout/fragment_refresh_recyclerview.xml b/Habitica/res/layout/fragment_refresh_recyclerview.xml
index 64d3c0e80..c4482c5df 100644
--- a/Habitica/res/layout/fragment_refresh_recyclerview.xml
+++ b/Habitica/res/layout/fragment_refresh_recyclerview.xml
@@ -5,44 +5,57 @@
     android:id="@+id/refreshLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    android:background="@color/gray_700">
+    android:background="@color/gray_700"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+        <LinearLayout
+            android:id="@+id/emptyView"
+            style="@style/EmptyView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="60dp"
+            android:orientation="vertical"
+            android:visibility="gone"
+            tools:visibility="visible">
+
+            <ImageView
+                android:id="@+id/empty_icon_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp" />
+
+            <TextView
+                android:id="@+id/emptyViewTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="6dp"
+                android:gravity="center"
+                android:textColor="@color/gray_200"
+                android:textSize="@dimen/card_medium_text"
+                tools:text="No Items" />
+
+            <TextView
+                android:id="@+id/emptyViewDescription"
+                style="@style/Body2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:textColor="@color/gray_200"
+                tools:text="No Items" />
+        </LinearLayout>
+
         <com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:clipToPadding="false"
             android:scrollbarSize="3dp"
             android:scrollbarThumbVertical="@color/scrollbarThumb"
-            android:scrollbars="vertical"
-            android:clipToPadding="false" />
-
-        <LinearLayout
-            android:id="@+id/emptyView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_marginTop="60dp"
-            android:visibility="gone"
-            tools:visibility="visible"
-                style="@style/EmptyView">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/emptyViewTitle"
-                    tools:text="No Items"
-                    android:gravity="center"
-                    android:textSize="@dimen/card_medium_text"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/emptyViewDescription"
-                    android:gravity="center"
-                    tools:text="No Items" />
-            </LinearLayout>
+            android:scrollbars="vertical" />
 
     </FrameLayout>
 </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
index da21c70c5..ef6f1a1a3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
@@ -288,44 +288,52 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
     private fun setEmptyLabels() {
         if (this.classType != null) {
             binding.recyclerView.setEmptyView(binding.emptyView)
+            context?.let { binding.emptyIconView.setColorFilter(ContextCompat.getColor(it, R.color.gray_400), android.graphics.PorterDuff.Mode.MULTIPLY) }
             if (taskFilterHelper.howMany(classType) > 0) {
                 when (this.classType) {
                     Task.TYPE_HABIT -> {
+                        binding.emptyIconView.setImageResource(R.drawable.icon_habits_selected)
                         binding.emptyViewTitle.setText(R.string.empty_title_habits_filtered)
                         binding.emptyViewDescription.setText(R.string.empty_description_habits_filtered)
                     }
                     Task.TYPE_DAILY -> {
+                        binding.emptyIconView.setImageResource(R.drawable.icon_dailies_selected)
                         binding.emptyViewTitle.setText(R.string.empty_title_dailies_filtered)
                         binding.emptyViewDescription.setText(R.string.empty_description_dailies_filtered)
                     }
                     Task.TYPE_TODO -> {
+                        binding.emptyIconView.setImageResource(R.drawable.icon_todos_selected)
                         binding.emptyViewTitle.setText(R.string.empty_title_todos_filtered)
                         binding.emptyViewDescription.setText(R.string.empty_description_todos_filtered)
                     }
                     Task.TYPE_REWARD -> {
+                        binding.emptyIconView.setImageResource(R.drawable.icon_rewards_selected)
                         binding.emptyViewTitle.setText(R.string.empty_title_rewards)
                     }
                 }
             } else {
                 when (this.classType) {
                     Task.TYPE_HABIT -> {
+                        binding.emptyIconView.setImageResource(R.drawable.icon_habits_selected)
                         binding.emptyViewTitle.setText(R.string.empty_title_habits)
                         binding.emptyViewDescription.setText(R.string.empty_description_habits)
                     }
                     Task.TYPE_DAILY -> {
+                        binding.emptyIconView.setImageResource(R.drawable.icon_dailies_selected)
                         binding.emptyViewTitle.setText(R.string.empty_title_dailies)
                         binding.emptyViewDescription.setText(R.string.empty_description_dailies)
                     }
                     Task.TYPE_TODO -> {
+                        binding.emptyIconView.setImageResource(R.drawable.icon_todos_selected)
                         binding.emptyViewTitle.setText(R.string.empty_title_todos)
                         binding.emptyViewDescription.setText(R.string.empty_description_todos)
                     }
                     Task.TYPE_REWARD -> {
+                        binding.emptyIconView.setImageResource(R.drawable.icon_rewards_selected)
                         binding.emptyViewTitle.setText(R.string.empty_title_rewards)
                     }
                 }
             }
-
         }
     }
 
diff --git a/build.gradle b/build.gradle
index 9a98d2e41..7e30c061f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0-alpha09'
+        classpath 'com.android.tools.build:gradle:3.6.0-rc01'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.google.gms:google-services:4.3.3'
         classpath "io.realm:realm-gradle-plugin:6.0.2"

From deb9d98653ed16112c2346dfb66f95c4c65638c5 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 4 Feb 2020 09:19:46 +0100
Subject: [PATCH 15/62] Fix deleting accounts with only social auth

---
 .../fragments/preferences/AuthenticationPreferenceFragment.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 3901a5717..eae63f985 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
@@ -175,7 +175,7 @@ class AuthenticationPreferenceFragment: BasePreferencesFragment() {
         val view = context?.layoutInflater?.inflate(R.layout.dialog_edittext, null)
         var deleteMessage = getString(R.string.delete_account_description)
         val editText = view?.findViewById<EditText>(R.id.editText)
-        if (user?.authentication?.localAuthentication != null) {
+        if (user?.authentication?.localAuthentication?.email != null) {
             editText?.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_PASSWORD
         } else {
             deleteMessage = getString(R.string.delete_oauth_account_description)

From fea83fd3876988964069cdb395130dabba1b4299 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 4 Feb 2020 12:39:36 +0100
Subject: [PATCH 16/62] Improve quest shop display? Maybe?

---
 Habitica/res/layout/row_shopitem.xml          |  6 ++--
 Habitica/res/values/strings.xml               |  6 ++++
 .../android/habitica/models/shops/ShopItem.kt | 34 +++++++++++++++++++
 .../models/shops/ShopItemUnlockCondition.kt   | 10 +++++-
 .../AuthenticationPreferenceFragment.kt       |  2 +-
 .../ui/viewHolders/ShopItemViewHolder.kt      | 16 ++++-----
 .../habitica/ui/views/shops/PurchaseDialog.kt | 22 +++++++-----
 7 files changed, 75 insertions(+), 21 deletions(-)

diff --git a/Habitica/res/layout/row_shopitem.xml b/Habitica/res/layout/row_shopitem.xml
index eec6f396a..158cb0a2b 100644
--- a/Habitica/res/layout/row_shopitem.xml
+++ b/Habitica/res/layout/row_shopitem.xml
@@ -42,11 +42,13 @@
                 android:id="@+id/unlockLabel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:layout_gravity="center"
                 style="@style/Body1"
                 android:textSize="11sp"
                 android:textColor="@color/gray_300"
+                android:paddingStart="2dp"
+                android:paddingRight="2dp"
                 />
         </LinearLayout>
     </LinearLayout>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 07a4501fe..c755488e9 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -337,6 +337,9 @@
     <string name="party_invite">Unlock by inviting friends</string>
     <string name="login_incentive">Unlock by logging into Habitica regularly</string>
     <string name="create_account">Unlock by creating an account</string>
+    <string name="party_invite_short">Invite Friends</string>
+    <string name="login_incentive_short">login into Habitica regularly</string>
+    <string name="create_account_short">create an account</string>
     <string name="successful_purchase">Purchased %1$s</string>
     <string name="gold_plural">gold</string>
     <string name="chat_message_copied">Message copied to Clipboard</string>
@@ -942,4 +945,7 @@
     <string name="preference_email_kicked_group">Kicked from group</string>
     <string name="preference_email_onboarding">Guidance with setting up your Habitica Account</string>
     <string name="skill_unlocks_at">Skill unlocks at level %d</string>
+    <string name="locked">Locked</string>
+    <string name="unlock_previous">Finish Quest %d</string>
+    <string name="unlock_level">Level %d</string>
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
index 620e7a549..999b8a208 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
@@ -1,5 +1,6 @@
 package com.habitrpg.android.habitica.models.shops
 
+import android.content.Context
 import android.content.res.Resources
 
 import com.google.gson.annotations.SerializedName
@@ -12,6 +13,10 @@ import io.realm.annotations.PrimaryKey
 open class ShopItem : RealmObject() {
     @PrimaryKey
     var key: String = ""
+    set(value) {
+        field = value
+        unlockCondition?.questKey = key
+    }
     var text: String? = ""
     var notes: String? = ""
     @SerializedName("class")
@@ -36,11 +41,20 @@ open class ShopItem : RealmObject() {
     var categoryIdentifier: String = ""
     var limitedNumberLeft: Int? = null
     var unlockCondition: ShopItemUnlockCondition? = null
+    set(value) {
+        field = value
+        if (key.isNotEmpty()) {
+            field?.questKey = key
+        }
+    }
     var path: String? = null
     var isSuggested: String? = null
     var pinType: String? = null
     @SerializedName("klass")
     var habitClass: String? = null
+    var previous: String? = null
+    @SerializedName("lvl")
+    var level: Int? = null
 
     val isTypeItem: Boolean
         get() = "eggs" == purchaseType || "hatchingPotions" == purchaseType || "food" == purchaseType || "armoire" == purchaseType || "potion" == purchaseType
@@ -73,6 +87,26 @@ open class ShopItem : RealmObject() {
         return this.key.hashCode()
     }
 
+    fun lockedReason(context: Context): String? {
+        return when {
+            unlockCondition != null -> {
+                unlockCondition?.shortReadableUnlockConditionId()?.let { context.getString(it) }
+            }
+            previous != null -> {
+                try {
+                    val thisNumber = Character.getNumericValue(key.last())
+                    context.getString(R.string.unlock_previous, thisNumber - 1)
+                } catch (e: NumberFormatException) {
+                    null
+                }
+            }
+            level != null -> {
+                context.getString(R.string.unlock_level, level ?: 0)
+            }
+            else -> null
+        }
+    }
+
     companion object {
 
         private const val GEM_FOR_GOLD = "gem"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.kt
index d53172005..245f359e9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.kt
@@ -8,7 +8,8 @@ import io.realm.annotations.PrimaryKey
 open class ShopItemUnlockCondition : RealmObject() {
 
     @PrimaryKey
-    internal var condition: String? = null
+    var questKey: String? = null
+    private var condition: String? = null
 
     fun readableUnlockConditionId(): Int = when (this.condition) {
         "party invite" -> R.string.party_invite
@@ -16,4 +17,11 @@ open class ShopItemUnlockCondition : RealmObject() {
         "create account" -> R.string.create_account
         else -> R.string.empty
     }
+
+    fun shortReadableUnlockConditionId(): Int = when (this.condition) {
+        "party invite" -> R.string.party_invite_short
+        "login incentive" -> R.string.login_incentive_short
+        "create account" -> R.string.create_account_short
+        else -> R.string.empty
+    }
 }
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 eae63f985..ec01980f0 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
@@ -186,7 +186,7 @@ class AuthenticationPreferenceFragment: BasePreferencesFragment() {
             val dialog = HabiticaAlertDialog(context)
             dialog.setTitle(R.string.delete_account)
             dialog.setMessage(deleteMessage)
-            dialog.addButton(R.string.delete_account_confirmation, true, true) { _, _ ->
+            dialog.addButton(R.string.delete_account_confirmation, isPrimary = true, isDestructive = true) { _, _ ->
                 deleteAccount(editText?.text?.toString() ?: "")
             }
             dialog.addCancelButton()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
index 1424da989..d5b682d8a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
@@ -64,7 +64,11 @@ class ShopItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), Vi
 
         DataBindingUtils.loadImage(this.imageView, item.imageName)
 
-        if (item.unlockCondition == null || !item.locked) {
+        itemDetailIndicator.text = null
+        itemDetailIndicator.visibility = View.GONE
+
+        val lockedReason = item.lockedReason(context)
+        if (!item.locked) {
             priceLabel.text = item.value.toString()
             priceLabel.currency = item.currency
             if (item.currency == null) {
@@ -73,23 +77,19 @@ class ShopItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), Vi
             priceLabel.visibility = View.VISIBLE
             unlockLabel.visibility = View.GONE
         } else {
-            unlockLabel.setText(item.unlockCondition?.readableUnlockConditionId() ?: 0)
+            unlockLabel.text = lockedReason
             priceLabel.visibility = View.GONE
             unlockLabel.visibility = View.VISIBLE
+            itemDetailIndicator.background = lockedDrawable
+            itemDetailIndicator.visibility = View.VISIBLE
         }
 
-        itemDetailIndicator.text = null
-        itemDetailIndicator.visibility = View.GONE
         if (item.isLimited) {
             itemDetailIndicator.background = limitedDrawable
             itemDetailIndicator.visibility = View.VISIBLE
         }
 
         priceLabel.isLocked = item.locked || !canBuy
-        if (item.locked) {
-            itemDetailIndicator.background = lockedDrawable
-            itemDetailIndicator.visibility = View.VISIBLE
-        }
     }
 
     override fun onClick(view: View) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
index e80e0b4c0..ce53fadaa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
@@ -65,14 +65,6 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
         set(value) {
             field = value
 
-            if (shopItem.unlockCondition == null) {
-                priceLabel.value = shopItem.value.toDouble()
-                priceLabel.currency = shopItem.currency
-            } else {
-                setBuyButtonEnabled(false)
-                buyLabel.text = shopItem.unlockCondition?.readableUnlockConditionId()?.let { context.getString(it) }
-            }
-
             if (shopItem.isLimited) {
                 //TODO: replace with correct date once API is final
                 limitedTextView.text = context.getString(R.string.available_until, Date().toString())
@@ -80,7 +72,19 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
                 limitedTextView.visibility = View.GONE
             }
 
-            priceLabel.isLocked = shopItem.locked
+            if (shopItem.lockedReason(context) == null) {
+                priceLabel.value = shopItem.value.toDouble()
+                priceLabel.currency = shopItem.currency
+            } else {
+                limitedTextView.text = shopItem.lockedReason(context)
+            }
+            if (shopItem.locked) {
+                setBuyButtonEnabled(false)
+                buyLabel.text = context.getString(R.string.locked)
+                limitedTextView.visibility = View.VISIBLE
+            }
+
+            priceLabel.isLocked = shopItem.locked || shopItem.lockedReason(context) != null
 
             val contentView: PurchaseDialogContent
             when {

From 8e6ccfa6c977c1126ee1d52ece8a657bc16293a7 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 4 Feb 2020 14:04:22 +0100
Subject: [PATCH 17/62] Improve unsubscribe handling

---
 .../habitica/ui/fragments/NavigationDrawerFragment.kt     | 2 ++
 .../ui/fragments/purchases/SubscriptionFragment.kt        | 8 ++++++--
 .../ui/views/subscriptions/SubscriptionDetailsView.kt     | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

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 0d0f17630..a1e8b8d54 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
@@ -253,6 +253,8 @@ class NavigationDrawerFragment : DialogFragment() {
                     }
                 }
             }
+        } else if (user.isSubscribed) {
+            subscriptionItem?.subtitle = null
         } else {
             subscriptionItem?.subtitle = context?.getString(R.string.more_out_of_habitica)
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
index d3fbda00e..580cb46ff 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
@@ -179,6 +179,7 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
         selectedSubscriptionSku?.let { sku ->
             purchaseHandler?.purchaseSubscription(sku) {
                 fetchUser(null)
+                binding.scrollView.smoothScrollTo(0, 0)
             }
         }
     }
@@ -186,7 +187,10 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
     fun setUser(newUser: User) {
         user = newUser
         this.updateSubscriptionInfo()
-        checkIfNeedsCancellation()
+        purchaseHandler?.checkForSubscription {
+            purchasedSubscription = it
+            checkIfNeedsCancellation()
+        }
     }
 
     private fun updateSubscriptionInfo() {
@@ -218,7 +222,7 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
     }
 
     private fun checkIfNeedsCancellation() {
-        if (user?.purchased?.plan?.isActive == true) {
+        if (user?.purchased?.plan?.isActive == true && purchasedSubscription?.autoRenewing == false) {
             compositeSubscription.add(apiClient.cancelSubscription().subscribe(Consumer {
                         refresh()
             }, RxErrorHandler.handleEmptyError()))
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt
index 284d872d0..1585ed10c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt
@@ -47,7 +47,7 @@ class SubscriptionDetailsView : LinearLayout {
 
         var duration: String? = null
 
-        if (plan.planId != null) {
+        if (plan.planId != null && plan.dateTerminated == null) {
             if (plan.planId == SubscriptionPlan.PLANID_BASIC || plan.planId == SubscriptionPlan.PLANID_BASICEARNED) {
                 duration = resources.getString(R.string.month)
             } else if (plan.planId == SubscriptionPlan.PLANID_BASIC3MONTH) {

From df4417d0a3bc5f4b1884b412652d838cea2ee5eb Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 4 Feb 2020 15:34:48 +0100
Subject: [PATCH 18/62] Fix sharing

---
 Habitica/res/values/strings.xml                      |  6 +++---
 .../android/habitica/ui/activities/MainActivity.kt   | 12 +++++++-----
 .../android/habitica/userpicture/BitmapUtils.kt      |  5 +++++
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index c755488e9..1124dc880 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -323,9 +323,9 @@
     <string name="add_invites">Add Invites</string>
     <string name="email">Email</string>
     <string name="share_using">Share using</string>o
-    <string name="share_levelup">I got to level %d in Habitica by improving my real-life habits!</string>
-    <string name="share_hatched">I just hatched a %1$s %2$s pet in Habitica by completing my real-life tasks!</string>
-    <string name="share_raised">I just gained a %1$s mount in Habitica by completing my real-life tasks!</string>
+    <string name="share_levelup">I got to level %d in #Habitica by improving my real-life habits!</string>
+    <string name="share_hatched">I just hatched a %1$s %2$s pet in #Habitica by completing my real-life tasks!</string>
+    <string name="share_raised">I just gained a %1$s mount in #Habitica by completing my real-life tasks!</string>
     <string name="open_in_store">Open in play store</string>
     <string name="change_class_confirmation">Are you sure you want to change your class? This will cost 3 gems.</string>
     <string name="change_class_equipment_warning">Warning: You will no longer be able to buy equipment from the %s class.</string>
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 b73849d1c..230b8f653 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
@@ -580,11 +580,13 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
         sharingIntent.putExtra(Intent.EXTRA_TEXT, event.sharedMessage)
         val f = BitmapUtils.saveToShareableFile("$filesDir/shared_images", "share.png", event.shareImage)
         val fileUri = f?.let { FileProvider.getUriForFile(this, getString(R.string.content_provider), it) }
-        sharingIntent.putExtra(Intent.EXTRA_STREAM, fileUri)
-        val resInfoList = this.packageManager.queryIntentActivities(sharingIntent, PackageManager.MATCH_DEFAULT_ONLY)
-        for (resolveInfo in resInfoList) {
-            val packageName = resolveInfo.activityInfo.packageName
-            this.grantUriPermission(packageName, fileUri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION or Intent.FLAG_GRANT_READ_URI_PERMISSION)
+        if (fileUri != null) {
+            sharingIntent.putExtra(Intent.EXTRA_STREAM, fileUri)
+            val resInfoList = this.packageManager.queryIntentActivities(sharingIntent, PackageManager.MATCH_DEFAULT_ONLY)
+            for (resolveInfo in resInfoList) {
+                val packageName = resolveInfo.activityInfo.packageName
+                this.grantUriPermission(packageName, fileUri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION or Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            }
         }
         startActivity(Intent.createChooser(sharingIntent, getString(R.string.share_using)))
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/userpicture/BitmapUtils.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/userpicture/BitmapUtils.kt
index 22cc2964a..3f53d2b19 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/userpicture/BitmapUtils.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/userpicture/BitmapUtils.kt
@@ -9,6 +9,10 @@ object BitmapUtils {
         var name = filename
         try {
             name = "$directory/$name"
+            val dirFile = File(directory)
+            if (!dirFile.exists()) {
+                dirFile.mkdir()
+            }
 
             val out = FileOutputStream(name)
             bmp.compress(Bitmap.CompressFormat.PNG, 100, out)
@@ -16,6 +20,7 @@ object BitmapUtils {
             out.close()
             return File(name)
         } catch (ignored: Exception) {
+            ignored.printStackTrace()
         }
 
         return null

From f18a5005e3fac779537fcb3513a1dc0079a72739 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 5 Feb 2020 07:55:58 +0100
Subject: [PATCH 19/62] =?UTF-8?q?Don=E2=80=99t=20always=20show=20g1g1=20mo?=
 =?UTF-8?q?dal.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchases/SubscriptionFragment.kt         | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
index 580cb46ff..a90d5931a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.EditText
 import androidx.core.view.isVisible
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
@@ -13,6 +14,7 @@ import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.databinding.FragmentSubscriptionBinding
 import com.habitrpg.android.habitica.events.UserSubscribedEvent
+import com.habitrpg.android.habitica.extensions.addCancelButton
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.PurchaseHandler
 import com.habitrpg.android.habitica.helpers.PurchaseTypes
@@ -21,8 +23,11 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.proxy.CrashlyticsProxy
 import com.habitrpg.android.habitica.ui.activities.GemPurchaseActivity
 import com.habitrpg.android.habitica.ui.activities.GiftOneGetOneInfoActivity
+import com.habitrpg.android.habitica.ui.activities.GiftSubscriptionActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
+import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
 import io.reactivex.functions.Consumer
 import org.greenrobot.eventbus.Subscribe
@@ -241,7 +246,28 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
     }
 
     private fun showGiftSubscriptionDialog() {
-        val intent = Intent(context, GiftOneGetOneInfoActivity::class.java)
-        context?.startActivity(intent)
+        if (appConfigManager.enableGiftOneGetOne()) {
+            val intent = Intent(context, GiftOneGetOneInfoActivity::class.java)
+            context?.startActivity(intent)
+        } else {
+            val chooseRecipientDialogView = this.activity?.layoutInflater?.inflate(R.layout.dialog_choose_message_recipient, null)
+
+            this.activity?.let { thisActivity ->
+                val alert = HabiticaAlertDialog(thisActivity)
+                alert.setTitle(getString(R.string.gift_title))
+                alert.addButton(getString(R.string.action_continue), true) { _, _ ->
+                    val usernameEditText = chooseRecipientDialogView?.findViewById<View>(R.id.uuidEditText) as? EditText
+                    val intent = Intent(thisActivity, GiftSubscriptionActivity::class.java).apply {
+                        putExtra("username", usernameEditText?.text.toString())
+                    }
+                    startActivity(intent)
+                }
+                alert.addCancelButton { _, _ ->
+                    thisActivity.dismissKeyboard()
+                }
+                alert.setAdditionalContentView(chooseRecipientDialogView)
+                alert.show()
+            }
+        }
     }
 }

From 39be40ffd59f26f0791078f157c4d7b1b2785c54 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 5 Feb 2020 07:58:24 +0100
Subject: [PATCH 20/62] remove urls from sharing

---
 .../habitrpg/android/habitica/interactors/LevelUpUseCase.kt   | 2 +-
 .../habitrpg/android/habitica/ui/activities/MainActivity.kt   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt
index 94ef9d2b7..ebe88862a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt
@@ -61,7 +61,7 @@ constructor(private val soundManager: SoundManager, threadExecutor: ThreadExecut
                 }
 
                 val event = ShareEvent()
-                event.sharedMessage = requestValues.activity.getString(R.string.share_levelup, requestValues.newLevel) + " https://habitica.com/social/level-UP"
+                event.sharedMessage = requestValues.activity.getString(R.string.share_levelup, requestValues.newLevel)
                 val avatarView = AvatarView(requestValues.activity, showBackground = true, showMount = true, showPet = true)
                 avatarView.setAvatar(requestValues.user)
                 avatarView.onAvatarImageReady(Consumer { t -> event.shareImage = t })
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 230b8f653..20f49d481 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
@@ -427,7 +427,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
                         dialog.addButton(R.string.onwards, true)
                         dialog.addButton(R.string.share, false) { hatchingDialog, _ ->
                                     val event1 = ShareEvent()
-                                    event1.sharedMessage = getString(R.string.share_raised, pet.text) + " https://habitica.com/social/raise-pet"
+                                    event1.sharedMessage = getString(R.string.share_raised, pet.text)
                                     val mountImageSideLength = 99
                                     val sharedImage = Bitmap.createBitmap(mountImageSideLength, mountImageSideLength, Bitmap.Config.ARGB_8888)
                                     val canvas = Canvas(sharedImage)
@@ -717,7 +717,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
             dialog.addButton(R.string.onwards, true) { hatchingDialog, _ -> hatchingDialog.dismiss() }
             dialog.addButton(R.string.share, false) { hatchingDialog, _ ->
                 val event1 = ShareEvent()
-                event1.sharedMessage = getString(R.string.share_hatched, potionName, eggName) + " https://habitica.com/social/hatch-pet"
+                event1.sharedMessage = getString(R.string.share_hatched, potionName, eggName)
                 val petImageSideLength = 140
                 val sharedImage = Bitmap.createBitmap(petImageSideLength, petImageSideLength, Bitmap.Config.ARGB_8888)
                 val canvas = Canvas(sharedImage)

From 25b9b850441e17649bd202e74f1281239753d538 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 5 Feb 2020 09:16:21 +0100
Subject: [PATCH 21/62] update account deletion text

---
 Habitica/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 1124dc880..9145c73e2 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -561,8 +561,8 @@
     <string name="reset_account">Reset Account</string>
     <string name="reset_account_description">WARNING! This resets many parts of your account. This is highly discouraged, but some people find it useful in the beginning after playing with the site for a short time.\n\nYou will lose all your levels, gold, and experience points. All your tasks (except those from challenges) will be deleted permanently and you will lose all of their historical data. You will lose all your equipment but you will be able to buy it all back, including all limited edition equipment or subscriber Mystery items that you already own (you will need to be in the correct class to re-buy class-specific gear). You will keep your current class and your pets and mounts. You might prefer to use an Orb of Rebirth instead, which is a much safer option and which will preserve your tasks and equipment.</string>
     <string name="delete_account">Delete Account</string>
-    <string name="delete_account_description">Are you sure? This will delete your account forever, and it can never be restored! You will need to register a new account to use Habitica again. Banked or spent Gems will not be refunded. If you\'re absolutely certain, type your password into the text box below.</string>
-    <string name="delete_oauth_account_description">Are you sure? This will delete your account forever, and it can never be restored! You will need to register a new account to use Habitica again. Banked or spent Gems will not be refunded. If you\'re absolutely certain, type DELETE into the text box below.</string>
+    <string name="delete_account_description">This will delete your account forever, and it can never be restored! Banked or spent Gems will not be refunded. If you’re absolutely certain, type your password into the text box below.</string>
+    <string name="delete_oauth_account_description">This will delete your account forever, and it can never be restored! Banked or spent Gems will not be refunded. If you’re absolutely certain, type DELETE into the text box below.</string>
     <string name="reset_account_confirmation">Reset my Account</string>
     <string name="delete_account_confirmation">Delete my Account</string>
     <string name="danger_zone">Danger Zone</string>

From b60f8ac7b4ddd609a0e53f8c50576b55b2701c52 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 5 Feb 2020 09:16:32 +0100
Subject: [PATCH 22/62] change sharing image saving

---
 .../com/habitrpg/android/habitica/ui/activities/MainActivity.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 20f49d481..85f710f4e 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
@@ -578,7 +578,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
         val sharingIntent = Intent(Intent.ACTION_SEND)
         sharingIntent.type = "*/*"
         sharingIntent.putExtra(Intent.EXTRA_TEXT, event.sharedMessage)
-        val f = BitmapUtils.saveToShareableFile("$filesDir/shared_images", "share.png", event.shareImage)
+        val f = BitmapUtils.saveToShareableFile("$filesDir/shared_images", "${Date().toString()}.png", event.shareImage)
         val fileUri = f?.let { FileProvider.getUriForFile(this, getString(R.string.content_provider), it) }
         if (fileUri != null) {
             sharingIntent.putExtra(Intent.EXTRA_STREAM, fileUri)

From 8e2041923be1d21fd4fd835055a0fb4c68187ee0 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 5 Feb 2020 11:55:15 +0100
Subject: [PATCH 23/62] Improve sharing

---
 Habitica/build.gradle                                        | 2 +-
 .../habitrpg/android/habitica/ui/activities/MainActivity.kt  | 1 +
 .../com/habitrpg/android/habitica/userpicture/BitmapUtils.kt | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 919105e6a..8989e59cd 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -153,7 +153,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 2364
+        versionCode 2369
         versionName "2.5"
     }
 
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 85f710f4e..7945ec294 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
@@ -578,6 +578,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
         val sharingIntent = Intent(Intent.ACTION_SEND)
         sharingIntent.type = "*/*"
         sharingIntent.putExtra(Intent.EXTRA_TEXT, event.sharedMessage)
+        BitmapUtils.clearDirectoryContent("$filesDir/shared_images")
         val f = BitmapUtils.saveToShareableFile("$filesDir/shared_images", "${Date().toString()}.png", event.shareImage)
         val fileUri = f?.let { FileProvider.getUriForFile(this, getString(R.string.content_provider), it) }
         if (fileUri != null) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/userpicture/BitmapUtils.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/userpicture/BitmapUtils.kt
index 3f53d2b19..ad52b4523 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/userpicture/BitmapUtils.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/userpicture/BitmapUtils.kt
@@ -5,6 +5,11 @@ import java.io.File
 import java.io.FileOutputStream
 
 object BitmapUtils {
+    fun clearDirectoryContent(directory: String) {
+        val dirFile = File(directory)
+        dirFile.listFiles()?.forEach { it.delete() }
+    }
+
     fun saveToShareableFile(directory: String, filename: String, bmp: Bitmap): File? {
         var name = filename
         try {

From ffa8f8e1ceddd28c259636406599fb67f1d5e924 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 6 Feb 2020 18:06:44 +0100
Subject: [PATCH 24/62] Improve shop locked item display

---
 Habitica/build.gradle                         |  8 +++----
 .../drawable/button_background_gray_600.xml   |  6 +++++
 Habitica/res/values/strings.xml               |  8 +++++--
 .../android/habitica/models/shops/ShopItem.kt | 22 ++++++++++++++++++-
 .../models/shops/ShopItemUnlockCondition.kt   | 22 ++++++++++---------
 .../ui/viewHolders/ShopItemViewHolder.kt      |  2 +-
 .../habitica/ui/views/shops/PurchaseDialog.kt |  9 +++++---
 7 files changed, 56 insertions(+), 21 deletions(-)
 create mode 100644 Habitica/res/drawable/button_background_gray_600.xml

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 8989e59cd..364442ed4 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -126,10 +126,10 @@ dependencies {
     implementation 'com.nex3z:flow-layout:1.2.2'
 
     implementation 'androidx.core:core-ktx:1.1.0'
-    implementation "androidx.lifecycle:lifecycle-extensions:2.1.0"
-    implementation "androidx.lifecycle:lifecycle-common-java8:2.1.0"
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.1.0'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.1.0'
+    implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
+    implementation "androidx.lifecycle:lifecycle-common-java8:2.2.0"
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.2.1'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.2.1'
     implementation "androidx.paging:paging-runtime-ktx:2.1.1"
     implementation 'com.plattysoft.leonids:LeonidsLib:1.3.2'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3'
diff --git a/Habitica/res/drawable/button_background_gray_600.xml b/Habitica/res/drawable/button_background_gray_600.xml
new file mode 100644
index 000000000..9d6ccf7a2
--- /dev/null
+++ b/Habitica/res/drawable/button_background_gray_600.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/gray_600" />
+    <corners android:radius="8dp"/>
+    <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
+</shape>
\ No newline at end of file
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 9145c73e2..b4b759143 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -336,9 +336,11 @@
     <string name="empty_inbox">You don\'t have any messages. You can send a user a new message from their public chat messages!</string>
     <string name="party_invite">Unlock by inviting friends</string>
     <string name="login_incentive">Unlock by logging into Habitica regularly</string>
+    <string name="login_incentive_count">Unlock by checking into Habitica %d times.</string>
     <string name="create_account">Unlock by creating an account</string>
     <string name="party_invite_short">Invite Friends</string>
     <string name="login_incentive_short">login into Habitica regularly</string>
+    <string name="login_incentive_short_count">%d Checkins</string>
     <string name="create_account_short">create an account</string>
     <string name="successful_purchase">Purchased %1$s</string>
     <string name="gold_plural">gold</string>
@@ -946,6 +948,8 @@
     <string name="preference_email_onboarding">Guidance with setting up your Habitica Account</string>
     <string name="skill_unlocks_at">Skill unlocks at level %d</string>
     <string name="locked">Locked</string>
-    <string name="unlock_previous">Finish Quest %d</string>
-    <string name="unlock_level">Level %d</string>
+    <string name="unlock_previous">Unlock by finishing Quest %d</string>
+    <string name="unlock_level">Unlock by reaching level %d</string>
+    <string name="unlock_previous_short">Finish Quest %d</string>
+    <string name="unlock_level_short">Level %d</string>
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
index 999b8a208..1c3c38e18 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
@@ -90,7 +90,27 @@ open class ShopItem : RealmObject() {
     fun lockedReason(context: Context): String? {
         return when {
             unlockCondition != null -> {
-                unlockCondition?.shortReadableUnlockConditionId()?.let { context.getString(it) }
+                unlockCondition?.readableUnlockCondition(context)
+            }
+            previous != null -> {
+                try {
+                    val thisNumber = Character.getNumericValue(key.last())
+                    context.getString(R.string.unlock_previous_short, thisNumber - 1)
+                } catch (e: NumberFormatException) {
+                    null
+                }
+            }
+            level != null -> {
+                context.getString(R.string.unlock_level_short, level ?: 0)
+            }
+            else -> null
+        }
+    }
+
+    fun shortLockedReason(context: Context): String? {
+        return when {
+            unlockCondition != null -> {
+                unlockCondition?.shortReadableUnlockCondition(context)
             }
             previous != null -> {
                 try {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.kt
index 245f359e9..bc79daefb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.kt
@@ -1,5 +1,6 @@
 package com.habitrpg.android.habitica.models.shops
 
+import android.content.Context
 import com.habitrpg.android.habitica.R
 
 import io.realm.RealmObject
@@ -10,18 +11,19 @@ open class ShopItemUnlockCondition : RealmObject() {
     @PrimaryKey
     var questKey: String? = null
     private var condition: String? = null
+    var incentiveThreshold: Int? = null
 
-    fun readableUnlockConditionId(): Int = when (this.condition) {
-        "party invite" -> R.string.party_invite
-        "login incentive" -> R.string.login_incentive
-        "create account" -> R.string.create_account
-        else -> R.string.empty
+    fun readableUnlockCondition(context: Context): String = when (this.condition) {
+        "party invite" -> context.getString(R.string.party_invite)
+        "login reward" -> if (incentiveThreshold != null) context.getString(R.string.login_incentive_count, incentiveThreshold) else  context.getString(R.string.login_incentive)
+        "create account" -> context.getString(R.string.create_account)
+        else -> ""
     }
 
-    fun shortReadableUnlockConditionId(): Int = when (this.condition) {
-        "party invite" -> R.string.party_invite_short
-        "login incentive" -> R.string.login_incentive_short
-        "create account" -> R.string.create_account_short
-        else -> R.string.empty
+    fun shortReadableUnlockCondition(context: Context): String = when (this.condition) {
+        "party invite" -> context.getString(R.string.party_invite_short)
+        "login reward" -> if (incentiveThreshold != null) context.getString(R.string.login_incentive_short_count, incentiveThreshold) else  context.getString(R.string.login_incentive_short)
+        "create account" -> context.getString(R.string.create_account_short)
+        else -> ""
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
index d5b682d8a..a45a47c13 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
@@ -67,7 +67,7 @@ class ShopItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), Vi
         itemDetailIndicator.text = null
         itemDetailIndicator.visibility = View.GONE
 
-        val lockedReason = item.lockedReason(context)
+        val lockedReason = item.shortLockedReason(context)
         if (!item.locked) {
             priceLabel.text = item.value.toString()
             priceLabel.currency = item.currency
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
index ce53fadaa..6f62e28ac 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
@@ -7,6 +7,7 @@ import android.view.View
 import android.widget.Button
 import android.widget.TextView
 import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.toDrawable
 import androidx.core.os.bundleOf
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
@@ -82,6 +83,8 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
                 setBuyButtonEnabled(false)
                 buyLabel.text = context.getString(R.string.locked)
                 limitedTextView.visibility = View.VISIBLE
+                limitedTextView.background = ContextCompat.getColor(context, R.color.gray_600).toDrawable()
+                limitedTextView.setTextColor(ContextCompat.getColor(context, R.color.gray_100))
             }
 
             priceLabel.isLocked = shopItem.locked || shopItem.lockedReason(context) != null
@@ -186,9 +189,9 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
             priceLabel.setTextColor(ContextCompat.getColor(context, R.color.white))
             buyLabel.setTextColor(ContextCompat.getColor(context, R.color.white))
         } else {
-            buyButton.background = context.getDrawable(R.drawable.button_background_gray_700)
-            priceLabel.setTextColor(ContextCompat.getColor(context, R.color.gray_200))
-            buyLabel.setTextColor(ContextCompat.getColor(context, R.color.gray_200))
+            buyButton.background = context.getDrawable(R.drawable.button_background_gray_600)
+            priceLabel.setTextColor(ContextCompat.getColor(context, R.color.gray_100))
+            buyLabel.setTextColor(ContextCompat.getColor(context, R.color.gray_100))
         }
 
         if (shopItem.isTypeGear) {

From 68d6ce7425afb169552a9267da8c181e48fd61e6 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Fri, 7 Feb 2020 16:36:56 +0100
Subject: [PATCH 25/62] Fix shop item display

---
 Habitica/build.gradle                                  |  2 +-
 .../habitrpg/android/habitica/models/shops/ShopItem.kt |  4 ++--
 .../ui/fragments/purchases/SubscriptionFragment.kt     |  7 +++++--
 .../habitica/ui/viewHolders/ShopItemViewHolder.kt      |  2 +-
 .../android/habitica/ui/views/shops/PurchaseDialog.kt  | 10 +---------
 5 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 364442ed4..5eecdee75 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -153,7 +153,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 2369
+        versionCode 2371
         versionName "2.5"
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
index 1c3c38e18..f49f83bc0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
@@ -87,7 +87,7 @@ open class ShopItem : RealmObject() {
         return this.key.hashCode()
     }
 
-    fun lockedReason(context: Context): String? {
+    fun shortLockedReason(context: Context): String? {
         return when {
             unlockCondition != null -> {
                 unlockCondition?.readableUnlockCondition(context)
@@ -107,7 +107,7 @@ open class ShopItem : RealmObject() {
         }
     }
 
-    fun shortLockedReason(context: Context): String? {
+    fun lockedReason(context: Context): String? {
         return when {
             unlockCondition != null -> {
                 unlockCondition?.shortReadableUnlockCondition(context)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
index a90d5931a..9b62e3135 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
@@ -2,6 +2,7 @@ package com.habitrpg.android.habitica.ui.fragments.purchases
 
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -227,9 +228,11 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
     }
 
     private fun checkIfNeedsCancellation() {
-        if (user?.purchased?.plan?.isActive == true && purchasedSubscription?.autoRenewing == false) {
+        if (user?.purchased?.plan?.paymentMethod == "Google" &&
+                user?.purchased?.plan?.isActive == true &&
+                (purchasedSubscription?.autoRenewing == false ||purchasedSubscription == null)) {
             compositeSubscription.add(apiClient.cancelSubscription().subscribe(Consumer {
-                        refresh()
+                refresh()
             }, RxErrorHandler.handleEmptyError()))
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
index a45a47c13..9d506c6fb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
@@ -62,7 +62,7 @@ class ShopItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), Vi
         this.item = item
         buyButton.visibility = View.VISIBLE
 
-        DataBindingUtils.loadImage(this.imageView, item.imageName)
+        DataBindingUtils.loadImage(this.imageView, item.imageName?.replace("_locked", ""))
 
         itemDetailIndicator.text = null
         itemDetailIndicator.visibility = View.GONE
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
index 6f62e28ac..a698aaff1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
@@ -80,7 +80,6 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
                 limitedTextView.text = shopItem.lockedReason(context)
             }
             if (shopItem.locked) {
-                setBuyButtonEnabled(false)
                 buyLabel.text = context.getString(R.string.locked)
                 limitedTextView.visibility = View.VISIBLE
                 limitedTextView.background = ContextCompat.getColor(context, R.color.gray_600).toDrawable()
@@ -184,7 +183,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
         }
 
         buyButton.elevation = 0f
-        if (shopItem.canAfford(user, configManager.insufficientGemPurchase())) {
+        if (shopItem.canAfford(user, configManager.insufficientGemPurchase()) && !shopItem.locked) {
             buyButton.background = context.getDrawable(R.drawable.button_background_primary)
             priceLabel.setTextColor(ContextCompat.getColor(context, R.color.white))
             buyLabel.setTextColor(ContextCompat.getColor(context, R.color.white))
@@ -286,12 +285,5 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
         dismiss()
     }
 
-    private fun setBuyButtonEnabled(enabled: Boolean) {
-        if (enabled) {
-            buyButton.alpha = 1.0f
-        } else {
-            buyButton.alpha = 0.5f
-        }
-    }
 }
 

From 975dfd70231047f78ca45f97ba20da8631b74415 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 12 Feb 2020 17:21:43 +0100
Subject: [PATCH 26/62] Better indication for when user is not participating in
 quest

---
 Habitica/build.gradle                            |  2 +-
 Habitica/res/values/strings.xml                  |  1 +
 Habitica/res/values/values.xml                   | 16 ++++++++++++++++
 .../social/party/PartyDetailFragment.kt          | 11 ++++++++++-
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 5eecdee75..54d8758f8 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -153,7 +153,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 2371
+        versionCode 2373
         versionName "2.5"
     }
 
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index b4b759143..64e1fb01f 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -952,4 +952,5 @@
     <string name="unlock_level">Unlock by reaching level %d</string>
     <string name="unlock_previous_short">Finish Quest %d</string>
     <string name="unlock_level_short">Level %d</string>
+    <string name="not_participating">You are not participating</string>
 </resources>
diff --git a/Habitica/res/values/values.xml b/Habitica/res/values/values.xml
index 2572ea591..b6510e863 100644
--- a/Habitica/res/values/values.xml
+++ b/Habitica/res/values/values.xml
@@ -89,6 +89,14 @@
         <item>Rosstavo\'s Theme</item>
         <item>Dewin\'s Theme</item>
         <item>Airu\'s Theme</item>
+        <item>Beatscribe\'s NES Theme</item>
+        <item>Arashi\'s Theme</item>
+        <item>Triumph Theme</item>
+        <item>Lunasol Theme</item>
+        <item>SpacePenguin\'s Theme</item>
+        <item>MAFL Theme</item>
+        <item>Pizilden\'s Theme</item>
+        <item>Farvoid Theme</item>
     </string-array>
 
     <string-array name="AudioValues">
@@ -100,6 +108,14 @@
         <item>rosstavoTheme</item>
         <item>dewinTheme</item>
         <item>airuTheme</item>
+        <item>beatscribeNesTheme</item>
+        <item>arashiTheme</item>
+        <item>triumphTheme</item>
+        <item>lunasolTheme</item>
+        <item>spacePenguinTheme</item>
+        <item>maflTheme</item>
+        <item>pizildenTheme</item>
+        <item>farvoidTheme</item>
     </string-array>
 
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
index 4eaee013d..cc0aac872 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
@@ -208,11 +208,20 @@ class PartyDetailFragment : BaseFragment() {
         } else {
             DataBindingUtils.loadImage(questImageView, "quest_" + questContent.key)
         }
+        questImageWrapper?.alpha = 1.0f
+        questProgressView?.alpha = 1.0f
         if (viewModel?.isQuestActive == true) {
             questProgressView?.visibility = View.VISIBLE
             questProgressView?.setData(questContent, viewModel?.getGroupData()?.value?.quest?.progress)
 
-            questParticipationView?.text = context?.getString(R.string.number_participants, viewModel?.getGroupData()?.value?.quest?.members?.size)
+            val questParticipants = viewModel?.getGroupData()?.value?.quest?.members
+            if (questParticipants?.find { it.key == userId } != null) {
+                questParticipationView?.text = context?.getString(R.string.number_participants, questParticipants.size)
+            } else {
+                questParticipationView?.text = context?.getString(R.string.not_participating)
+                questImageWrapper?.alpha = 0.5f
+                questProgressView?.alpha = 0.5f
+            }
         } else {
             questProgressView?.visibility = View.GONE
         }

From 8a1a55de39e935b11de1f5d8e593348daf6e1a60 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 13 Feb 2020 11:55:38 +0100
Subject: [PATCH 27/62] allow dialogs to be scrollable. Fixes #1264

---
 Habitica/res/layout/dialog_habitica_base.xml              | 1 +
 .../habitica/ui/views/dialogs/HabiticaAlertDialog.kt      | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Habitica/res/layout/dialog_habitica_base.xml b/Habitica/res/layout/dialog_habitica_base.xml
index a61d21bad..246d9671a 100644
--- a/Habitica/res/layout/dialog_habitica_base.xml
+++ b/Habitica/res/layout/dialog_habitica_base.xml
@@ -57,6 +57,7 @@
             android:paddingStart="@dimen/alert_side_padding"
             android:paddingEnd="@dimen/alert_side_padding"
             android:textColor="?textColorSecondary"
+            android:scrollbars = "vertical"
             style="@style/Body2"
             />
         <androidx.core.widget.NestedScrollView
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt
index 8999e319a..4aaf10598 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt
@@ -2,6 +2,7 @@ package com.habitrpg.android.habitica.ui.views.dialogs
 
 import android.app.Activity
 import android.content.Context
+import android.text.method.ScrollingMovementMethod
 import android.view.*
 import android.view.animation.AccelerateInterpolator
 import android.widget.*
@@ -61,7 +62,7 @@ open class HabiticaAlertDialog(context: Context) : AlertDialog(context, R.style.
     }
 
     override fun setTitle(title: CharSequence?) {
-        if (title != null) {
+        if ((title?.length ?: 0) > 0) {
             titleTextView.visibility = View.VISIBLE
         } else {
             titleTextView.visibility = View.GONE
@@ -74,12 +75,13 @@ open class HabiticaAlertDialog(context: Context) : AlertDialog(context, R.style.
     }
 
     override fun setMessage(message: CharSequence?) {
-        if (message != null) {
+        if ((message?.length ?: 0) > 0) {
             messageTextView.visibility = View.VISIBLE
         } else {
             messageTextView.visibility = View.GONE
         }
         messageTextView.text = message
+        messageTextView.movementMethod = ScrollingMovementMethod()
     }
 
     fun setMessage(messageId: Int) {
@@ -87,7 +89,7 @@ open class HabiticaAlertDialog(context: Context) : AlertDialog(context, R.style.
     }
 
     fun setNotice(notice: CharSequence?) {
-        if (notice != null) {
+        if ((notice?.length ?: 0) > 0) {
             noticeTextView.visibility = View.VISIBLE
         } else {
             noticeTextView.visibility = View.GONE

From 4b2b3c66ca105b4bcaa42be690816e6a9a099bbf Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 13 Feb 2020 16:10:20 +0100
Subject: [PATCH 28/62] Changes to task reminders

---
 Habitica/AndroidManifest.xml                      |  6 +++++-
 .../android/habitica/helpers/TaskAlarmManager.kt  |  7 +++----
 .../habitica/receivers/TaskAlarmBootReceiver.kt   |  3 +++
 .../android/habitica/receivers/TaskReceiver.kt    |  4 ++++
 .../habitica/ui/activities/MainActivity.kt        | 15 ++++++---------
 5 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index c4bcc8103..3c501e746 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -191,7 +191,11 @@
             android:windowSoftInputMode="stateHidden" />
         <receiver android:name=".receivers.NotificationPublisher" />
 
-        <receiver android:name=".receivers.TaskReceiver"/>
+        <receiver android:name=".receivers.TaskReceiver" android:enabled="true" android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.NOTIFY" />
+            </intent-filter>
+        </receiver>
 
         <receiver android:name=".receivers.LocalNotificationActionReceiver"
             android:exported="false">
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt
index c4e9a51ff..4f4094b80 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt
@@ -6,13 +6,14 @@ import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.os.Build.VERSION.SDK_INT
-import androidx.core.content.edit
 import androidx.preference.PreferenceManager
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.models.tasks.RemindersItem
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.receivers.NotificationPublisher
 import com.habitrpg.android.habitica.receivers.TaskReceiver
+import com.habitrpg.shared.habitica.HLogger
+import com.habitrpg.shared.habitica.LogLevel
 import io.reactivex.Flowable
 import io.reactivex.functions.Consumer
 import java.util.*
@@ -61,9 +62,6 @@ class TaskAlarmManager(private var context: Context, private var taskRepository:
         if (!preventDailyReminder) {
             scheduleDailyReminder(context)
         }
-        PreferenceManager.getDefaultSharedPreferences(context).edit {
-            putLong("lastReminderSchedule", Date().time)
-        }
     }
 
     fun scheduleAlarmsForTask(task: Task) {
@@ -168,6 +166,7 @@ class TaskAlarmManager(private var context: Context, private var taskRepository:
         }
 
         private fun setAlarm(context: Context, time: Long, pendingIntent: PendingIntent?) {
+            HLogger.log(LogLevel.INFO, "TaskAlarmManager", "Scheduling for $time")
             val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as? AlarmManager
 
             if (pendingIntent == null) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.kt
index 23d20d914..37e82fc7b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.kt
@@ -6,6 +6,8 @@ import android.content.Intent
 import android.content.SharedPreferences
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager
+import com.habitrpg.shared.habitica.HLogger
+import com.habitrpg.shared.habitica.LogLevel
 import javax.inject.Inject
 
 class TaskAlarmBootReceiver : BroadcastReceiver() {
@@ -18,6 +20,7 @@ class TaskAlarmBootReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, arg1: Intent) {
         HabiticaBaseApplication.userComponent?.inject(this)
         taskAlarmManager.scheduleAllSavedAlarms(sharedPreferences.getBoolean("preventDailyReminder", false))
+        HLogger.log(LogLevel.INFO, this::javaClass.name, "onReceive")
     }
 
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt
index 85150d901..d0ed936d1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt
@@ -15,6 +15,8 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.activities.MainActivity
+import com.habitrpg.shared.habitica.HLogger
+import com.habitrpg.shared.habitica.LogLevel
 import io.reactivex.functions.Consumer
 import java.util.*
 import javax.inject.Inject
@@ -31,6 +33,7 @@ class TaskReceiver : BroadcastReceiver() {
     lateinit var taskRepository: TaskRepository
 
     override fun onReceive(context: Context, intent: Intent) {
+        HLogger.log(LogLevel.INFO, this::javaClass.name, "onReceive")
         HabiticaBaseApplication.userComponent?.inject(this)
         val extras = intent.extras
         if (extras != null) {
@@ -58,6 +61,7 @@ class TaskReceiver : BroadcastReceiver() {
 
     private fun createNotification(context: Context, task: Task) {
         val intent = Intent(context, MainActivity::class.java)
+        HLogger.log(LogLevel.INFO, this::javaClass.name, "Create Notification")
 
         intent.putExtra("notificationIdentifier", "task_reminder")
         val pendingIntent = PendingIntent.getActivity(context, System.currentTimeMillis().toInt(), intent, 0)
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 7945ec294..91ca338cb 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
@@ -214,6 +214,12 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
 
         setupNotifications()
         setupBottomnavigationLayoutListener()
+
+        try {
+            taskAlarmManager.scheduleAllSavedAlarms(sharedPreferences.getBoolean("preventDailyReminder", false))
+        } catch (e: Exception) {
+            crashlyticsProxy.logException(e)
+        }
     }
 
     private fun setupNotifications() {
@@ -273,15 +279,6 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
         }
         resumeFromActivity = false
 
-
-        if (this.sharedPreferences.getLong("lastReminderSchedule", 0) < Date().time - DateUtils.hoursInMs(2)) {
-            try {
-                taskAlarmManager.scheduleAllSavedAlarms(sharedPreferences.getBoolean("preventDailyReminder", false))
-            } catch (e: Exception) {
-                crashlyticsProxy.logException(e)
-            }
-        }
-
         //Track when the app was last opened, so that we can use this to send out special reminders after a week of inactivity
         sharedPreferences.edit {
             putLong("lastAppLaunch", Date().time)

From 2294d170002079fb34384a159ac7dab48caf5973 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Fri, 14 Feb 2020 18:31:56 +0100
Subject: [PATCH 29/62] Add A/B test to surface shops more

---
 Habitica/build.gradle                         |  2 +-
 Habitica/res/navigation/navigation.xml        | 16 +++++++++++++
 Habitica/res/xml/remote_config_defaults.xml   |  4 ++++
 .../habitica/helpers/AppConfigManager.kt      |  4 ++--
 .../ui/fragments/NavigationDrawerFragment.kt  | 15 +++++++++++-
 .../inventory/shops/MarketFragment.kt         | 13 +++++++++++
 .../inventory/shops/QuestShopFragment.kt      | 13 +++++++++++
 .../inventory/shops/SeasonalShopFragment.kt   | 13 +++++++++++
 .../inventory/shops/ShopsFragment.kt          | 23 +++++++++++++++----
 .../shops/TimeTravelersShopFragment.kt        | 13 +++++++++++
 10 files changed, 107 insertions(+), 9 deletions(-)
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/MarketFragment.kt
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/QuestShopFragment.kt
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/SeasonalShopFragment.kt
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/TimeTravelersShopFragment.kt

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 54d8758f8..cc1439f1a 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -153,7 +153,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 2373
+        versionCode 2375
         versionName "2.5"
     }
 
diff --git a/Habitica/res/navigation/navigation.xml b/Habitica/res/navigation/navigation.xml
index 4c754d467..ea8c338c2 100644
--- a/Habitica/res/navigation/navigation.xml
+++ b/Habitica/res/navigation/navigation.xml
@@ -387,4 +387,20 @@
             app:argType="string"
             app:nullable="true" />
     </fragment>
+    <fragment
+        android:id="@+id/marketFragment"
+        android:name="com.habitrpg.android.habitica.ui.fragments.inventory.shops.MarketFragment"
+        android:label="@string/market" />
+    <fragment
+        android:id="@+id/questShopFragment"
+        android:name="com.habitrpg.android.habitica.ui.fragments.inventory.shops.QuestShopFragment"
+        android:label="@string/questShop" />
+    <fragment
+        android:id="@+id/seasonalShopFragment"
+        android:name="com.habitrpg.android.habitica.ui.fragments.inventory.shops.SeasonalShopFragment"
+        android:label="@string/seasonalShop" />
+    <fragment
+        android:id="@+id/timeTravelersShopFragment"
+        android:name="com.habitrpg.android.habitica.ui.fragments.inventory.shops.TimeTravelersShopFragment"
+        android:label="@string/timeTravelers" />
 </navigation>
\ No newline at end of file
diff --git a/Habitica/res/xml/remote_config_defaults.xml b/Habitica/res/xml/remote_config_defaults.xml
index b93a3b929..7177a2238 100644
--- a/Habitica/res/xml/remote_config_defaults.xml
+++ b/Habitica/res/xml/remote_config_defaults.xml
@@ -72,5 +72,9 @@
         <key>insufficientGemPurchaseAdjust</key>
         <value>false</value>
     </entry>
+    <entry>
+        <key>raiseShops</key>
+        <value>false</value>
+    </entry>
 </defaultsMap>
     <!-- END xml_defaults -->
\ 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 d12edf8cd..b8d1d85af 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
@@ -79,7 +79,7 @@ class AppConfigManager {
         return remoteConfig.getLong("minimumPasswordLength")
     }
 
-    fun useNewMysteryBenefits(): Boolean {
-        return remoteConfig.getBoolean("useNewMysteryBenefits")
+    fun raiseShops(): Boolean {
+        return remoteConfig.getBoolean("raiseShops")
     }
 }
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 a1e8b8d54..c30887aa8 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
@@ -304,8 +304,17 @@ class NavigationDrawerFragment : DialogFragment() {
             items.add(HabiticaDrawerItem(R.id.partyFragment, SIDEBAR_PARTY, context.getString(R.string.sidebar_party)))
             items.add(HabiticaDrawerItem(R.id.guildsOverviewFragment, SIDEBAR_GUILDS, context.getString(R.string.sidebar_guilds)))
             items.add(HabiticaDrawerItem(R.id.challengesOverviewFragment, SIDEBAR_CHALLENGES, context.getString(R.string.sidebar_challenges)))
+            if (configManager.raiseShops()) {
+                items.add(HabiticaDrawerItem(0, SIDEBAR_INVENTORY, context.getString(R.string.sidebar_shops), true))
+                items.add(HabiticaDrawerItem(R.id.marketFragment, SIDEBAR_SHOPS_MARKET, context.getString(R.string.market)))
+                items.add(HabiticaDrawerItem(R.id.questShopFragment, SIDEBAR_SHOPS_QUEST, context.getString(R.string.questShop)))
+                items.add(HabiticaDrawerItem(R.id.seasonalShopFragment, SIDEBAR_SHOPS_SEASONAL, context.getString(R.string.seasonalShop)))
+                items.add(HabiticaDrawerItem(R.id.timeTravelersShopFragment, SIDEBAR_SHOPS_TIMETRAVEL, context.getString(R.string.timeTravelers)))
+            }
             items.add(HabiticaDrawerItem(0, SIDEBAR_INVENTORY, context.getString(R.string.sidebar_section_inventory), true))
-            items.add(HabiticaDrawerItem(R.id.shopsFragment, SIDEBAR_SHOPS, context.getString(R.string.sidebar_shops)))
+            if (!configManager.raiseShops()) {
+                items.add(HabiticaDrawerItem(R.id.shopsFragment, SIDEBAR_SHOPS, context.getString(R.string.sidebar_shops)))
+            }
             items.add(HabiticaDrawerItem(R.id.avatarOverviewFragment, SIDEBAR_AVATAR, context.getString(R.string.sidebar_avatar)))
             items.add(HabiticaDrawerItem(R.id.equipmentOverviewFragment, SIDEBAR_EQUIPMENT, context.getString(R.string.sidebar_equipment)))
             items.add(HabiticaDrawerItem(R.id.itemsFragment, SIDEBAR_ITEMS, context.getString(R.string.sidebar_items)))
@@ -477,6 +486,10 @@ class NavigationDrawerFragment : DialogFragment() {
         const val SIDEBAR_CHALLENGES = "challenges"
         const val SIDEBAR_INVENTORY = "inventory"
         const val SIDEBAR_SHOPS = "shops"
+        const val SIDEBAR_SHOPS_MARKET = "market"
+        const val SIDEBAR_SHOPS_QUEST = "questShop"
+        const val SIDEBAR_SHOPS_SEASONAL = "seasonalShop"
+        const val SIDEBAR_SHOPS_TIMETRAVEL = "timeTravelersShop"
         const val SIDEBAR_AVATAR = "avatar"
         const val SIDEBAR_EQUIPMENT = "equipment"
         const val SIDEBAR_ITEMS = "items"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/MarketFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/MarketFragment.kt
new file mode 100644
index 000000000..9a7d42a13
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/MarketFragment.kt
@@ -0,0 +1,13 @@
+package com.habitrpg.android.habitica.ui.fragments.inventory.shops
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+
+class MarketFragment: ShopsFragment() {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        lockTab = 0
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/QuestShopFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/QuestShopFragment.kt
new file mode 100644
index 000000000..1850f81a1
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/QuestShopFragment.kt
@@ -0,0 +1,13 @@
+package com.habitrpg.android.habitica.ui.fragments.inventory.shops
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+
+class QuestShopFragment: ShopsFragment() {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        lockTab = 1
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/SeasonalShopFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/SeasonalShopFragment.kt
new file mode 100644
index 000000000..695b6a64f
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/SeasonalShopFragment.kt
@@ -0,0 +1,13 @@
+package com.habitrpg.android.habitica.ui.fragments.inventory.shops
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+
+class SeasonalShopFragment: ShopsFragment() {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        lockTab = 2
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.kt
index 51abb2240..8280b1510 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.kt
@@ -4,7 +4,9 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.os.bundleOf
 import androidx.fragment.app.FragmentPagerAdapter
+import com.google.firebase.analytics.FirebaseAnalytics
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
@@ -17,8 +19,10 @@ import io.reactivex.functions.Consumer
 import kotlinx.android.synthetic.main.fragment_viewpager.*
 import javax.inject.Inject
 
-class ShopsFragment : BaseMainFragment() {
 
+open class ShopsFragment : BaseMainFragment() {
+
+    protected var lockTab: Int? = null
     @Inject
     lateinit var inventoryRepository: InventoryRepository
 
@@ -39,13 +43,22 @@ class ShopsFragment : BaseMainFragment() {
         setViewPagerAdapter()
         toolbarAccessoryContainer?.addView(currencyView)
 
-        arguments?.let {
-            val args = ShopsFragmentArgs.fromBundle(it)
-            if (args.selectedTab > 0) {
-                viewPager.currentItem = args.selectedTab
+        if (lockTab == null) {
+            arguments?.let {
+                val args = ShopsFragmentArgs.fromBundle(it)
+                if (args.selectedTab > 0) {
+                    viewPager.currentItem = args.selectedTab
+                }
             }
+        } else {
+            this.usesTabLayout = false
+            tabLayout?.visibility = View.GONE
+            viewPager.currentItem = lockTab ?: 0
+            viewPager.setOnTouchListener { _, _ -> true }
         }
 
+        context?.let { FirebaseAnalytics.getInstance(it).logEvent("open_shop", bundleOf(Pair("shopIndex", lockTab))) }
+
         compositeSubscription.add(userRepository.getUser().subscribe(Consumer { updateCurrencyView(it) }, RxErrorHandler.handleEmptyError()))
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/TimeTravelersShopFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/TimeTravelersShopFragment.kt
new file mode 100644
index 000000000..2bcc6b3a8
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/TimeTravelersShopFragment.kt
@@ -0,0 +1,13 @@
+package com.habitrpg.android.habitica.ui.fragments.inventory.shops
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+
+class TimeTravelersShopFragment: ShopsFragment() {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        lockTab = 3
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+}
\ No newline at end of file

From c68e4ff12a3411a8100e6f40df47a99fb83e261f Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 18 Feb 2020 12:07:47 +0100
Subject: [PATCH 30/62] Small changes to setup process

---
 Habitica/res/layout/fragment_intro.xml        |  2 +-
 .../habitica/ui/activities/SetupActivity.kt   | 16 +++----
 .../ui/fragments/setup/AvatarSetupFragment.kt |  1 +
 .../ui/fragments/setup/IntroFragment.kt       | 44 +++++++------------
 4 files changed, 25 insertions(+), 38 deletions(-)

diff --git a/Habitica/res/layout/fragment_intro.xml b/Habitica/res/layout/fragment_intro.xml
index 0c282f84a..08df6184e 100644
--- a/Habitica/res/layout/fragment_intro.xml
+++ b/Habitica/res/layout/fragment_intro.xml
@@ -40,7 +40,7 @@
         tools:text="@string/intro_2_title"
         android:layout_marginBottom="28dp" />
 
-    <com.facebook.drawee.view.SimpleDraweeView
+    <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/imageView"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
index b5cc6a7af..d5e1e085f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
@@ -23,7 +23,6 @@ import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
@@ -72,8 +71,8 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        compositeSubscription.add(userRepository.getUser().subscribeWithErrorHandler(Consumer { this.onUserReceived(it) }))
-        compositeSubscription.add(userRepository.retrieveUser().subscribeWithErrorHandler(Consumer {}))
+        compositeSubscription.add(userRepository.getUser().subscribe(Consumer { this.onUserReceived(it) }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(userRepository.retrieveUser().subscribe(Consumer {}, RxErrorHandler.handleEmptyError()))
         val additionalData = HashMap<String, Any>()
         additionalData["status"] = "displayed"
         AmplitudeManager.sendEvent("setup", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData)
@@ -202,16 +201,15 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
             additionalData["status"] = "completed"
             AmplitudeManager.sendEvent("setup", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData)
 
-            this.startMainActivity()
+            startMainActivity()
             return
         }
         this.user = user
-        if (this.pager.adapter == null) {
-            this.setupViewpager()
-        } else {
-            this.avatarSetupFragment?.setUser(user)
-            this.taskSetupFragment?.setUser(user)
+        if (pager.adapter == null) {
+            setupViewpager()
         }
+        avatarSetupFragment?.setUser(user)
+        taskSetupFragment?.setUser(user)
     }
 
     private fun startMainActivity() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt
index 75d6d7e43..eceacea2f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt
@@ -146,6 +146,7 @@ class AvatarSetupFragment : BaseFragment() {
         if (this.adapter != null) {
             this.adapter?.user = user
             this.adapter?.notifyDataSetChanged()
+            loadCustomizations()
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/IntroFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/IntroFragment.kt
index 070ecc20c..b29bbd90a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/IntroFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/IntroFragment.kt
@@ -5,24 +5,13 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.TextView
-import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
-import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.databinding.FragmentIntroBinding
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.android.habitica.ui.helpers.bindOptionalView
-import com.habitrpg.android.habitica.ui.helpers.resetViews
 
 class IntroFragment : BaseFragment() {
 
-    private val subtitleTextView: TextView? by bindOptionalView(R.id.subtitleTextView)
-    private val titleTextView: TextView? by bindOptionalView(R.id.titleTextView)
-    private val titleImageView: ImageView? by bindOptionalView(R.id.titleImageView)
-    private val descriptionTextView: TextView? by bindOptionalView(R.id.descriptionTextView)
-    private val imageView: ImageView? by bindOptionalView(R.id.imageView)
-    private val containerView: ViewGroup? by bindOptionalView(R.id.container_view)
-
+    private var binding: FragmentIntroBinding? = null
     private var image: Drawable? = null
     private var titleImage: Drawable? = null
     private var subtitle: String? = null
@@ -32,36 +21,35 @@ class IntroFragment : BaseFragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         super.onCreateView(inflater, container, savedInstanceState)
-        return container?.inflate(R.layout.fragment_intro)
+        binding = FragmentIntroBinding.inflate(layoutInflater, container, false)
+        return binding?.root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        resetViews()
-
         if (this.image != null) {
-            this.imageView?.setImageDrawable(this.image)
+            binding?.imageView?.setImageDrawable(this.image)
         }
 
         if (this.titleImage != null) {
-            this.titleImageView?.setImageDrawable(this.titleImage)
+            binding?.titleImageView?.setImageDrawable(this.titleImage)
         }
 
         if (this.subtitle != null) {
-            this.subtitleTextView?.text = this.subtitle
+            binding?.subtitleTextView?.text = this.subtitle
         }
 
         if (this.title != null) {
-            this.titleTextView?.text = this.title
+            binding?.titleTextView?.text = this.title
         }
 
         if (this.description != null) {
-            this.descriptionTextView?.text = this.description
+            binding?.descriptionTextView?.text = this.description
         }
 
         backgroundColor?.let {
-            this.containerView?.setBackgroundColor(it)
+            binding?.containerView?.setBackgroundColor(it)
         }
     }
 
@@ -72,33 +60,33 @@ class IntroFragment : BaseFragment() {
     fun setImage(image: Drawable?) {
         this.image = image
         if (image != null) {
-            this.imageView?.setImageDrawable(image)
+            binding?.imageView?.setImageDrawable(image)
         }
     }
 
     fun setTitleImage(image: Drawable?) {
         this.titleImage = image
-        this.titleImageView?.setImageDrawable(image)
+        binding?.titleImageView?.setImageDrawable(image)
     }
 
     fun setSubtitle(text: String?) {
         this.subtitle = text
-        subtitleTextView?.text = text
+        binding?.subtitleTextView?.text = text
     }
 
     fun setTitle(text: String?) {
         this.title = text
-        titleTextView?.text = text
+        binding?.titleTextView?.text = text
     }
 
     fun setDescription(text: String?) {
         this.description = text
-        descriptionTextView?.text = text
+        binding?.descriptionTextView?.text = text
     }
 
     fun setBackgroundColor(color: Int) {
         this.backgroundColor = color
-        containerView?.setBackgroundColor(color)
+        binding?.containerView?.setBackgroundColor(color)
     }
 
 }

From a06eefa84eb0283ec09cad266a3a09d05ed09f98 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Fri, 21 Feb 2020 16:47:24 +0100
Subject: [PATCH 31/62] show quest completion modal

---
 .../layout/dialog_completed_quest_content.xml | 65 ++++++++++++
 .../habitica/models/inventory/Quest.kt        |  2 +
 .../habitica/models/inventory/QuestContent.kt |  1 +
 .../habitica/ui/activities/MainActivity.kt    |  8 ++
 .../ui/views/dialogs/QuestCompletedDialog.kt  | 37 +++++++
 .../dialogs/QuestCompletedDialogContent.kt    | 99 +++++++++++++++++++
 .../habitica/utils/UserDeserializer.kt        |  3 +
 7 files changed, 215 insertions(+)
 create mode 100644 Habitica/res/layout/dialog_completed_quest_content.xml
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialog.kt
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialogContent.kt

diff --git a/Habitica/res/layout/dialog_completed_quest_content.xml b/Habitica/res/layout/dialog_completed_quest_content.xml
new file mode 100644
index 000000000..3c2cd58f2
--- /dev/null
+++ b/Habitica/res/layout/dialog_completed_quest_content.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/shopitem_dialog_content_inset"
+    android:paddingRight="@dimen/shopitem_dialog_content_inset"
+    android:gravity="center_horizontal"
+    tools:parentTag="LinearLayout"
+    tools:orientation="vertical">
+    <TextView
+        android:id="@+id/titleTextView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/Headline"
+        tools:text="This is the Title"
+        android:gravity="center"
+        android:layout_marginBottom="4dp"/>
+
+    <TextView
+        android:text="@string/rewards"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="4dp"
+        android:gravity="center_horizontal"
+        />
+    <LinearLayout
+        android:id="@+id/rewardsList"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"/>
+
+    <TextView
+        android:id="@+id/ownerRewardsTitle"
+        android:text="@string/quest_owner_rewards"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="4dp"
+        android:gravity="center_horizontal"
+        />
+    <LinearLayout
+        android:id="@+id/ownerRewardsList"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"/>
+    <com.habitrpg.android.habitica.ui.views.WrapContentDraweeView
+        android:id="@+id/imageView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/spacing_large"
+        android:layout_marginStart="@dimen/spacing_large"
+        android:layout_marginEnd="@dimen/spacing_large"
+        android:layout_marginBottom="@dimen/spacing_large"/>
+    <TextView
+        android:id="@+id/notesTextView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/Body2"
+        android:textColor="@color/black_50_alpha"
+        tools:text="These are the notes"
+        android:gravity="center"/>
+</merge>
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Quest.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Quest.kt
index f4d683f64..7b23534ef 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Quest.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Quest.kt
@@ -28,6 +28,8 @@ open class Quest : RealmObject() {
     var participants: RealmList<Member>? = null
     var rageStrikes: RealmList<QuestRageStrike>? = null
 
+    var completed: String? = null
+
     fun hasRageStrikes(): Boolean {
         return rageStrikes?.isNotEmpty() ?: false
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.kt
index 9f46f58d5..a5d84d7a6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.kt
@@ -16,6 +16,7 @@ open class QuestContent : RealmObject(), Item {
     }
     internal var text: String = ""
     var notes: String = ""
+    var completion: String = ""
     internal var value: Int = 0
     var previous: String? = null
     var lvl: Int = 0
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 91ca338cb..f80f95148 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
@@ -63,6 +63,7 @@ import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.SnackbarDisplayTy
 import com.habitrpg.android.habitica.ui.views.ValueBar
 import com.habitrpg.android.habitica.ui.views.dialogs.AchievementDialog
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.android.habitica.ui.views.dialogs.QuestCompletedDialog
 import com.habitrpg.android.habitica.ui.views.yesterdailies.YesterdailyDialog
 import com.habitrpg.android.habitica.userpicture.BitmapUtils
 import com.habitrpg.android.habitica.widget.AvatarStatsWidgetProvider
@@ -350,6 +351,13 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
                 val intent = Intent(this, VerifyUsernameActivity::class.java)
                 startActivity(intent)
             }
+
+            val quest = user?.party?.quest
+            if (quest?.completed?.isNotBlank() == true) {
+                compositeSubscription.add(inventoryRepository.getQuestContent(user?.party?.quest?.completed ?: "").firstElement().subscribe {
+                    QuestCompletedDialog.showWithQuest(this, it)
+                })
+            }
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialog.kt
new file mode 100644
index 000000000..0352531ff
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialog.kt
@@ -0,0 +1,37 @@
+package com.habitrpg.android.habitica.ui.views.dialogs
+
+import android.content.Context
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.models.inventory.QuestContent
+
+class QuestCompletedDialog(context: Context) : HabiticaAlertDialog(context) {
+
+    var quest: QuestContent? = null
+        set(value) {
+            field = value
+            if (value == null) return
+
+            val contentView = QuestCompletedDialogContent(context)
+            contentView.setQuestContent(value)
+            setAdditionalContentView(contentView)
+        }
+
+    override fun dismiss() {
+        dialog = null
+        super.dismiss()
+    }
+
+    companion object {
+        private var dialog: QuestCompletedDialog? = null
+
+        fun showWithQuest(context: Context, quest: QuestContent) {
+            if (dialog != null) return
+
+            dialog = QuestCompletedDialog(context)
+            dialog?.quest = quest
+            dialog?.setTitle(R.string.quest_completed)
+            dialog?.addButton(R.string.onwards, isPrimary = true, isDestructive = false)
+            dialog?.enqueue()
+        }
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialogContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialogContent.kt
new file mode 100644
index 000000000..137586a8c
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialogContent.kt
@@ -0,0 +1,99 @@
+package com.habitrpg.android.habitica.ui.views.dialogs
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import com.facebook.drawee.view.SimpleDraweeView
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.DialogCompletedQuestContentBinding
+import com.habitrpg.android.habitica.extensions.layoutInflater
+import com.habitrpg.android.habitica.models.inventory.QuestContent
+import com.habitrpg.android.habitica.models.inventory.QuestDropItem
+import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+
+class QuestCompletedDialogContent : LinearLayout {
+
+
+    private lateinit var binding: DialogCompletedQuestContentBinding
+
+    constructor(context: Context) : super(context) {
+        setupView()
+    }
+
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
+        setupView()
+    }
+
+    private fun setupView() {
+        orientation = VERTICAL
+        gravity = Gravity.CENTER
+
+        binding = DialogCompletedQuestContentBinding.inflate(context.layoutInflater, this)
+    }
+
+    fun setQuestContent(questContent: QuestContent) {
+        binding.titleTextView.text = questContent.text
+        binding.notesTextView.text = questContent.completion
+        DataBindingUtils.loadImage(binding.imageView, "quest_" + questContent.key)
+
+        val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as? LayoutInflater
+
+        if (questContent.drop != null && questContent.drop?.items != null) {
+            questContent.drop?.items
+                    ?.filterNot { it.isOnlyOwner }
+                    ?.forEach { addRewardsRow(inflater, it, binding.rewardsList) }
+
+            var hasOwnerRewards = false
+            for (item in questContent.drop?.items ?: emptyList<QuestDropItem>()) {
+                if (item.isOnlyOwner) {
+                    addRewardsRow(inflater, item, binding.ownerRewardsList)
+                    hasOwnerRewards = true
+                }
+            }
+            if (!hasOwnerRewards) {
+                binding.ownerRewardsTitle.visibility = View.GONE
+                binding.ownerRewardsList.visibility = View.GONE
+            }
+
+            if (questContent.drop?.exp ?: 0 > 0) {
+                val view = inflater?.inflate(R.layout.row_quest_reward_imageview, binding.rewardsList, false) as? ViewGroup
+                val imageView = view?.findViewById<ImageView>(R.id.imageView)
+                imageView?.scaleType = ImageView.ScaleType.CENTER
+                imageView?.setImageBitmap(HabiticaIconsHelper.imageOfExperienceReward())
+                val titleTextView = view?.findViewById<TextView>(R.id.titleTextView)
+                titleTextView?.text = context.getString(R.string.experience_reward, questContent.drop?.exp)
+                binding.rewardsList.addView(view)
+            }
+
+            if (questContent.drop?.gp ?: 0 > 0) {
+                val view = inflater?.inflate(R.layout.row_quest_reward_imageview, binding.rewardsList, false) as? ViewGroup
+                val imageView = view?.findViewById<ImageView>(R.id.imageView)
+                imageView?.scaleType = ImageView.ScaleType.CENTER
+                imageView?.setImageBitmap(HabiticaIconsHelper.imageOfGoldReward())
+                val titleTextView = view?.findViewById<TextView>(R.id.titleTextView)
+                titleTextView?.text = context.getString(R.string.gold_reward, questContent.drop?.gp)
+                binding.rewardsList.addView(view)
+            }
+        }
+    }
+
+    private fun addRewardsRow(inflater: LayoutInflater?, item: QuestDropItem, containerView: ViewGroup?) {
+        val view = inflater?.inflate(R.layout.row_quest_reward, containerView, false) as? ViewGroup
+        val imageView = view?.findViewById(R.id.imageView) as? SimpleDraweeView
+        val titleTextView = view?.findViewById(R.id.titleTextView) as? TextView
+        DataBindingUtils.loadImage(imageView, item.imageName)
+        if (item.count > 1) {
+            titleTextView?.text = context.getString(R.string.quest_reward_count, item.text, item.count)
+        } else {
+            titleTextView?.text = item.text
+        }
+        containerView?.addView(view)
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.kt
index 5ff7f7ddd..366fd1f20 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.kt
@@ -62,6 +62,9 @@ class UserDeserializer : JsonDeserializer<User> {
                         user.party?.quest?.RSVPNeeded = quest.RSVPNeeded
                     }
                 }
+                if (obj.getAsJsonObject("party").getAsJsonObject("quest").has("completed")) {
+                    user.party?.quest?.completed = obj.getAsJsonObject("party").getAsJsonObject("quest").get("completed").asString
+                }
             }
         }
         if (obj.has("purchased")) {

From c9f459e1b76bbd96fb8bf005345267da30e695b6 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Fri, 21 Feb 2020 16:56:29 +0100
Subject: [PATCH 32/62] Fix user loading issue

---
 .../android/habitica/utils/UserDeserializer.kt        | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.kt
index 366fd1f20..f91f0e761 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.kt
@@ -52,18 +52,21 @@ class UserDeserializer : JsonDeserializer<User> {
             user.profile = context.deserialize(obj.get("profile"), Profile::class.java)
         }
         if (obj.has("party")) {
-            user.party = context.deserialize(obj.get("party"), UserParty::class.java)
+            val partyObj = obj.getAsJsonObject("party")
+            user.party = context.deserialize(partyObj, UserParty::class.java)
             if (user.party != null && user.party?.quest != null) {
                 user.party?.quest?.id = user.id
-                if (!obj.getAsJsonObject("party").getAsJsonObject("quest").has("RSVPNeeded")) {
+                if (!partyObj.getAsJsonObject("quest").has("RSVPNeeded")) {
                     val realm = Realm.getDefaultInstance()
                     val quest = realm.where(Quest::class.java).equalTo("id", user.id).findFirst()
                     if (quest != null && quest.isValid) {
                         user.party?.quest?.RSVPNeeded = quest.RSVPNeeded
                     }
                 }
-                if (obj.getAsJsonObject("party").getAsJsonObject("quest").has("completed")) {
-                    user.party?.quest?.completed = obj.getAsJsonObject("party").getAsJsonObject("quest").get("completed").asString
+                if (partyObj.getAsJsonObject("quest").has("completed")) {
+                    if (!partyObj.getAsJsonObject("quest").get("completed").isJsonNull) {
+                        user.party?.quest?.completed = obj.getAsJsonObject("party").getAsJsonObject("quest").get("completed").asString
+                    }
                 }
             }
         }

From 826873e4b89bcf262db600f32225a77baf0c9e80 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Fri, 21 Feb 2020 16:56:44 +0100
Subject: [PATCH 33/62] Fix issue with quest completion dialog

---
 Habitica/build.gradle                                         | 2 +-
 Habitica/res/values/strings.xml                               | 3 ++-
 .../habitica/data/implementation/UserRepositoryImpl.kt        | 4 ++++
 .../com/habitrpg/android/habitica/models/shops/ShopItem.kt    | 4 ++--
 .../habitrpg/android/habitica/ui/activities/MainActivity.kt   | 3 ++-
 build.gradle                                                  | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index cc1439f1a..45fd60a5a 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -153,7 +153,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 2375
+        versionCode 2380
         versionName "2.5"
     }
 
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 64e1fb01f..ef23c6bcb 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -339,7 +339,7 @@
     <string name="login_incentive_count">Unlock by checking into Habitica %d times.</string>
     <string name="create_account">Unlock by creating an account</string>
     <string name="party_invite_short">Invite Friends</string>
-    <string name="login_incentive_short">login into Habitica regularly</string>
+    <string name="login_incentive_short">log into Habitica regularly</string>
     <string name="login_incentive_short_count">%d Checkins</string>
     <string name="create_account_short">create an account</string>
     <string name="successful_purchase">Purchased %1$s</string>
@@ -953,4 +953,5 @@
     <string name="unlock_previous_short">Finish Quest %d</string>
     <string name="unlock_level_short">Level %d</string>
     <string name="not_participating">You are not participating</string>
+    <string name="quest_completed">Quest completed!</string>
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
index a453b1aae..75ffbd7d7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
@@ -352,6 +352,10 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
         if (newUser.profile != null) {
             copiedUser.profile = newUser.profile
         }
+        if (newUser.party != null) {
+            copiedUser.party = newUser.party
+        }
+        copiedUser.needsCron = newUser.needsCron
         copiedUser.versionNumber = newUser.versionNumber
 
         localRepository.saveUser(copiedUser)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
index f49f83bc0..ffb204910 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
@@ -90,7 +90,7 @@ open class ShopItem : RealmObject() {
     fun shortLockedReason(context: Context): String? {
         return when {
             unlockCondition != null -> {
-                unlockCondition?.readableUnlockCondition(context)
+                unlockCondition?.shortReadableUnlockCondition(context)
             }
             previous != null -> {
                 try {
@@ -110,7 +110,7 @@ open class ShopItem : RealmObject() {
     fun lockedReason(context: Context): String? {
         return when {
             unlockCondition != null -> {
-                unlockCondition?.shortReadableUnlockCondition(context)
+                unlockCondition?.readableUnlockCondition(context)
             }
             previous != null -> {
                 try {
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 f80f95148..396cf53d3 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
@@ -35,7 +35,6 @@ import com.habitrpg.android.habitica.data.*
 import com.habitrpg.android.habitica.databinding.ActivityMainBinding
 import com.habitrpg.android.habitica.events.*
 import com.habitrpg.android.habitica.events.commands.FeedCommand
-import com.habitrpg.android.habitica.extensions.DateUtils
 import com.habitrpg.android.habitica.extensions.dpToPx
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.helpers.*
@@ -356,6 +355,8 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
             if (quest?.completed?.isNotBlank() == true) {
                 compositeSubscription.add(inventoryRepository.getQuestContent(user?.party?.quest?.completed ?: "").firstElement().subscribe {
                     QuestCompletedDialog.showWithQuest(this, it)
+
+                    userRepository.updateUser(user, "party.quest.completed", "").subscribe(Consumer {}, RxErrorHandler.handleEmptyError())
                 })
             }
         }
diff --git a/build.gradle b/build.gradle
index 7e30c061f..3c189c5d7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0-rc01'
+        classpath 'com.android.tools.build:gradle:3.6.0-rc03'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.google.gms:google-services:4.3.3'
         classpath "io.realm:realm-gradle-plugin:6.0.2"

From 275b5bb46fa0ae72e68f3f89e25267507c72d704 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Fri, 21 Feb 2020 17:05:35 +0100
Subject: [PATCH 34/62] Fix showing locked shop items

---
 .../android/habitica/ui/viewHolders/ShopItemViewHolder.kt   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
index 9d506c6fb..3484348c4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ShopItemViewHolder.kt
@@ -68,7 +68,7 @@ class ShopItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), Vi
         itemDetailIndicator.visibility = View.GONE
 
         val lockedReason = item.shortLockedReason(context)
-        if (!item.locked) {
+        if (!item.locked || lockedReason == null) {
             priceLabel.text = item.value.toString()
             priceLabel.currency = item.currency
             if (item.currency == null) {
@@ -76,6 +76,10 @@ class ShopItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), Vi
             }
             priceLabel.visibility = View.VISIBLE
             unlockLabel.visibility = View.GONE
+            if (item.locked) {
+                itemDetailIndicator.background = lockedDrawable
+                itemDetailIndicator.visibility = View.VISIBLE
+            }
         } else {
             unlockLabel.text = lockedReason
             priceLabel.visibility = View.GONE

From 9cae4bea037f60d756f0c21b08428d26dadaeeab Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 25 Feb 2020 10:50:04 +0100
Subject: [PATCH 35/62] new update

---
 Habitica/build.gradle                                       | 6 +++---
 .../habitrpg/android/habitica/ui/fragments/AboutFragment.kt | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 45fd60a5a..41ebc3323 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -117,7 +117,7 @@ dependencies {
     //Push Notifications
     implementation 'com.google.firebase:firebase-core:17.2.2'
     implementation 'com.google.firebase:firebase-messaging:20.1.0'
-    implementation 'com.google.firebase:firebase-config:19.1.0'
+    implementation 'com.google.firebase:firebase-config:19.1.1'
     implementation 'com.google.firebase:firebase-perf:19.0.5'
     implementation 'com.google.android.gms:play-services-auth:17.0.0'
     implementation 'io.realm:android-adapters:3.1.0'
@@ -125,7 +125,7 @@ dependencies {
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'com.nex3z:flow-layout:1.2.2'
 
-    implementation 'androidx.core:core-ktx:1.1.0'
+    implementation 'androidx.core:core-ktx:1.2.0'
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
     implementation "androidx.lifecycle:lifecycle-common-java8:2.2.0"
     implementation 'androidx.navigation:navigation-fragment-ktx:2.2.1'
@@ -153,7 +153,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 2380
+        versionCode 2384
         versionName "2.5"
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.kt
index 1e6f540b8..339e4cff8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.kt
@@ -159,13 +159,15 @@ class AboutFragment : BaseMainFragment() {
 
         bodyOfEmail += " \nDetails:\n"
 
-        ShareCompat.IntentBuilder.from(activity)
+        activity?.let {
+            ShareCompat.IntentBuilder.from(it)
                 .setType("message/rfc822")
                 .addEmailTo(appConfigManager.supportEmail())
                 .setSubject(subject)
                 .setText(bodyOfEmail)
                 .setChooserTitle("Send email...")
                 .startChooser()
+        }
     }
 
     private fun doTheThing() {

From 217f403a3ea2512fda4d1b344b691f30cd7f0e0c Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 4 Mar 2020 17:06:51 +0100
Subject: [PATCH 36/62] Remove unused tranlation files

---
 Habitica/res/values-id/strings.profile.xml |   2 -
 Habitica/res/values-id/strings.xml         | 696 ---------------------
 2 files changed, 698 deletions(-)
 delete mode 100644 Habitica/res/values-id/strings.profile.xml
 delete mode 100755 Habitica/res/values-id/strings.xml

diff --git a/Habitica/res/values-id/strings.profile.xml b/Habitica/res/values-id/strings.profile.xml
deleted file mode 100644
index a6b3daec9..000000000
--- a/Habitica/res/values-id/strings.profile.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
diff --git a/Habitica/res/values-id/strings.xml b/Habitica/res/values-id/strings.xml
deleted file mode 100755
index 0e66974a6..000000000
--- a/Habitica/res/values-id/strings.xml
+++ /dev/null
@@ -1,696 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <string name="action_refresh">Muat Ulang</string>
-  <string name="XP_default">Pengalaman </string>
-  <string name="HP_default">Nyawa</string>
-  <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Pengaturan tidak dapat dimuat dari barkode</string>
-  <!--Prefs-->
-  <string name="PS_settings_title">Pengaturan</string>
-  <string name="SP_address_hint">Server kustom anda</string>
-  <string name="SP_userID_title">ID Pengguna</string>
-  <string name="SP_userID_summary">ID Penggunamu</string>
-  <string name="SP_APIToken_title">Token API</string>
-  <string name="SP_APIToken_summary">Token API-mu</string>
-  <string name="Language_title">Bahasa</string>
-  <string name="Language_summary">Ganti bahasa dalam Habitica</string>
-  <string name="SP_user_qr_code">Kode QR-mu</string>
-  <string name="PS_contact_title">Kontak saya</string>
-  <string name="unknown_error">Terjadi kesalahan...</string>
-  <string name="pref_account_header">Akun</string>
-  <string name="pref_first_day_of_the_week_title">Hari Pertama dalam Minggu</string>
-  <string name="pref_first_day_of_the_week_summary">Hari pertama dalam minggu di semua kalender</string>
-  <string name="pref_reminder_header">Pengingat Harian</string>
-  <string name="pref_reminder_checkbox">Aktifkan Pengingat</string>
-  <string name="pref_reminder_picker">Atur Waktu Pengingat</string>
-  <string name="pref_cds_header">Awal Hari</string>
-  <string name="pref_cds_picker">Atur Awal Hari</string>
-  <string name="pref_push_notifications_checkbox">Notifikasi Pengguna</string>
-  <string name="push_notifications">Notifikasi</string>
-  <string name="push_notifications_sum">Pengaturan notifikasi</string>
-  <string name="preference_push_you_won_challenge">Kamu memenangkan sebuah Tantangan!</string>
-  <string name="preference_push_received_a_private_message">Menerima sebuah Pesan Pribadi</string>
-  <string name="preference_push_gifted_gems">Mendapat Hadiah Permata</string>
-  <string name="preference_push_gifted_subscription">Mendapat Hadiah Langganan</string>
-  <string name="preference_push_invited_to_party">Diundang ke Party</string>
-  <string name="preference_push_invited_to_guild">Diundang ke Guild</string>
-  <string name="preference_push_your_quest_has_begun">Misimu telah Dimulai</string>
-  <string name="preference_push_invited_to_quest">Diundang ke dalam Misi</string>
-  <!--Adding tasks-->
-  <string name="task_value">Nilai</string>
-  <string name="new_todo">To-Do baru</string>
-  <string name="new_reward">Hadiah baru</string>
-  <string name="new_daily">Keseharian baru</string>
-  <string name="new_habit">Kebiasaan baru</string>
-  <string name="action_edit">Edit</string>
-  <string name="action_delete">Hapus</string>
-  <string name="action_cancel">Batal</string>
-  <string name="login_btn">Masuk</string>
-  <string name="register_btn">Daftar</string>
-  <string name="username">Nama Pengguna</string>
-  <string name="email_username">Email atau Nama Pengguna</string>
-  <string name="password">Kata Sandi</string>
-  <string name="emailAddress">Alamat Email</string>
-  <string name="confirmpassword">Konfirmasi kata sandi</string>
-  <string name="logout">Keluar</string>
-  <string name="logout_description">Keluar dari akunmu</string>
-  <string name="account_details">Detail Akun</string>
-  <string name="LoginActivityName">Selamat Datang</string>
-  <string name="string_revive">Pulihkan</string>
-  <string name="please_connect">Silakan hubungkan melalui aplikasi sebelum menggunakan widget</string>
-  <string name="about.title">Tentang Kami</string>
-  <string name="about.libraries">Pustaka</string>
-  <string name="about.versionhistory">Riwayat Versi</string>
-  <string name="about.habitica_open_source">Habitica tersedia sebagai perangkat lunak open source pada Github</string>
-  <string name="about.rate_our_app">Nilai Aplikasi kami</string>
-  <string name="about.give_us_feedback">Kirimkan kami Feedback!</string>
-  <string name="about.bugreport">Laporkan Gangguan</string>
-  <string name="about.source_code">Kode</string>
-  <string name="repeatEvery">Ulangi Setiap</string>
-  <!--Network Errors-->
-  <string name="network_error_title">Koneksi Gagal</string>
-  <string name="network_error_no_network_body">Kamu tidak terhubung ke internet.</string>
-  <string name="internal_error_api">Terdapat masalah pada server. Cobalah beberapa saat lagi.</string>
-  <string name="authentication_error_title">Autentikasi Gagal</string>
-  <string name="authentication_error_body">Nama Pengguna dan/atau Kata Sandi salah.</string>
-  <string name="login_validation_error_title">Validasi Gagal</string>
-  <string name="login_validation_error_fieldsmissing">Kamu harus mengisi semua kolom.</string>
-  <string name="save_changes">Simpan</string>
-  <string name="copy">Salin</string>
-  <string name="notes">Catatan</string>
-  <string name="text">Teks</string>
-  <string name="difficulty">Tingkat Kesulitan</string>
-  <string name="tags">Label</string>
-  <string name="trivial">Trivial</string>
-  <string name="easy">Mudah</string>
-  <string name="medium">Sedang</string>
-  <string name="hard">Susah</string>
-  <string name="start_date">Tanggal Mulai</string>
-  <string name="positive_habit_form">Positif (+)</string>
-  <string name="negative_habit_form">Negatif (-)</string>
-  <string name="checklist">Daftar Cek</string>
-  <string name="reminders">Pengingat</string>
-  <string name="actions">Aksi</string>
-  <string name="attributes">Atribut</string>
-  <string name="physical">Kekuatan</string>
-  <string name="mental">Kecerdasan</string>
-  <string name="social">Ketahanan</string>
-  <string name="other">Persepsi</string>
-  <string name="frequency">Frekuensi</string>
-  <string name="frequency_weekly">Pada Hari Tertentu dalam Seminggu</string>
-  <string name="frequency_daily">Setiap X Hari</string>
-  <string name="repeatables_summary_title">Ringkasan</string>
-  <string name="repeatables_title">Ulangi</string>
-  <string name="repeatables_on_title">Ulangi pada</string>
-  <string name="repeatables_frequency_daily">Harian</string>
-  <string name="repeatables_frequency_weekly">Mingguan</string>
-  <string name="repeatables_frequency_monthly">Bulanan</string>
-  <string name="repeatables_frequency_yearly">Tahunan</string>
-  <string name="repeatables_frequency_day_of_month">Hari pada Bulan</string>
-  <string name="repeatables_frequency_day_of_week">Hari pada Minggu</string>
-  <string name="monday">Senin</string>
-  <string name="tuesday">Selasa</string>
-  <string name="wednesday">Rabu</string>
-  <string name="thursday">Kamis</string>
-  <string name="friday">Jumat</string>
-  <string name="saturday">Sabtu</string>
-  <string name="sunday">Minggu</string>
-  <string name="levelup_button">Hore!</string>
-  <string name="faint_subtitle">Jangan bersedih!</string>
-  <string name="faint_header">Kamu kehabisan Nyawa!</string>
-  <string name="faint_button">Isi ulang Nyawa &amp; Ulang Lagi</string>
-  <string name="filter">Filter</string>
-  <string name="profile_image">Gambar Profil</string>
-  <string name="mana_price_button">%d MP</string>
-  <string name="used_skill">Kamu menggunakan %1$s dengan %2$d mana.</string>
-  <string name="used_skill_without_mana">Kamu menggunakan %1$s</string>
-  <string name="new_checklist_item">item cek baru</string>
-  <string name="add_checklist_item">Tambahkan</string>
-  <string name="skill_progress_title">Gunakan Kemampuan</string>
-  <string name="coming_soon">Akan Datang</string>
-  <string name="chat_flag_confirmation">Apakah kamu yakin kamu ingin melaporkan pesan ini sebagai pelanggaran?</string>
-  <string name="flag_confirm">Laporkan Pesan</string>
-  <string name="unlock_lvl_11">Buka pada lvl 11</string>
-  <string name="no_party_message">Kamu tidak memiliki party. Untuk bergabung dengan party, silakan kunjungi situs.</string>
-  <string name="forgot_pw_btn">Lupa Kata Sandi</string>
-  <string name="tavern.inn.checkOut">Aktifkan kembali Keseharianmu</string>
-  <string name="tavern.inn.rest">Nonaktifkan Keseharianmu</string>
-  <string name="reward.dialog.buy">Beli</string>
-  <string name="reward.dialog.dismiss">Tutup</string>
-  <string name="party">Party</string>
-  <string name="chat">Obrolan</string>
-  <string name="members">Anggota</string>
-  <string name="habits">Kebiasaan</string>
-  <string name="dailies">Keseharian</string>
-  <string name="todos">To-Do</string>
-  <string name="rewards">Hadiah</string>
-  <string name="taskform.delete.title">Apakah kamu yakin?</string>
-  <string name="taskform.delete.message">Apakah kamu benar-benar ingin menghapusnya?</string>
-  <string name="yes">Ya</string>
-  <string name="no">Tidak</string>
-  <string name="quest">Misi</string>
-  <string name="avatar_body">Tubuh</string>
-  <string name="avatar_hair">Rambut</string>
-  <string name="avatar_shirt">Baju</string>
-  <string name="avatar_skin">Kulit</string>
-  <string name="avatar_ears">Telinga Hewan</string>
-  <string name="avatar_base">Biasa</string>
-  <string name="avatar_color">Warna</string>
-  <string name="avatar_beard">Janggut</string>
-  <string name="avatar_mustache">Kumis</string>
-  <string name="avatar_flower">Bunga</string>
-  <string name="avatar_bangs">Poni</string>
-  <string name="avatar_nothing">Tidak ada yang digunakan</string>
-  <string name="avatar_size">Ukuran</string>
-  <string name="avatar_size_slim">Kurus</string>
-  <string name="avatar_size_broad">Bidang</string>
-  <string name="avatar_background">Latar Belakang</string>
-  <string name="purchase_customization">Beli Item</string>
-  <string name="purchase_set_button">Buka set seharga %d permata</string>
-  <string name="purchase_button">Beli</string>
-  <string name="purchase_set_title">Beli set %s</string>
-  <string name="due_date">Tenggat Waktu</string>
-  <string name="quest.accept">Terima</string>
-  <string name="quest.reject">Tolak</string>
-  <string name="quest.begin">Mulai Misi</string>
-  <string name="quest.cancel">Batalkan Undangan</string>
-  <string name="quest.abort">Batalkan Misi</string>
-  <string name="quest.leave">Tinggalkan Misi</string>
-  <string name="quest.pending">Menunggu</string>
-  <string name="quest.accepted">Diterima</string>
-  <string name="quest.rejected">Ditolak</string>
-  <string name="quest.participants">Partisipan</string>
-  <string name="version_info">Versi %1$s (%2$d)</string>
-  <string name="sidebar_help">Bantuan &amp; FAQ</string>
-  <string name="complete_tutorial">Aku mengerti!</string>
-  <string name="dismiss_tutorial">Ingatkan aku lagi</string>
-  <string name="intro_1_subtitle">Selamat datang di</string>
-  <string name="intro_1_title">Habitica</string>
-  <string name="intro_1_description">Ini saatnya untuk bersenang-senang sambil benar-benar menyelesaikan urusan-urusanmu. Bergabunglah dengan lebih dari %s orang yang memperbaiki aspek hidup mereka satu demi satu.</string>
-  <string name="intro_2_subtitle">Berkembang di dalam game</string>
-  <string name="intro_2_title">Berkembang di kehidupan nyata</string>
-  <string name="intro_2_description">Buka fitur dalam game dengan mengerjakan tugasmu di dunia nyata. Dapatkan baju, peliharaan, dan banyak lagi sebagai hadiahmu mencapai tujuan!</string>
-  <string name="intro_3_subtitle">Bertarung dengan monster</string>
-  <string name="intro_3_title">Menjadi lebih sosial</string>
-  <string name="intro_3_description">Tetaplah berusaha meraih tujuan dengan bantuan teman-teman. Dukung satu sama lain dalam hidup dan bertarunglah sekaligus meningkatkan kehidupan bersama-sama!</string>
-  <string name="intro_finish_button">Mari mulai!</string>
-  <string name="previous_button">Sebelumnya</string>
-  <string name="next_button">Berikutnya</string>
-  <string name="skip_button">Lewati</string>
-  <string name="setup_welcome_description">Selamat datang di Habitica, di mana meningkatkan diri dalam permainan akan meningkatkan kehidupan nyata! Seiring kamu menyelesaikan tujuan dunia-nyata, kamu akan membuka perlengkapan, peliharaan, misi, dan banyak lagi.</string>
-  <string name="setup_welcome_title">Selamat Datang</string>
-  <string name="avatar_setup_description">Jadi, kamu mau terlihat seperti apa? Jangan khawatir, kamu bisa mengubahnya lagi nanti.</string>
-  <string name="task_setup_description">Bagus! Sekarang, apa yang menurutmu menarik untuk kamu kembangkan dalam pengembaraan ini?</string>
-  <string name="setup_group_work">Pekerjaan</string>
-  <string name="setup_group_exercise">Olahraga</string>
-  <string name="setup_group_health">Kesehatan</string>
-  <string name="setup_group_school">Sekolah</string>
-  <string name="setup_group_teams">Tim</string>
-  <string name="setup_group_chores">Pekerjaan Rumah Tangga</string>
-  <string name="setup_group_creativity">Kreativitas</string>
-  <string name="setup_task_work_1">Proses Email</string>
-  <string name="setup_task_work_2">Tugas paling penting</string>
-  <string name="setup_task_work_3">Proyek Kerja</string>
-  <string name="setup_task_exercise_1">10 menit cardio</string>
-  <string name="setup_task_exercise_2">Stretching</string>
-  <string name="setup_task_exercise_3">Atur jadwal olahraga</string>
-  <string name="setup_task_healthWellness_1">Makan makanan bergizi / cepat saji</string>
-  <string name="setup_task_healthWellness_2">Gunakan Benang Gigi</string>
-  <string name="setup_task_healthWellness_3">Periksa Jadwal</string>
-  <string name="setup_task_school_1">Belajar/Bermalas-malasan</string>
-  <string name="setup_task_school_2">Mengerjakan PR</string>
-  <string name="setup_task_school_3">Selesaikan tugas</string>
-  <string name="setup_task_teams_1">Periksa tim</string>
-  <string name="setup_task_teams_2">Kabari tim mengenai status terbaru</string>
-  <string name="setup_task_teams_3">Selesaikan proyek tim</string>
-  <string name="setup_task_chores_1">10 menit bersih-bersih</string>
-  <string name="setup_task_chores_2">Cuci Piring</string>
-  <string name="setup_task_chores_3">Rapikan lemari</string>
-  <string name="setup_task_creativity_1">Belajar menguasai kerajinan tangan</string>
-  <string name="setup_task_creativity_2">Mengerjakan proyek kreatif</string>
-  <string name="setup_task_creativity_3">Menyelesaikan proyek kreatif</string>
-  <string name="gem.purchase.support">Ingin membantu kami menjaga Habitica tetap berjalan? Kamu dapat mendukung pengembang dengan membeli permata!\n\nDengan permata kamu dapat membeli hal-hal menarik untuk akunmu, termasuk: \n\n - Kostum keren untuk avatarmu\n - Latar belakang keren\n - Misi menarik yang memberimu hadiah telur peliharaan unik\n - Kemampuan untuk mengganti pekerjaan sebelum level 100\n\nTerima kasih banyak untuk bantuan kepada Habitca untuk menjadi yang terbaik. Dukunganmu sangat berarti bagi kami!</string>
-  <string name="my_guilds">Guild-ku</string>
-  <string name="public_guilds">Guild Publik</string>
-  <string name="guild">Guild</string>
-  <string name="leave">Tinggalkan</string>
-  <string name="join">Gabung</string>
-  <string name="leader">Ketua</string>
-  <string name="gems">Permata</string>
-  <string name="copy_as_todo">Salin sebagai To-Do</string>
-  <string name="send_pm">Kirim PM</string>
-  <string name="flag">Laporkan</string>
-  <string name="delete">Hapus</string>
-  <string name="name">Nama </string>
-  <string name="description">Deskripsi</string>
-  <string name="add_tag">Tambahkan Label baru</string>
-  <string name="privacy">Privasi</string>
-  <string name="write_message">Tulis Pesan</string>
-  <string name="post">Kirim</string>
-  <string name="guild_search_hint">Cari guild</string>
-  <string name="todo_due">Tenggat: %s</string>
-  <string name="daily_streak">jumlah runtunan: %d</string>
-  <string name="todo_has_duedate">Tugas memiliki Tenggat Waktu</string>
-  <string name="battle_gear">Perlengkapan Bertarung</string>
-  <string name="costume">Kostum</string>
-  <string name="outfit_head">Kepala</string>
-  <string name="outfit_headAccessory">Aksesori Kepala</string>
-  <string name="outfit_eyewear">Aksesori Mata</string>
-  <string name="outfit_armor">Baju Perang</string>
-  <string name="outfit_back">Punggung</string>
-  <string name="outfit_body">Tubuh</string>
-  <string name="outfit_shield">Perisai</string>
-  <string name="outfit_weapon">Senjata</string>
-  <string name="wear_costume">Gunakan Kostum</string>
-  <string name="equipped">Digunakan</string>
-  <string name="quest_cancel_message">Apakah kamu yakin kamu ingin membatalkan misi ini? Semua undangan yang disetujui akan hilang. Pemilik misi akan mendapatkan gulungan misi kembali.</string>
-  <string name="quest.invitation">Undangan Misi</string>
-  <string name="quest_begin_message">Apakah kamu yakin? Hanya %1$d dari %2$d anggota Party-mu yang sudah ikut misi ini! Misi dimulai secara otomatis ketika semua pemain telah ikut atau menolak undangannya.</string>
-  <string name="quest.invitation.text">Kamu telah diundang untuk berpartisipasi dalam misi!</string>
-  <string name="today">Hari Ini</string>
-  <string name="sidebar_items">Item</string>
-  <string name="eggs">Telur</string>
-  <string name="hatching_potions">Ramuan Penetas</string>
-  <string name="food">Makanan</string>
-  <string name="quests">Misi</string>
-  <string name="pets">Peliharaan</string>
-  <string name="mounts">Tunggangan</string>
-  <string name="armoireEquipment">Kamu menemukan Perlengkapan langka di dalam Peti Harta Karun: %s! Keren!</string>
-  <string name="armoireFood">Kamu mengacak-acak Peti Harta Karun dan menemukan %2$s %1$s. Kenapa berada di dalam sini, ya?</string>
-  <string name="armoireExp">Kamu bergulat dengan Peti Harta Karun dan mendapatkan Pengalaman. Rasakan itu!</string>
-  <string name="armoireNotesFull">Buka Peti Harta Karun untuk mendapatkan Perlengkapan spesial, Pengalaman, atau makanan secara acak! Perlengkapan yang tersisa: %d</string>
-  <string name="armoireLastItem">Kamu menemukan Perlengkapan terakhir di dalam Peti Harta Karun.</string>
-  <string name="armoireNotesEmpty">Peti Harta Karun akan memiliki Perlengkapan baru pada minggu pertama setiap bulan. Sementara itu, tetaplah klik untuk mendapatkan Pengalaman dan Makanan!</string>
-  <string name="sell">Jual (%d Emas)</string>
-  <string name="hatch_with_potion">Tetaskan dengan ramuan</string>
-  <string name="feed_to_pet">Beri makan peliharaan</string>
-  <string name="hatch_egg">Tetaskan dengan telur</string>
-  <string name="invite_party">Undang party</string>
-  <string name="dialog_feeding">Beri makan %s dengan:</string>
-  <string name="use_animal">Gunakan</string>
-  <string name="feed">Beri makan</string>
-  <string name="hatch_with">Tetaskan dengan %s</string>
-  <string name="hatched_pet_title">Kamu menetaskan seekor %2$s %1$s!</string>
-  <string name="close">Tutup</string>
-  <string name="share">Bagikan</string>
-  <string name="notification_pet_fed">Kamu memberi makan %s!</string>
-  <string name="notification_purchase_reward">Kamu membeli sebuah hadiah</string>
-  <string name="world_quest">Misi Dunia</string>
-  <string name="inn_description">Perlu istirahat? Masuk ke dalam Penginapan Daniel untuk sementara menghentikan mekanika game Habitica yang lebih susah:\n\n
-• Keseharian yang terlewat tidak akan menyakitimu\n
-• Tugas tidak akan putus runtunannya atau berkurang warnanya\n
-• Boss tidak akan menyerangmu untuk Keseharian yang terlewat\n
-• Damage-mu kepada Boss atau item misi mengumpulkanmu akan tetap menunggu hingga kamu keluar</string>
-  <string name="empty_items">Kamu tidak memiliki %s</string>
-  <string name="user_level">Lvl %d</string>
-  <string name="user_level_with_class">Lvl %1$d %2$s</string>
-  <string name="warrior">Warrior</string>
-  <string name="rogue">Rogue</string>
-  <string name="mage">Mage</string>
-  <string name="healer">Healer</string>
-  <string name="mage_description">Penyihir belajar dengan cepat, mendapatkan Pengalaman dan Level lebih cepat daripada kelas lainnya. Mereka juga mendapatkan Mana yang besar dengan menggunakan kemampuan spesial. Mainkan penyihir jika kamu menyukai aspek taktis dari permainan Kebiasaan, atau jika kamu begitu termotivasi dengan meningkatkan level dan membuka fitur baru!</string>
-  <string name="rogue_description">Perampok senang mengumpulkan kekayaan, mendapatkan banyak Emas daripada yang lainnya, dan mahir menemukan item acak. Kemampuan Bersembunyi mereka yang terkenal membuat mereka mampu menghindari konsekuensi dari Keseharian yang terlewat. Mainkan Perampok jika kamu termotivasi dengan Hadiah dan Pencapaian, juga mendapatkan banyak barang jarahan dan lencana!</string>
-  <string name="healer_description">Penyembuh tahan terhadap serangan, dan dapat membagi perlindungannya pada sesama. Keseharian yang terlewat dan kebiasaan buruk tidak terlalu banyak mengganggu mereka, dan mereka memiliki cara untuk mengembalikan nyawa dari kesalahan mereka. Mainkan seorang Penyembuh jika kamu senang membantu teman dalam kelompok, atau ide mencurangi kematian dengan kerja keras membuatmu terinspirasi!</string>
-  <string name="select_class">Pilih Profesi</string>
-  <string name="opt_out_class">Matikan Fitur</string>
-  <string name="opt_out_description">Tidak ingin diganggu dengan profesi? Ingin memilih nanti saja? Matikan fitur - kamu akan menjadi seorang Prajurit tanpa kemampuan spesial. Kamu dapat membaca mengenai sistem profesi nanti di wiki dan mengaktifkan fitur profesi kapan saja.</string>
-  <string name="class_confirmation">Apakah kamu yakin ingin menjadi seorang %s?</string>
-  <string name="class_changed">Kamu sekarang seorang %s! </string>
-  <string name="class_changed_description">Kamu memiliki Baju Perang baru yang dapat diganti pada menu Perlengkapan! </string>
-  <string name="choose_class">Pilih Kelas</string>
-  <string name="dialog_go_back">Kembali</string>
-  <string name="opt_out_confirmation">Apakah kamu yakin kamu ingin mematikan fitur?</string>
-  <string name="change_class">Ganti profesi</string>
-  <string name="change_class_description">Ubah kelasmu dan terima kembali poin atribut seharga 3 Permata.</string>
-  <string name="enable_class">Aktifkan Sistem Profesi</string>
-  <string name="changing_class_progress">Ganti Profesi</string>
-  <string name="by_email">Melalui Email</string>
-  <string name="invite_existing_users">Undang Pengguna yang telah ada</string>
-  <string name="send">Kirim</string>
-  <string name="invite">Undang Teman</string>
-  <string name="invite_id_description">Jika kamu memiliki teman yang telah menggunakan Habitica, undang melalui ID Pengguna di sini.</string>
-  <string name="invite_email_description">Jika seorang teman bergabung dengan Habitica melalui emailmu, mereka otomatis akan diundang ke dalam kelompokmu!</string>
-  <string name="add_invites">Tambahkan Undangan</string>
-  <string name="user_id">ID Pengguna</string>
-  <string name="email">Email</string>
-  <string name="invite_users">Undang sebagai Teman</string>
-  <string name="share_using">Bagikan dengan</string>
-  <string name="share_levelup">Aku mencapai level %d di Habitica dengan memperbaiki kebiasaanku di kehidupan nyata!</string>
-  <string name="share_hatched">Saya menetaskan peliharaan seekor %2$s %1$s di Habitica dengan menyelesaikan tugas kehidupan-nyata saya! </string>
-  <string name="share_raised">Saya baru mendapatkan tunggangan seekor %s di Habitica dengan menyelesaikan tugas kehidupan-nyata saya!</string>
-  <string name="open_in_store">Buka di Play Store</string>
-  <string name="change_class_confirmation">Apa kamu yakin untuk mengubah kelas? Ini akan membutuhkan 3 permata.</string>
-  <string name="change_class_equipment_warning">Peringatan: Kamu tidak akan dapat membeli perlengkapan untuk profesi %s. </string>
-  <string name="leaderMessage">Pesan dari %1$s</string>
-  <string name="leaderName">Ketua: %1$s</string>
-  <string name="confirm">Pastikan</string>
-  <string name="market">Pasar</string>
-  <string name="timeTravelers">Penjelajah Waktu</string>
-  <string name="seasonalShop">Toko Musiman</string>
-  <string name="empty_inbox">Kamu tidak punya pesan apapun. Kamu bisa mengirim pesan baru ke pengguna lain dari obrolan publik mereka!</string>
-  <string name="party_invite">Buka dengan mengundang teman</string>
-  <string name="login_incentive">Buka dengan cara login ke Habitica secara teratur</string>
-  <string name="create_account">Buka dengan membuat sebuah akun</string>
-  <string name="no_gold">Koin Emas tidak cukup</string>
-  <string name="no_potion">Kamu tidak perlu membeli ramuan kesehatan</string>
-  <string name="successful_purchase">%1$s telah dibeli</string>
-  <string name="purchase_confirmation_title">Pastikan belian</string>
-  <string name="confirm_purchase_text">Membeli %1$s untuk %2$s %3$s</string>
-  <string name="gem">Permata</string>
-  <string name="hourglass">Jam Pasir</string>
-  <string name="hourglasses">Jam-jam Pasir</string>
-  <string name="gold_singular">Koin Emas</string>
-  <string name="gold_plural">Koin Emas</string>
-  <string name="chat_message_copied">Pesan telah tersalin di Papan pencatat</string>
-  <string name="copy_chat_message">Salin di Papan pencatat</string>
-  <string name="edit_tag_title">Rubah Label</string>
-  <string name="edit_tag_btn_edit">Rubah</string>
-  <string name="edit_tag_btn_done">Selesai</string>
-  <string name="edit_tag_btn_delete">Hapus</string>
-  <string name="confirm_delete_tag_title">Kamu yakin?</string>
-  <string name="confirm_delete_tag_message">Apa kamu yakin ingin menghapus?</string>
-  <string name="filter_drawer_edit_tags">Rubah Label</string>
-  <string name="filter_drawer_filter_tags">Saring berdasarkan Label</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Pinta seseorang untuk mengundangmu melalui Kode QR</string>
-  <string name="qr_save_message">Kode QR tersimpan pada</string>
-  <string name="qr_dialogue_title">Kode QR-mu</string>
-  <string name="download">Unduh</string>
-  <string name="send_new_message">Kirim pesan baru</string>
-  <string name="choose_recipient_title">Pilih Penerima Pesan</string>
-  <string name="action_continue">Lanjutkan</string>
-  <string name="scan_qr_code">Pindai Kode QR</string>
-  <string name="enter_recipient_uuid">Masukan User ID Penerima</string>
-  <string name="invited_to_party">Kamu telah diundang untuk bergabung dalam sebuah party!</string>
-  <string name="stats_widget_label">Status Habitica</string>
-  <string name="add_task">Tambah Tugas</string>
-  <string name="add_habit">Tambah Kebiasaan</string>
-  <string name="add_daily">Tambah Kegiatan Harian</string>
-  <string name="add_todo">Tambah Untuk Dilakukan</string>
-  <string name="add_reward">Tambah Hadiah</string>
-  <string name="all_dailies_completed">Anda telah menyelesaikan semua keseharianmu. Selamat!</string>
-  <string name="widget_habit_button">Habitica Melakukan Kebiasaan</string>
-  <string name="widget_dailies">Keseharian Habitica</string>
-  <string name="widget_todo_list">Daftar To-Do Habitica</string>
-  <string name="widget_add_task">Habitica Menambahkan Tugas</string>
-  <string name="google_services_missing">Google play services tidak dapat ditemukan.</string>
-  <string name="gem.purchase.toolbartitle">Bayar</string>
-  <string name="gem.purchase.title">Membeli gem dapat mendukung pengembang dan menjaga Habitica tetap berjalan</string>
-  <string name="gem.purchase.subtitle">Permata membuatmu dapat membeli tambahan yang menyenangkan untuk akunmu, termasuk:</string>
-  <string name="gem.purchase.listitem1">Kostum keren untuk avatarmu</string>
-  <string name="gem.purchase.listitem2">Latar belakang yang keren</string>
-  <string name="gem.purchase.listitem3">Misi yang memberikanmu hadiah telur</string>
-  <string name="gem.purchase.listitem4">Kemampuan untuk mengganti profesi sebelum level 100</string>
-  <string name="support_habitica">Dukung Habitica</string>
-  <string name="skill_transformation_use">gunakan</string>
-  <string name="hatching_market_info">Tidak mendapatkan item yang diinginkan? Beli di Market!</string>
-  <string name="feeding_market_info">Butuh makanan yang berbeda? Beli lebih dari pasar!</string>
-  <string name="open_market">Buka Pasar</string>
-  <string name="cds_description">Keseharianmu akan reset pada saat kamu membuka Habitica di atas %1$s. Pastikan kamu telah menyelesaikan Keseharianmu sebelum jam tersebut!</string>
-  <string name="AudioTheme_title">Tema Nada</string>
-  <string name="AudioTheme_summary">Ganti Tema Nada Habitica</string>
-  <!--Login Incentives-->
-  <string name="see_you_tomorrow">Sampai jumpa besok! </string>
-  <string name="belongs_to_challenge">Milik Tantangan</string>
-  <string name="has_reminder">Memiliki Pengingat</string>
-  <string name="has_tag">Memiliki Label</string>
-  <string name="subscribe.title">Berlangganan mendukung para pengembang dan membantu menjaga Habitica terus berjalan</string>
-  <string name="subscribe_prompt">Jadilah seorang pelanggan dan kamu akan mendapat keuntungan berikut:</string>
-  <string name="subscribe.listitem1">Beli permata dengan koin emas</string>
-  <string name="subscribe.listitem2">Item bulanan eksklusif</string>
-  <string name="subscribe.listitem3">Simpan lebih banyak riwayat masukan</string>
-  <string name="subscribe.listitem4">Batas drop harian didobel</string>
-  <string name="subscriptions">Langganan</string>
-  <string name="subscription_duration">Berulang setiap %s</string>
-  <string name="subscribe">Berlangganan</string>
-  <string name="subscribe.listitem1.description">Alexander sang Saudagar akan menjual permata kepadamu masing-masing seharga 20 koin emas!\n\nPengiriman bulanannya dibatasi di 25 Permata per bulan, tapi bisa meningkat berdasarkan lama berlangganan-mu. \n\nBatasnya meningkat sebanyak 5 Permata setiap tiga bulan berturut-turut kamu berlangganan, hingga batas maksimal 50 Permata per bulan!</string>
-  <string name="subscribe.listitem2.description">Setiap bulan kamu akan menerima sebuah item kosmetik unik untuk avatarmu!\n\nPlus, setiap tiga bulan berturut-turut kamu berlangganan, sang Penjelajah Waktu Misterius akan memberimu akses kepada item kosmetik bersejarah (atau futuristik!).</string>
-  <string name="subscribe.listitem3.description">Buat To-Do yang telah diselesaikan dan riwayat tugas tersedia lebih lama.</string>
-  <string name="subscribe.listitem4.description">Dua kali lipat batas drop akan mengizinkanmu mendapat lebih banyak item untuk tugas yang terselesaikan setiap hari, membantumu melengkapi istalmu lebih cepat!</string>
-  <string name="subscription_hourglasses">+%d Jam Pasir Mistis</string>
-  <string name="payment_method">Metode Pembayaran</string>
-  <string name="subscription">Langganan</string>
-  <string name="active">Aktif</string>
-  <string name="cancel_subscription">Batalkan Langganan</string>
-  <string name="cancel_subscription_google.description">Tidak mau berlangganan lagi? Kamu bisa menemukan opsi untuk berhenti berlangganan di bagin \"Aplikasi Saya\" dari Google Play Store.</string>
-  <string name="cancel_subscription_notgoogle.description">Tidak mau berlangganan lagi? Karena metode pembayaranmu, kamu hanya bisa berhenti berlangganan dari situs Habitica. Klik tombol di bawah, untuk membuka situs Habitica di browsermu!</string>
-  <string name="visit_habitica_website">Kunjungi Situs Habitica</string>
-  <string name="current_bonuses">Bonus Sekarang</string>
-  <string name="months_subscribed">Bulan Berlangganan</string>
-  <string name="current_hourclasses">Jam Pasir Mistis Sekarang</string>
-  <string name="monthly_gem_cap">Batas permata bulanan</string>
-  <string name="inactive">Tidak aktif</string>
-  <string name="one_month">1 Bulan</string>
-  <string name="months">%d Bulan</string>
-  <string name="month">bulan</string>
-  <string name="three_months">3 bulan</string>
-  <string name="six_months">6 bulan</string>
-  <string name="twelve_months">12 bulan</string>
-  <string name="subscribe_prompt_thanks">Dengan Berlangganan kamu menerima keuntungan bermanfaat berikut:</string>
-  <string name="subscription_status">Status Langganan</string>
-  <string name="byLeader">oleh %s</string>
-  <string name="challenge_details">Detail Tantangan</string>
-  <string name="challenge_leave_title">Tinggalkan Tantangan</string>
-  <string name="challenge_leave_text">Apakah kamu yakin ingin meninggalkan Tantangan \"%s\"?</string>
-  <string name="challenge_remove_tasks_title">Hapus tugas</string>
-  <string name="challenge_remove_tasks_text">Apakah kamu mau menghapus tugas ini?</string>
-  <string name="remove_tasks">Hapus</string>
-  <string name="keep_tasks">Simpan</string>
-  <string name="my_challenges">Tantangan Saya</string>
-  <string name="public_challenges">Publik</string>
-  <string name="challenges">Tantangan</string>
-  <string name="daily">Keseharian</string>
-  <string name="habit">Kebiasaan</string>
-  <string name="reward">Hadiah</string>
-  <string name="todo">To-Do</string>
-  <string name="official">Resmi</string>
-  <string name="participating">Berpartisipasi</string>
-  <string name="challenge">Tantangan</string>
-  <string name="go_to_challenge">Pergi ke Tantangan</string>
-  <string name="not_part_of_a_challenge">Kamu tidak mengambil bagian dalam Tantangan apapun saat ini!</string>
-  <string name="join_a_challenge">Ikut sebuah tantangan untuk menambahkan sekumpulan tugas yang telah didesain secara khusus, lalu bersainglah dengan sesama Habitican untuk memenangkan sebuah pencapaian dan bahkan permata!</string>
-  <string name="check_the_public_challenge_tab">Tekan tab \"Publik\" untuk menemukan Tantangan buatan pengguna yang paling cocok untukmu!</string>
-  <string name="add_reminder">Tambahkan Pengingat</string>
-  <string name="warning">Peringatan</string>
-  <string name="open_settings">Buka Pengaturan</string>
-  <string name="dont_keep_activities_warning">Sepertinya kamu mengaktifkan opsi PEngembang \\"Jangan menyimpan Aktifitas\\". Saat ini opsi ini menyebabkan isu dengan aplikasi Habitica, jadi kami sarankan untuk menonaktifkannya.</string>
-  <string name="inbox">Pesan</string>
-  <string name="FAQ">Pertanyaan yang Sering Ditanyakan</string>
-  <string name="special">Spesial</string>
-  <string name="gem_for_gold_description">Karena kamu berlangganan Habitica, kamu bisa membeli sejumlah Permata setiap bulan menggunakan Koin Emas.</string>
-  <string name="limited_count">%d tersisa</string>
-  <string name="gem_shop">Permata</string>
-  <string name="mystery_item">Item Misterius</string>
-  <string name="myster_item_notes">Setiap bulan, pelanggan akan menerima sebuah item misterius. Ini biasanya dirilis sekitar seminggu sebelum akhir bulan.</string>
-  <string name="open">Buka</string>
-  <string name="notification_mystery_item">Kamu membuka kotak ini dan menemukan %s!</string>
-  <string name="checkInRewardEarned">Kamu mendapatkan %1$s sebagai hadiah untuk kesetiaanmu untuk memperbaiki hidupmu.</string>
-  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Hadiahmu selanjutnya akan terbuka setelah %1$d kali Cek In</string>
-  <string name="pending_approval">menunggu persetujuan</string>
-  <string name="filters">Filter</string>
-  <string name="done">Selesai</string>
-  <string name="group_tasks_edit_description">Tugas grup tidak bisa disunting.</string>
-  <string name="group_tasks_edit_title">Tidak bisa menyunting tugas ini</string>
-  <string name="groups">Grup</string>
-  <string name="all">Semua</string>
-  <string name="none">Tidak Ada</string>
-  <string name="owned">Dimiliki</string>
-  <string name="not_owned">Tidak Dimiliki</string>
-  <string name="new_game">Permainan\nBaru</string>
-  <string name="login_btn_fb">Login dengan Facebook</string>
-  <string name="login_btn_google">Login dengan Google</string>
-  <string name="action_back">Kembali</string>
-  <string name="randomize">Sembarang</string>
-  <string name="avatar_extras">Tambahan</string>
-  <string name="avatar_skin_color">Warna Kulit</string>
-  <string name="avatar_hair_color">Warna Rambut</string>
-  <string name="avatar_hair_bangs">Poni</string>
-  <string name="avatar_hair_ponytail">Kucir</string>
-  <string name="avatar_glasses">Kacamata</string>
-  <string name="avatar_wheelchair">Kursi Roda</string>
-  <string name="weak">Lemah</string>
-  <string name="strong">Kuat</string>
-  <string name="gray">Abu-Abu</string>
-  <string name="dated">Terjadwal</string>
-  <string name="completed">Selesai</string>
-  <string name="setuP_group_other">Lainnya</string>
-  <string name="clear">Hapus</string>
-  <string name="empty_title_habits">Kamu tidak punya Kebiasaan apapun</string>
-  <string name="empty_description_habits">Kebiasaan adalah tugas yang tidak memerlukan jadwal ketat. Kamu bisa menyelesaikannya beberapa kali sehari, atau tidak sama sekali.</string>
-  <string name="empty_title_dailies">Kamu tidak punya Keseharian apapun</string>
-  <string name="empty_description_dailies">Keseharian adalah tugas yang berulang setiap waktu tertentu secara teratur. Pilih jadwal yang bekerja untukmu!</string>
-  <string name="empty_title_todos">Kamu tidak punya To-Do apapun</string>
-  <string name="empty_description_todos">To-Do adalah tugas yang hanya perlu diselesaikan sekali. Tambahkan ceklis kepada To-Do-mu untuk meningkatkan harganya.</string>
-  <string name="empty_title_rewards">Kamu tidak punya Hadiah apapun</string>
-  <string name="reset_walkthrough">Ulang Panduan Justin</string>
-  <string name="read_community_guidelines">Tolong baca Pedoman Komunitas kami sebelum posting</string>
-  <string name="maintenance">Perbaikan</string>
-  <string name="reload_content">Muat Ulang Isi</string>
-  <string name="dailyDueDefaultView">Atur Keseharian secara otomatis di tab \'harus dikerjakan\'</string>
-  <string name="dailyDueDefaultViewDescription">Dengan opsi ini dipilih, tugas Keseharianmu akan secara otomatis di tab \'harus dikerjakan\' dan bukan \'semua\'</string>
-  <string name="repeat_summary">Diulang %1$s setiap %2$s%3$s%4$s</string>
-  <string name="no_billing_gems">Perangkatmu tidak punya metode pembayaran terdukung apapun. Silahkan gunakan situs Habitica jika kamu mau membeli permata.</string>
-  <string name="no_billing_subscriptions">Perangkatmu tidak punya metode pembayaran terdukung apapun. Silahkan gunakan situs Habitica jika kamu mau berlangganan.</string>
-  <string name="save">Simpan</string>
-  <string name="location">Lokasi</string>
-  <string name="tasks">Tugas</string>
-  <string name="challenge_create_error_enough_gems">Kamu tidak punya cukup Permata untuk membuat sebuah Tantangan.</string>
-  <string name="challenge_create_error_no_tasks">Kamu perlu menambah setidaknya sebuah tugas untuk membuat Tantangan ini.</string>
-  <string name="challenge_create_error_title">Kamu perlu sebuah judul untuk membuat Tantangan ini.</string>
-  <string name="description_optional">Deskripsi (tidak wajib)</string>
-  <string name="new_challenge_title">Judul tantangan baru</string>
-  <string name="ownership">Kepemilikan</string>
-  <string name="inn">Penginapan</string>
-  <string name="system">Sistem</string>
-  <string name="start_quest">Mulai Misi Baru</string>
-  <string name="leave_party">Tinggalkan Party</string>
-  <string name="party_description">Deskripsi Party</string>
-  <string name="abort_confirmation">Apakah kamu yakin ingin membatalkan misi ini? Ini akan membatalkannya untuk semua orang di Party dan semua progress akan hilang. Gulungan misi akan dikembalikan kepada pemilik misi tersebut.</string>
-  <string name="leave_quest_confirmation">Apakah kamu yakin ingin meninggalkan misi aktif ini? Semua progres misimu akan hilang.</string>
-  <string name="number_participants">%1$d Partisipan</string>
-  <string name="welcome_back">Selamat Datang Kembali</string>
-  <string name="yesterdaililes_prompt">Apakah kamu melakukan Keseharian berikut ini kemarin?</string>
-  <string name="start_day">Mulai Hariku</string>
-  <string name="leave_party_confirmation">Apakah kamu yakin ingin meninggalkan Party ini?</string>
-  <string name="nextPrizeUnlocksIn" formatted="false">Hadiah selanjutnya setelah %d kali Cek In</string>
-  <string name="pending">Menunggu</string>
-  <string name="accepted">Menerima</string>
-  <string name="declined">Menolak</string>
-  <string name="participants">Partisipan</string>
-  <string name="invitations">Undangan</string>
-  <string name="quest_leader_header" formatted="false">Dimulai oleh %s</string>
-  <string name="quest_abort_message">Apakah kamu yakin ingin membatalkan misi ini? Ini akan membatalkannya untuk semua orang di Party dan semua progress akan hilang. Gulungan misi akan dikembalikan kepada pemilik misi tersebut.</string>
-  <string name="reloading_content">Memuat Ulang Isi</string>
-  <string name="thousand_abbrev">rb</string>
-  <string name="million_abbrev">jt</string>
-  <string name="billion_abbrev">mil</string>
-  <string name="your_balance">Saldomu:</string>
-  <string name="available_until" formatted="false">Tersedia hingga %s</string>
-  <string name="gems_left_max" formatted="false">Permata Bulanan: %1$d/%2$d Tersisa</string>
-  <string name="gems_left_nomax" formatted="false">Permata Bulanan: %d Tersisa</string>
-  <string name="health">Nyawa</string>
-  <string name="collect">Kumpulkan</string>
-  <string name="rage_meter">Tingkat Kemarahan</string>
-  <string name="boss_quest">Misi Boss</string>
-  <string name="collection_quest">Misi Mengumpulkan</string>
-  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
-  <string name="experience_reward" formatted="false">%d poin Pengalaman</string>
-  <string name="gold_reward" formatted="false">%d Koin Emas</string>
-  <string name="quest_owner_rewards">Hadiah Pemilik Misi</string>
-  <string name="str_abbrv">Kek</string>
-  <string name="per_abbrv">Per</string>
-  <string name="int_abbrv">Kec</string>
-  <string name="con_abbrv">Ket</string>
-  <string name="reset_account">Reset Akun</string>
-  <string name="delete_account">Hapus Akun</string>
-  <string name="delete_account_description">Apakah kamu yakin? Ini akan menghapus akunmu untuk selamanya, dan tidak akan bisa dikembalikan! Kamu perlu mendaftarkan akun baru untuk menggunakan Habitica lagi. Permata di bank atau yang telah digunakan tidak akan diuangkan kembali. Jika kamu sepenuhnya yakin, ketik kata sandimu di kotak teks di bawah.</string>
-  <string name="reset_account_confirmation">reset akun-ku</string>
-  <string name="delete_account_confirmation">hapus akunku</string>
-  <string name="danger_zone">Zona Berbahaya</string>
-  <string name="nevermind">Tidak jadi</string>
-  <string name="resetting_account">Me-reset Akun</string>
-  <string name="deleting_account">Menghapus Akun</string>
-  <string name="insufficientGold">Kamu perlu menyelesaikan lebih banyak tugas sebelum bisa membeli item ini!</string>
-  <string name="insufficientGems">Kamu perlu lebih banyak Permata untuk membeli item ini!</string>
-  <string name="purchase_gems">Beli permata</string>
-  <string name="insufficientHourglasses">Kamu perlu lebih banyak Jam Pasir Mistis untuk membeli item ini!</string>
-  <string name="get_hourglasses">Dapatkan jam pasir</string>
-  <string name="subscribe_for_hourglasses">Berlangganan untuk Jam Pasir</string>
-  <string name="timetravelers_closed_description">Dapatkan satu Jam Pasir Mistis setiap tiga bulan berturut-turut kamu berlangganan, lalu gunakan untuk membuka item-item edisi terbatas, peliharaan, dan tunggangan dari masa lalu... dan masa depan!</string>
-  <string name="want_to_subscribe">Aku mau Berlangganan</string>
-  <string name="seasonal_closed_description">Grand Gala diadakan dekat dengan titik balik matahari dan ekuinoks, jadi cek kembali nanti untuk menemukan sekumpulan seru item musiman yang spesial!</string>
-  <string name="come_back_soon">Datang kembali nanti!</string>
-  <string name="level">Level</string>
-  <string name="streak_label">Rentetan 21 Hari</string>
-  <string name="stats">Status</string>
-  <string name="fix_character_description">Jika kamu menemukan sebuah gangguan atau melakukan kesalahan yang mengubah karaktermu secara tidak adil, kamu bisa memperbaiki angka-angka tersebut secara manual di sini.</string>
-  <string name="fix_character_values">Atur Angka Karakter</string>
-  <string name="saving">Menyimpan</string>
-  <string name="forgot_password_title">Email sebuah Tautan Mengatur Ulang Kata Sandi</string>
-  <string name="forgot_password_description">Masukan alamat email yang kamu gunakan untuk mendaftarkan akun Habitica-mu.</string>
-  <string name="forgot_password_confirmation">Jika kami punya data email-mu, instruksi untuk mengatur kata sandi baru telah dikirim ke email-mu.</string>
-  <string name="ok">OK</string>
-  <string name="profile">Profil</string>
-  <string name="profile_summary">Sunting profil publikmu.</string>
-  <string name="display_name">Nama Tampilan</string>
-  <string name="photo_url">Tautan Foto</string>
-  <string name="login_name">Nama Login</string>
-  <string name="about">Tentang</string>
-  <string name="app_settings">Pengaturan Aplikasi</string>
-  <string name="authentication">Autentikasi</string>
-  <string name="authentication_summary">Ganti opsi autentikasi-mu.</string>
-  <string name="change_password">Ganti Kata Sandi</string>
-  <string name="change_email">Ganti Alamat Email</string>
-  <string name="change_login_name">Ganti Nama Login</string>
-  <string name="change">Ganti</string>
-  <string name="character_level">Level Karakter</string>
-  <string name="auto_allocate_points">Pembagian Poin Otomatis</string>
-  <string name="stat_guide">Panduan Status</string>
-  <string name="character_build">Bentuk Tubuh Karakter</string>
-  <string name="character_build_description">Setiap level memberimu sebuah poin untuk ditaruh kepada sebuah atribut pilihanmu. Kamu bisa melakukannya secara manual, atau biarkan game ini mengaturnya untukmu menggunakan salah satu opsi Pembagian Otomatis.</string>
-  <string name="strength">Kekuatan</string>
-  <string name="strength_description">Meningkatkan bonus dari serangan kritikal dan buat itu lebih sering terjadi sewaktu menyelesaikan tugas. Juga meningkatkan damage yang kamu lakukan kepada boss.</string>
-  <string name="intelligence">Kecerdasan</string>
-  <string name="intelligence_description">Meningkatkan EXP yang dihasilkan dari menyelesaikan tugas. Juga meningkatkan batas mana-mu dan seberapa cepat mana bertambah dari waktu ke waktu.</string>
-  <string name="constitution">Ketahanan</string>
-  <string name="constitution_description">Mengurangi jumlah damage yang kamu terima dari tugasmu. Tidak mengurangi damage yang diterima dari boss.</string>
-  <string name="perception">Persepsi</string>
-  <string name="perception_description">Meningkatkan kecenderungan untuk menemukan item sewaktu menyelesaikan Tugas, batas drop harian, Bonus Rentetan, dan jumlah koin emas yang dihadiahkan dari Tugas.</string>
-  <string name="buffs">Buff</string>
-  <string name="allocated">Teralokasi</string>
-  <string name="distribute_evenly">Bagikan Merata</string>
-  <string name="distribute_class">Bagikan berdasarkan pekerjaan</string>
-  <string name="distribute_task">Bagikan berdasarkan aktifitas tugas</string>
-  <string name="no_points_to_allocate">Tidak ada Poin untuk Dibagikan</string>
-  <string name="points_to_allocate" formatted="false">%d Poin untuk Dibagikan</string>
-  <string name="distribute_evenly_help">Bagikan jumlah poin yang sama kepada setiap atribut.</string>
-  <string name="distribute_class_help">Bagikan lebih banyak poin kepada atribut yang penting untuk Pekerjaanmu.</string>
-  <string name="distribute_task_help">Bagikan poin berdasarkan kepada kategori Kekuatan, Kecerdasan, Ketahanan, dan Persepsi yang dihubungkan kepada tugas yang kamu selesaikan.</string>
-  <string name="allocating_points">Membagikan Poin</string>
-  <string name="class_equipment">Perlengkapan</string>
-  <string name="equipment_empty">Kamu sudah punya semua perlengkapan! Lebih banyak lagi tersedia sewaktu Grand Gala, dekat titik balik matahari dan ekuinoks.</string>
-  <string name="classless">Tanpa Pekerjaan</string>
-  <string name="class_equipment_shop_dialog">Item ini hanya tersedia untuk pekerjaan tetentu. \nKamu bisa menggantu pekerjaanmu dari Pengaturan.</string>
-  <string name="class_gear_disclaimer">Kamu hanya bisa membeli perlengkapan untuk pekerjaanmu yang sekarang</string>
-  <string name="available_stats" formatted="false">%d poin</string>
-  <string name="toogle_emojis">Atur Emoji</string>
-  <string name="tavern_description">Selamat datang di Penginapan! Tarik kursi dan mari mengobrol, atau beristirahat dari tugas-tugasmu.</string>
-  <string name="check_into_inn">Masuk ke Penginapan</string>
-  <string name="community_guidelines">Pedoman Komunitas</string>
-  <string name="view_community_guidelines">Lihat Pedoman Komunitas</string>
-  <string name="guidelines_description">Habitica coba membuat sebuah lingkungan yang ramah untuk pengguna segala usia dan latar belakang, khususnya di tempat umum seperti Kedai Minuman. Jika kamu ada pertanyaan, silahkan periksa pedoman kami.</string>
-  <string name="helpful_links">Tautan Berguna</string>
-  <string name="view_faq">Lihat FAQ</string>
-  <string name="report_bug">Laporkan Gangguan</string>
-  <string name="player_tiers">Tingkatan Pemain</string>
-  <string name="staff_moderators">Staf dan Moderator</string>
-  <string name="navigation_drawer_open">Buka laci navigasi</string>
-  <string name="navigation_drawer_close">Tutup laci navigasi</string>
-  <string name="world_boss">Bos Dunia</string>
-  <string name="world_boss_art">Seni Bos</string>
-  <string name="boss_art">Seni Bos</string>
-  <string name="world_boss_description">Deskripsi Bos Dunia</string>
-  <string name="rage_strike_count" formatted="false">Tingkat Kemarahan 1%d/1%d</string>
-  <string name="pending_strike_description">Serangan ini belum terjadi!\nWorld Boss akan mengamuk dan menyerang salah satu dari penjaga toko bersahabat kita sewaktu tingkat kemarahannya telah penuh. Kerjakan sebanyak mungkin Keseharian-mu untuk mencoba mencegah serangan itu!</string>
-  <string name="pending_strike_title">Serangan Tertunda</string>
-  <string name="strike_description_title">Apakah itu Tingkatan Kemarahan?</string>
-  <string name="strike_description_subtitle">Ada 3 potensi Serangan peningkat Kemarahan</string>
-  <string name="strike_description_description">Pengukur ini terisi sewaktu Habitican tidak menyelesaikan Keseharian mereka. Sewaktu terisi penuh, sang DysHeartener akan mengerahkan Shattering Heartbreak kepada salah satu dari penjaga toko Habitica, jadi pastikan kamu melakukan tugas-tugasmu!</string>
-  <string name="pending_strike_subtitle">Serangan ini belum terjadi!</string>
-  <string name="strike_active_title" formatted="false">Sang %s telah Diserang!</string>
-  <string name="strike_active_subtitle" formatted="false">%s sekarang Patah Hati!</string>
-  <string name="strike_active_description" formatted="false">%s kita yang tercinta hancur sewaktu sang %s meremukkan %s. Cepat, kalahkan tugas-tugasmu untuk mengalahkan sang monster dan bantu membangun kembali!!</string>
-  <string name="questShop">Toko Misi</string>
-  <string name="market_owner_long">Alex sang Pedagang</string>
-  <string name="tavern_owner_long">Daniel sang penjaga penginapan</string>
-  <string name="stable_owner_long">Matt sang penguasa hewan buas</string>
-  <string name="hide_boss_art">Sembunyikan Seni Bos</string>
-  <string name="active_world_boss">Bos Dunia aktif</string>
-  <string name="no_party_description">Selesaikan misi bersama teman-temanmu atau sendirian. Bertarung melawan monster, buat Tantangan, dan bantu dirimu untuk tetap bertanggung jawab melalui Party.</string>
-  <string name="no_party_title">Mainkan Habitica dalam Party</string>
-  <string name="join_party_title">Ingin bergabung ke Party?</string>
-  <string name="create_party_website">Buka website untuk membuat Party</string>
-  <string name="id_copied">ID tersalin ke clipboard</string>
-  <string name="insufficientSubscriberGems">Kamu telah membeli semua Permata yang tersedia bulan ini. Lebih banyak akan ditambahkan dalam tiga hari pertama pada setiap bulan. Terima kasih sudah berlangganan!</string>
-  <string name="insufficientSubscriberGemsTitle">Batas Permata Bulanan Telah Tercapai</string>
-</resources>

From 771e73714d6bc22a89c45d77384188dd6c844354 Mon Sep 17 00:00:00 2001
From: Leland Wu <leland.wu4@gmail.com>
Date: Thu, 12 Mar 2020 10:24:36 -0400
Subject: [PATCH 37/62] Rename appropriate sections in Pets & Mounts screen
 (#1267)

* Add getTranslatedType in pet and mount classes

* fix translation method

* Create kotlin extension of animal class

* rewrite if else as kotlin when

* move animal extension to extensions folder

* write unit tests, add some dependencies in build.gradle
---
 Habitica/build.gradle                         |  2 +
 Habitica/res/values/strings.xml               |  3 ++
 .../habitica/extensions/Animal-Extensions.kt  | 23 +++++++++++
 .../habitica/models/inventory/Animal.java     |  3 +-
 .../habitica/models/inventory/Mount.java      |  2 -
 .../habitica/models/inventory/Pet.java        |  2 +-
 .../stable/StableRecyclerFragment.kt          |  3 +-
 .../habitica/models/inventory/MountTest.kt    | 38 +++++++++++++++++++
 .../habitica/models/inventory/PetTest.kt      | 38 +++++++++++++++++++
 9 files changed, 108 insertions(+), 6 deletions(-)
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Animal-Extensions.kt
 create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/models/inventory/MountTest.kt
 create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/models/inventory/PetTest.kt

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 41ebc3323..a4fb03b4a 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -102,6 +102,8 @@ dependencies {
     }
     //Tests
     testImplementation 'junit:junit:4.12'
+    testImplementation 'androidx.test:core:1.0.0'
+    testImplementation "com.google.truth:truth:1.0.1"
     testImplementation 'org.assertj:assertj-core:2.6.0'
     testImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.2'
     testImplementation 'org.robolectric:robolectric:3.8'
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index ef23c6bcb..600388fc8 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -954,4 +954,7 @@
     <string name="unlock_level_short">Level %d</string>
     <string name="not_participating">You are not participating</string>
     <string name="quest_completed">Quest completed!</string>
+
+    <string name="standard"> Standard </string>
+    <string name="wacky"> Wacky </string>
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Animal-Extensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Animal-Extensions.kt
new file mode 100644
index 000000000..f8cb2c6bc
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Animal-Extensions.kt
@@ -0,0 +1,23 @@
+package com.habitrpg.android.habitica.extensions
+
+import android.content.Context
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.models.inventory.Animal
+
+fun Animal.getTranslatedType(c: Context?): String {
+    if (c == null) {
+        return type
+    }
+
+    var currType: String = when (type) {
+        "drop"    -> c?.getString(R.string.standard).toString()
+        "quest"   -> c?.getString(R.string.quest).toString()
+        "wacky"   -> c?.getString(R.string.wacky).toString()
+        "special" -> c?.getString(R.string.special).toString()
+        else      -> {
+            type
+        }
+    }
+
+    return currType
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java
index 3f5b11177..a2f2bbd41 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java
@@ -1,6 +1,5 @@
 package com.habitrpg.android.habitica.models.inventory;
 
-
 public interface Animal {
 
     String getKey();
@@ -30,4 +29,4 @@ public interface Animal {
     Integer getNumberOwned();
 
     void setNumberOwned(Integer numberOwned);
-}
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.java
index f962c9d5e..19326be4f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.java
@@ -1,7 +1,5 @@
 package com.habitrpg.android.habitica.models.inventory;
 
-import androidx.annotation.Nullable;
-
 import io.realm.RealmObject;
 import io.realm.annotations.Ignore;
 import io.realm.annotations.PrimaryKey;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.java
index 19bbeed45..cf8c531e6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.java
@@ -1,6 +1,5 @@
 package com.habitrpg.android.habitica.models.inventory;
 
-
 import io.realm.RealmObject;
 import io.realm.annotations.Ignore;
 import io.realm.annotations.PrimaryKey;
@@ -28,6 +27,7 @@ public class Pet extends RealmObject implements Animal{
         return text;
     }
 
+
     @Override
     public void setText(String text) {
         this.text = text;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt
index 8a445a63d..5abbc77f2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt
@@ -8,6 +8,7 @@ import android.widget.TextView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
+import com.habitrpg.android.habitica.extensions.getTranslatedType
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.inventory.Animal
@@ -157,7 +158,7 @@ class StableRecyclerFragment : BaseFragment() {
                 if (items.size > 0 && items[items.size - 1].javaClass == String::class.java) {
                     items.removeAt(items.size - 1)
                 }
-                items.add(animal.type)
+                items.add(animal.getTranslatedType(context))
                 lastSectionTitle = animal.type
             }
             when (itemType) {
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/models/inventory/MountTest.kt b/Habitica/src/test/java/com/habitrpg/android/habitica/models/inventory/MountTest.kt
new file mode 100644
index 000000000..8423b781c
--- /dev/null
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/models/inventory/MountTest.kt
@@ -0,0 +1,38 @@
+package com.habitrpg.android.habitica.models.inventory;
+
+import android.content.Context
+import com.google.common.truth.Truth.assertThat
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.getTranslatedType
+import org.junit.Test
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.mockito.Mockito.mock
+
+private const val FAKE_STANDARD = "Standard"
+private const val FAKE_PREMIUM = "premium"
+
+class MountTest {
+    @Mock
+    private var mockContext: Context = mock(Context::class.java)
+    private var mount: Mount = Mount()
+
+    @Test
+    fun testGetTranslatedStringReturnsStandard() {
+        mount.type = "drop"
+        `when`(mockContext.getString(R.string.standard)).thenReturn(FAKE_STANDARD)
+
+        val result: String = mount.getTranslatedType(mockContext)
+
+        assertThat(result).isEqualTo(FAKE_STANDARD)
+    }
+
+    @Test
+    fun testGetTranslatedStringReturnsPremiumWhenContextIsNull() {
+        mount.type = "premium"
+
+        val result: String = mount.getTranslatedType(null)
+
+        assertThat(result).isEqualTo(FAKE_PREMIUM)
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/models/inventory/PetTest.kt b/Habitica/src/test/java/com/habitrpg/android/habitica/models/inventory/PetTest.kt
new file mode 100644
index 000000000..f0f19d8d8
--- /dev/null
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/models/inventory/PetTest.kt
@@ -0,0 +1,38 @@
+package com.habitrpg.android.habitica.models.inventory;
+
+import android.content.Context
+import com.google.common.truth.Truth.assertThat
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.getTranslatedType
+import org.junit.Test
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.mockito.Mockito.mock
+
+private const val FAKE_STANDARD = "Standard"
+private const val FAKE_PREMIUM = "premium"
+
+class PetTest {
+    @Mock
+    private var mockContext: Context = mock(Context::class.java)
+    private var pet: Pet = Pet()
+
+    @Test
+    fun testGetTranslatedStringReturnsStandard() {
+        pet.type = "drop"
+        `when`(mockContext.getString(R.string.standard)).thenReturn(FAKE_STANDARD)
+
+        val result: String = pet.getTranslatedType(mockContext)
+
+        assertThat(result).isEqualTo(FAKE_STANDARD)
+    }
+
+    @Test
+    fun testGetTranslatedStringReturnsPremiumWhenContextIsNull() {
+        pet.type = "premium"
+
+        val result: String = pet.getTranslatedType(null)
+
+        assertThat(result).isEqualTo(FAKE_PREMIUM)
+    }
+}
\ No newline at end of file

From eccd6467ad88b97da36795b0bb315162e4b0c16a Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 11 Mar 2020 14:06:40 +0100
Subject: [PATCH 38/62] make FCV edittext use binding

---
 .../ui/views/settings/FixValuesEditText.kt    | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/settings/FixValuesEditText.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/settings/FixValuesEditText.kt
index dca2892c6..fce3e9276 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/settings/FixValuesEditText.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/settings/FixValuesEditText.kt
@@ -3,21 +3,22 @@ package com.habitrpg.android.habitica.ui.views.settings
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.PorterDuff
+import android.util.AttributeSet
+import android.widget.FrameLayout
 import androidx.annotation.ColorRes
 import androidx.core.content.ContextCompat
-import android.util.AttributeSet
-import android.view.View
-import android.widget.FrameLayout
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.FixvaluesEdittextBinding
+import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import kotlinx.android.synthetic.main.fixvalues_edittext.view.*
 
 class FixValuesEditText(context: Context, attrs: AttributeSet) : FrameLayout(context, attrs) {
 
+    private val binding: FixvaluesEdittextBinding = FixvaluesEdittextBinding.inflate(context.layoutInflater, this)
     var text: String
-    get() = editText?.text.toString()
+    get() = binding.editText.text.toString()
     set(value) {
-        editText?.setText(value)
+        binding.editText.setText(value)
     }
 
     @ColorRes
@@ -27,34 +28,32 @@ class FixValuesEditText(context: Context, attrs: AttributeSet) : FrameLayout(con
         val backgroundDrawable = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg)
         backgroundDrawable?.setColorFilter(field, PorterDuff.Mode.MULTIPLY)
         backgroundDrawable?.alpha = 50
-        iconBackgroundView.background = backgroundDrawable
+        binding.iconBackgroundView.background = backgroundDrawable
     }
 
     init {
-        View.inflate(context, R.layout.fixvalues_edittext, this)
-
         val attributes = context.theme.obtainStyledAttributes(
                 attrs,
                 R.styleable.FixValuesEditText,
                 0, 0)
 
-        editText.hint = attributes.getString(R.styleable.FixValuesEditText_title)
-        editTextWrapper.hint = editText.hint
-        editTextWrapper.setHintTextAppearance(attributes.getResourceId(R.styleable.FixValuesEditText_hintStyle, R.style.PurpleTextLabel))
+        binding.editText.hint = attributes.getString(R.styleable.FixValuesEditText_title)
+        binding.editTextWrapper.hint = binding.editText.hint
+        binding.editTextWrapper.setHintTextAppearance(attributes.getResourceId(R.styleable.FixValuesEditText_hintStyle, R.style.PurpleTextLabel))
         iconBackgroundColor = attributes.getColor(R.styleable.FixValuesEditText_iconBgColor, 0)
 
         val iconName = attributes.getString(R.styleable.FixValuesEditText_fixIconName)
         when (iconName) {
-            "health" -> iconView.setImageBitmap(HabiticaIconsHelper.imageOfHeartLightBg())
-            "experience" -> iconView.setImageBitmap(HabiticaIconsHelper.imageOfExperience())
-            "mana" -> iconView.setImageBitmap(HabiticaIconsHelper.imageOfMagic())
-            "gold" -> iconView.setImageBitmap(HabiticaIconsHelper.imageOfGold())
-            "level" -> iconView.setImageBitmap(HabiticaIconsHelper.imageOfRogueLightBg())
-            "streak" -> iconView.setImageResource(R.drawable.achievement_thermometer)
+            "health" -> binding.iconView.setImageBitmap(HabiticaIconsHelper.imageOfHeartLightBg())
+            "experience" -> binding.iconView.setImageBitmap(HabiticaIconsHelper.imageOfExperience())
+            "mana" -> binding.iconView.setImageBitmap(HabiticaIconsHelper.imageOfMagic())
+            "gold" -> binding.iconView.setImageBitmap(HabiticaIconsHelper.imageOfGold())
+            "level" -> binding.iconView.setImageBitmap(HabiticaIconsHelper.imageOfRogueLightBg())
+            "streak" -> binding.iconView.setImageResource(R.drawable.achievement_thermometer)
         }
     }
 
     fun setIconBitmap(icon: Bitmap) {
-        iconView.setImageBitmap(icon)
+        binding.iconView.setImageBitmap(icon)
     }
 }

From 057e9963bfe48501ca18b254bf43932b0bd1bdba Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 11 Mar 2020 14:12:51 +0100
Subject: [PATCH 39/62] fix minor issues with fcv screen

---
 .../activities/FixCharacterValuesActivity.kt  | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt
index 9d0186081..9c7ea04d8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt
@@ -47,9 +47,9 @@ class FixCharacterValuesActivity: BaseActivity() {
         setTitle(R.string.fix_character_values)
         setupToolbar(binding.toolbar)
 
-        repository.getUser(userId).firstElement().subscribe(Consumer {
+        compositeSubscription.add(repository.getUser(userId).firstElement().subscribe(Consumer {
             user = it
-        }, RxErrorHandler.handleEmptyError())
+        }, RxErrorHandler.handleEmptyError()))
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
@@ -57,8 +57,8 @@ class FixCharacterValuesActivity: BaseActivity() {
         return true
     }
 
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        val id = item?.itemId
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        val id = item.itemId
 
         if (id == R.id.action_save_changes) {
             @Suppress("DEPRECATION")
@@ -70,10 +70,10 @@ class FixCharacterValuesActivity: BaseActivity() {
             userInfo["stats.mp"] = binding.manaEditText.getDoubleValue()
             userInfo["stats.lvl"] = binding.levelEditText.getDoubleValue().toInt()
             userInfo["achievements.streak"] = binding.streakEditText.getDoubleValue().toInt()
-            repository.updateUser(user, userInfo).subscribe(Consumer {}, RxErrorHandler.handleEmptyError(), Action {
+            compositeSubscription.add(repository.updateUser(user, userInfo).subscribe(Consumer {}, RxErrorHandler.handleEmptyError(), Action {
                 progressDialog.dismiss()
                 finish()
-            })
+            }))
             return true
         }
 
@@ -89,14 +89,15 @@ class FixCharacterValuesActivity: BaseActivity() {
     }
 
     private fun updateFields(user: User) {
-        binding.healthEditText.text = user.stats?.hp.toString()
-        binding.experienceEditText.text = user.stats?.exp.toString()
-        binding.goldEditText.text = user.stats?.gp.toString()
-        binding.manaEditText.text = user.stats?.mp.toString()
-        binding.levelEditText.text = user.stats?.lvl.toString()
+        val stats = user.stats ?: return
+        binding.healthEditText.text = stats.hp.toString()
+        binding.experienceEditText.text = stats.exp.toString()
+        binding.goldEditText.text = stats.gp.toString()
+        binding.manaEditText.text = stats.mp.toString()
+        binding.levelEditText.text = stats.lvl.toString()
         binding.streakEditText.text = user.streakCount.toString()
 
-        when (user.stats?.habitClass) {
+        when (stats.habitClass) {
             Stats.WARRIOR -> {
                 binding.levelEditText.iconBackgroundColor = ContextCompat.getColor(this, R.color.red_500)
                 binding.levelEditText.setIconBitmap(HabiticaIconsHelper.imageOfWarriorLightBg())
@@ -116,7 +117,7 @@ class FixCharacterValuesActivity: BaseActivity() {
         }
     }
 
-    fun FixValuesEditText.getDoubleValue(): Double {
+    private fun FixValuesEditText.getDoubleValue(): Double {
         val stringValue = this.text
         return try {
             stringValue.toDouble()

From edc2a83a08ed77e65019a99a06226cbf9c39a932 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 18 Mar 2020 15:18:59 +0100
Subject: [PATCH 40/62] Implement improved help screen

---
 Habitica/res/drawable-hdpi/support_faq.png    | Bin 0 -> 904 bytes
 Habitica/res/drawable-mdpi/support_faq.png    | Bin 0 -> 638 bytes
 Habitica/res/drawable-xhdpi/support_faq.png   | Bin 0 -> 1180 bytes
 Habitica/res/drawable-xxhdpi/support_faq.png  | Bin 0 -> 1664 bytes
 Habitica/res/drawable-xxxhdpi/support_faq.png | Bin 0 -> 2184 bytes
 .../drawable/rounded_purple_dark_square.xml   |  16 +
 .../res/drawable/support_info_lower_bg.xml    |  15 +
 Habitica/res/layout/fragment_faq_detail.xml   |  36 -
 Habitica/res/layout/fragment_faq_overview.xml | 120 +++
 .../res/layout/fragment_support_bug_fix.xml   | 115 +++
 Habitica/res/layout/fragment_support_main.xml | 170 ++++
 .../layout/support_collapsible_section.xml    |  60 ++
 Habitica/res/layout/support_faq_item.xml      |  26 +
 Habitica/res/navigation/navigation.xml        |  25 +-
 Habitica/res/values/attrs.xml                 |  10 +-
 Habitica/res/values/strings.xml               |  39 +
 Habitica/res/values/styles.xml                |   7 +
 .../habitica/components/UserComponent.java    |  25 +-
 .../ui/adapter/FAQOverviewRecyclerAdapter.kt  | 120 ---
 .../ui/fragments/NavigationDrawerFragment.kt  |   2 +-
 .../ui/fragments/faq/FAQDetailFragment.kt     |  52 --
 .../ui/fragments/faq/FAQOverviewFragment.kt   |  65 --
 .../ui/fragments/support/BugFixFragment.kt    | 109 +++
 .../fragments/support/FAQOverviewFragment.kt  |  84 ++
 .../fragments/support/SupportMainFragment.kt  | 126 +++
 .../habitica/ui/views/HabiticaIcons.java      | 827 +++++++++++++-----
 .../ui/views/HabiticaIconsHelper.java         |  46 +-
 .../ui/views/SupportCollapsibleSection.kt     |  52 ++
 build.gradle                                  |   2 +-
 29 files changed, 1630 insertions(+), 519 deletions(-)
 create mode 100644 Habitica/res/drawable-hdpi/support_faq.png
 create mode 100644 Habitica/res/drawable-mdpi/support_faq.png
 create mode 100644 Habitica/res/drawable-xhdpi/support_faq.png
 create mode 100644 Habitica/res/drawable-xxhdpi/support_faq.png
 create mode 100644 Habitica/res/drawable-xxxhdpi/support_faq.png
 create mode 100644 Habitica/res/drawable/rounded_purple_dark_square.xml
 create mode 100644 Habitica/res/drawable/support_info_lower_bg.xml
 delete mode 100644 Habitica/res/layout/fragment_faq_detail.xml
 create mode 100644 Habitica/res/layout/fragment_faq_overview.xml
 create mode 100644 Habitica/res/layout/fragment_support_bug_fix.xml
 create mode 100644 Habitica/res/layout/fragment_support_main.xml
 create mode 100644 Habitica/res/layout/support_collapsible_section.xml
 create mode 100644 Habitica/res/layout/support_faq_item.xml
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/FAQOverviewRecyclerAdapter.kt
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQDetailFragment.kt
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.kt
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SupportCollapsibleSection.kt

diff --git a/Habitica/res/drawable-hdpi/support_faq.png b/Habitica/res/drawable-hdpi/support_faq.png
new file mode 100644
index 0000000000000000000000000000000000000000..13c292aec03c2e4177addbb00755479f98af507d
GIT binary patch
literal 904
zcmV;319$w1P)<h;3K|Lk000e1NJLTq000^Q001Kh1^@s6ia#2w00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR918lVFJ1ONa40RR91BLDyZ0O0s+{Qv+0@<~KNR7ef&R!wLVK@|QbNq>@B
zTd?>8g^F0bv|4|P;>D9xdr=Qb@X(940gsg)tputb1W&z4Z7Yg`6r=~mo7R(JiT_p$
z6|Gvdr2eD_W1D0%zR9}ow%MJX4HP{1V98|W``$P6X5PGEBi%fhuf}Cx84far)o`&N
z?_2;h%z#<WaIHRsQ|<k1Q7{5R#9xl6J6#>Yf%V|%nMuP>tdoN26Dv`7;ThRsFnlWE
zGQggHIqDKIUM6@xFXXCPpgib>VPZWA?F|E4513>xEoGs`-9XJ+puP!Mx7mw?j#Uy8
z;cD7vI&WzQ=%jkGfD9d|02-Qs##VA%*is!GtO0f%2Hq!tZyy0IC-b6@6${ZC_mGn{
z^+4q+N<PXyJKL}Y5MN#czJCIel*m&L08U9{XT_n*>)>FuvxwD^k5aO3qt0;>5%^*u
z>U=Z`%qPXLn$5h@S0h8)3JJp46<{$fqv~U+FTj&q?l?!GTn2c2$KAox+q6##hrv-u
zNHFQBJ_)D8vV4kCR}~7^jYt6%lM97R7vdNvr-8Q*fsAGE$|_BatW}&x7POe{&lK?C
z1u#iDBE&@Do4BXvP(uq9G{qZ2D)jO$Aim|sDc3%~(ZA(mPXDE$b0U?}|6iz-s1-Q>
zUg+os$mJJtj;0r*hg;#T=4E-(<83&il9b}V&=Ebu=w<^3kMrmBK)gw1fvT38xra`}
zq(6u4;Xfk6ZRZdh_lK~9RyL+4<4}(bGS6X@X1(o5oJ|{j#_zFyHdot*{j}N(MxX50
zHgvQf87+<8=vj7NMvg=nT}tQ~=;Gtl8m1~<<%BN|9miLmMVp(5)nV)s8{vM?gA7yF
zertP)5QXX)*U%h}v-?(%N}I$cY6EDcXxP@<f)EXIEsLwKft`^!n^kdahlvcZ`OZNc
zqJnvv4hmhprindT$S$D!Xdk<1c9-5_jEM(V-%uA%Xn9=!>*+=>r|03y*zgIyiO2bp
e?O7Qmi`U<~TffP_bQ2{20000<MNUMnLSTYBa)})P

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-mdpi/support_faq.png b/Habitica/res/drawable-mdpi/support_faq.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d5649a2256cdda2e3b438f4935ab88cb1e14309
GIT binary patch
literal 638
zcmeAS@N?(olHy`uVBq!ia0vp^f<P?J!3HGXnk;z^q!^2X+?^QKos)S9<hZ0pc&7RK
zGH3zW91M)@nG7r-B|t0%#0(6~3m6%gfixpXYylHoR&W6`oGlJg$apzzA&`9G>Eak-
zA$WDldGAn1k>mEo_eFJ1&)cD4oH3D`Tj{K8caG@P2dmC5W-_1I|F2=1qR=C^*saE^
zOZ`ip?qgb5FrE7?`xJ$wjHt$0`tNr?o>@M>qW(<nrA^Gm>F0jdJ+FQ~=jTGMzq_ul
zOmxxS6!GSHxVHg^?&ODw|7OlATgAD=kG~<U=Gd7Fp3w&tnHbk(YKfE_Tj^$ZpL2Qi
zYD1<ozKdln`PPOn+$VTVEU{d@SM%kK1;>mF-pZvs5#M@z!CL88QaNW7#3D}~eO<7Q
z`Od5tEzh_UZhgy-s9^Rk4z$@c>HK@g-+@jyK9?sx4Ym;KQC2#tJEM|ypX&+jL)Hg<
z<hOTpFkYYj#`R82``X?gUk><p%-9gTa>}(wGt{14W83>yTJw$FLY1BC>zaRV|4=J;
zZrj0=(`rp_uI@be>Hj1T)u5;Erbyn@i^;ZH*`;})USW~Qyg8kUCl&e+6<P5WZGP8x
zVE-QbFLz`^F1K0TTWx=0vY}?Q!gj69&RH*n<YW84S&K3nKRsA%I@|J8YUIV&OI+TF
zW%p}Z#!S!SUvbpp=fB{s)Ak<aWnEmjW=`Le|JU_DS$uclJ<geEKRsCWqkQkzmywct
zCmfDRFL3|#=i&Q;&jyVfX4stjq*3IW6o2aDbmm_nGd}1)c8Z&SA!@a4i%Z+3cl#d8
Pf#TlN)z4*}Q$iB}9P1Ei

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xhdpi/support_faq.png b/Habitica/res/drawable-xhdpi/support_faq.png
new file mode 100644
index 0000000000000000000000000000000000000000..100c4469c7a958d68895043d6cc30692d2501fc3
GIT binary patch
literal 1180
zcmV;N1Y`S&P)<h;3K|Lk000e1NJLTq001HY001rs1^@s6O@+(300001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91BA^2R1ONa40RR91E&u=k0LO|<RR91421!IgR9Fe^SWRqHRTTd2{2*<i
zw9rH<4HXhei_qGNF;xs3Og9=gFlZzuLScmq65__6G!|VLH6bqAw8e$7iD^PuKrq0f
z24f7Rgre4H47F5}LTLj7lo_UdbNz0IH+{S}^WJ^0(=H4rnY{aR&Ue0d?z!jQHv*LJ
zKa{m1j7||joe(HhW4dzdA8JZnZ9o9mseO)q-fuZ7u9}uYk%$ywKuQ#wgMOZViDa<_
z;?XFcd$&W3sIicWL{Ji0&>#(o6*DP(WtxW6a+sY(e+q0feTMwzglSlaCs$(SsrTd)
z3M*6yz(Qcmi%9KO;HjEI&;TMqVTzUmH7^6DtALx_!qds1NEy4p5oy{1g!vjvmjRo$
z&yR$%4n$;K15jQ$=e(Nzil^uLL0Z0vM3w;ci~x7rBhv61-zxAz`^b@1RY3J-pz;|S
zk&InR%7K^O0<QhRoEZkDZrL^5`+47?cm=S&5qNTaCLzO7cOW&Zmd9M8M4W_1fN_!<
zzXGHZN+ZAIU7F}pV8e^dh1E<-4H9-2MSPL9^*~*-o_$^-@f*OvDITmoPF6b^nFh}H
z0*O2J8D~E)5v4l%D{$qa(@1w@kS{X%ub#Fm5d|@L8ko=ov$`C<09?If9dU1a5>e*o
zzGHarxdT~eCr5$b&R9ph+ge1@T<d$2-e9K2?J?#SZTyH95e1m5cI0yunLXI^&E_6o
z5F*iqB%%&DyQn4Ob<ZI|h~$8G;LZ+Mi&}CjQ_6>a;`aO-sM^T#&x3Czj{zkS7DK<H
zO++Q%I4}Qy{S4gT{lgSvn%i_R^IKk#AymG`oYjA76FGUr8}#l3@cUWn*-mC}%YgS0
zPv8K@g7&WQbUsgo$3*M_d>oPgUqpC|pGi;SGyXTSpLOGb{SE#0wF{aRSV-J9Qg~<A
zC*p(}@7^mfOMzp&Rz589R&Bku|71<$&-4Q{nk1AP{`1oxE=D6G)2HXwspX4^G;o|}
zPJQgKu$(p-&^=#^n`O;-mDT-AryK7Pt)*c;q+}8w#oEN@ZjiB<FgSmxbD!*I>l;@3
z5;uM8oM%M1?h|qv%{x6vSV8x9iC!57zly+1f}Xe&F)#=Nn|HQ~ANAnov`A*CEP@vp
z&Dn&Wo5|hENrcAIn8CM063@q4h59=(ki<Ggyrmm&h!8$zBD-FvbLB|VNaEm|ZK5NP
zcbkzA-0VQx(S35jNTY{!ho9?Cc{CytV={qly9z|Y>TYkB_<>&nTNrJAKRP8#M9$!s
z)D)hLeJc8$YK0lu(=LWrhtb5P>ain6)Y`E?wX;ASuum>T|MgCBpSZhOjV~~1zR3FM
u`9Qv%?JRPmt3|%j*D7=6=^`_+xcd*r|Nq50Ug^UC0000<MNUMnLSTXmPY{3r

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxhdpi/support_faq.png b/Habitica/res/drawable-xxhdpi/support_faq.png
new file mode 100644
index 0000000000000000000000000000000000000000..60fa78af8985b521701692f0aa7c94a5cbcea6b8
GIT binary patch
literal 1664
zcmV-`27md9P)<h;3K|Lk000e1NJLTq001)p002b@1^@s6=i1)(00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91GoS+i1ONa40RR91MF0Q*0J)!7Hvj+y>PbXFRA>e5T5D`nMHK#KcT0In
z8&Cmx8lqIR$iqkj3C5@dqwz=0qG%u~v_JHR3I5Xr*TzJR#>5z{DQ$xi5;P%-{Ln-r
zK5CFwQA}!iS)N*;R%zYRZg+dH-*CD1cDvjAm|1L-o#f`uojG&P`R1INd(PY|aJ87G
zDR#$D9SLEBD8NmofkL}a<$mcTV45l%tg!;<fj}#-9b0CjM#O}X&XqL4-k7<tUtll7
zxGkMP^;s8~G(8%}NASePT5-nN9+DQx6%eN&&GprZ0qizoX2{7mBwZ^P7I6y6MV+o&
zR(}@HIC+QU8gVv^r8<{lg;U><T<p$<F;zEF;&io;u3hW@m;_oTyfcmow(KDb$Zi~~
z_dFP{mMd8e%v|J^TAePU&LT612~&VYtAMG~fDT3h$-c~VI$Lw*W@V3Zb#ki4PX=zk
zPp8V+dF2Gmf~7$5%t4{^_&k07;B&5O+QCG|0ZV8JaV6>-RD0<|KqzNUZOPFNrmP&0
zfYQsPVxVMAdaK@Ntzc%|0^G15yMhZ>azmJry<fFQ8<-F|t)MHVyO&czK^p09@}7&L
z<i*qG0Q2quuAd7`D&m?5yQ^5ljp4zq+^$bqTlPh6+dY4|kMly|3(S=1!2D9+M!M1z
zzCXeRUPKJ1DPS};tHiowZ*R8+OummKxI}#T7%wfJz!Xjb9;gBeCwgJ&pJu{!z}zL)
zB}ZRs2O8f8QvLpTdGg*w572hVA7d5j;|Kf$k@7r&k%TQ@1MR=bT5ikHM&S3BU@|;|
zk?g<Q4aENrCdkXE^T&YJ{az?D)A#}-S?qt0L1Q8_GnLkVI)EQOQsLmk&1^Ap{WQ`-
z#(>?TeoyuS-+vHnoj9fYwu~Iyc@Fsbb3KQ9Oxw}4hwmB<?i&b<1l0B;aPEk#sg>5R
ztapqW7i)B2FmibJMRgV8o$5Sn4oYCg{dX>6v-5wCXgSfg<SKzF81G;C^brN41<W`d
zU^MWsCrHUMI$T5t4?SR9qUM1laG4SDNJXccd5W5|DU&HZmLHbl%um{W0*)VK1bm9w
z=grJ}?&KNTt-}*Dot9Ap<FJejaoUeFApIuo1xRogPFR;rCFU?6nonSpnH$NXV-vAB
z@$A8_1iA~({CVJ5GjQe?cMdWXI>GQ>URSbI9zn@mMpsb+^VvJWW3<k*42yW_JP%OX
z&2$8tGB(pyl)&gxLKmMr7+o`|n@`>{x@S}uzr1C1&7^KVdCTaYQC<A<mhm!^{7#cH
zQh1puK^6ZI%fYeXa4nPq&Ef2<7MlA~e-fJ>kBLuYOWkJkuqm*Iz-DI~qoZBFn;AHQ
z6qegSq>@|eMN@bpmeE2AC&}(`wSu8reat9$NqJ1PrHih3OLP>i#r+|HH`4obJ!^3@
zD%hV&VB7j?@#;v5MWaHVP(NE+X&z*)fk`NHPklw*GA91y!Noc^AWoI5wu=wVFz#j>
z6K#D(2@GB8FuyXFMq}bjzbX+>OHl-Oao5}DcWgHLKwzkVX{NCAR|Ct+pBL@fn7g${
zYem<VIy^!*eSw>Ua?TlK&GZ=wY>ifn8aHLV^a~-lbWmMiX*LfS*aZ{(mm^s5Wf_WX
zr$yH20^(G8^LFtm&*4_k>K@K{oFfP8p1}~rfkXt0xjvc(hwH6X)QGkjVU+R2W>*l-
z?ruh3Hu~}I`WMC1K?L|6^Kh-W%rQ?gYG~#ndYx|PuH#i9ZkCA;B(U*X0dWFn)bJ)<
z?p|IOob4mkvx6~lI%#0#W7Q&%$ww0EwXd>Hd>b;cjDUCs>RvK};rjTZw+o9mY!d;0
zFK`#^m11*)_+#oE+(SUFyXO#p<bV|2>NUR2pYtm0TF`ORk$=%VRa;>;@p!w2dwIrB
zR8Gru8NDbUZ9trpRn;JN@F&()ob=PqcDrtYF>uuE!_w$WR{mjkj>daMtvJNbkIM;&
ze<BPmAtQMuY%e8{lS8{k@6)EYMd#GDSVxz8rMR1$cfO4B8Tc2BXnt1WNk@|a0000<
KMNUMnLSTYlwgZ*`

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxxhdpi/support_faq.png b/Habitica/res/drawable-xxxhdpi/support_faq.png
new file mode 100644
index 0000000000000000000000000000000000000000..31081bedefb7c07c24d688cdbe0fdc54fddac076
GIT binary patch
literal 2184
zcma);`6CmIAICQfGq)whXv#gAW^;5fOp$20Zz5NF91&qTlOqorbA>0zM9w*uF~<xc
zM~9Lto{AhfLc(%<`Q`cf`@`$=et$mi_aE>{#G78_hloP}006&{A<pbjafdj7xen*2
zOz6=93^co{2dEx`EgYrpHbx#MCIF>F4+a3^y#dFLDu;+40sw#tfB?{;0*`J59RH=b
z0?>cn;i&k;==3fCz`bsS)3pczF6R;dI&J{#X%D=Q4Sk89GK=owR<Kb_fQw6<l@=lE
zJU*wu0}(Cm(n;9Yy?z~O7<2OU`8fEjw46dA7x*0xDzhEOp{r{lwJt)z_7@jE;`n6W
zK3sh7;$)zo$0}sY_~qxE&$&B;o}LkE8@Xem_}hc_BW_N}?-1mxpYyjk-|03P5Pq_R
znRN|vV@l_NAJlff?Y58o=zN_s>uOygK?bby8g)BVoNX>-4FjP(9m6m`cDpw`c+b`*
zF~Txf{rmAq1(k^!%rgxjNfjp$%u4$66iMHlHi5rHS^nPml33c`Eo<*E>|G{D^`LOX
zmH(aeCH@A+)tkP1>Agp<hses;D%e#9CfxP~=E}L^tKxVKpSW_YQYVYme`jB6EVqo*
zXsqdVtHsWWhY~LyIuXms_F1#nCWc;q-gD~r!26ZSm{PXPg^A4opO#y1(D`rFu;kKo
zV45j5P8;$|qR5N<)dj)(<GG3?gG2unaI6W7kq`MKJ~?nXz)6vSaw`Sog`cV5RbA@q
zg*1oD%3`@v0nJ+k#YJo!QQ!_w>H0tryzMtun-EL?5&{;D?2=)o*Ktj*gB`e0FTqdn
z77LS-C)srI9}%OL@V!-Fm|%)SFGI89^@_w!vxM~|h?RGx*0#)~+sUwlczZZ8ICU=q
zI#&%mwa53i&28z-%-hk|Pt%m{avH7x;7H)y%v(L|IN2iMF8n?pCq>$Xa;kUgxeE$T
z;3ZG>qGgsP9c!YQ`JI~8z2D4-Zdoq|S;ac+w^7mPm?|wu-WM;c6t5pc7mSfp&a(V6
z3^Cv(z^_}Y?=m|5wb&mNm+SO4^1o}{=<F8C_Q0Yl&0#MhSI=S(7}375?}p}4BZCHm
zUttQVf><fD#XI161%I}X|034h!YmR7>{|dC>gNc&FOi3*8q>m}G*RUl5>ex73sGk&
zor$f?4(HAJZ{UQ1uzpWwM(#-KFNF+4C9(1-M`zjfr1`B2Tq1PHE?wM<5BG*S^AQom
zd`ZLNiv?1mdt*kdKo{H98DXb+yr?8qCBWy_>t<L=UC+U>{V`!9pTM>D4c)wh8<A`y
z5J_oys;hc6J7V@sNl2N<_Wc`_ioR|F@Qmg5mn8hBth@`gk>TG}sab+dvKJ`ErEHG$
zYJ~jZ87R0?jZps!DE+7(cE!)p55kS#DG6O|v4V>jNIol4^mfr8*foIq7XLDJ*Z6MY
z!wdFodv0*?i9r6qi>1I@9#xWt#E01N+v$ltq@@M{nhBh1qUnvx_@JN>F`cB+9%9fe
zI26d1s-fT1hlLIliNZ7A2V{n=$WS8@_#mMt7jqb!Tr)BEr~I2`iUG+P!RXent<NP5
z=|T2QP0j-4DSN=BKb-jZEm~>x<>`Qwb;)p=ew1!3)K>$Gwplx&ITC&)+Hj7P$9b@)
z=KmX~Y^j$bwID!_cPJCzhF@l1nvoJw^u5OzkM0f1Zr)&$rbm@EO|sIp<;~up_s8|J
zrvnooN=4Wb9xUfk$fJG@ps|)1C>4>YD7@@DHaW8%bLn2qPHew55m^k4E2m2A+b?53
z=rz#%xf0g9P*@c9IL9?rbN&BM-7&Ejb3v03TEc$H*ko1ZyN5+&)sBK-?wgl(c-fgC
z>z}L-JFdkokvqzSMp<f#KUdcVF@1~ftRFM_OqAK{ak9?81kn}jCx4v!{H=Gk-Cfay
zj|s{76(pTLBwetKHn3}BF?XFAlFH<+s-a5+l=QuIa^QE;x2<(<fmVfdcgIwyhvZLh
zj+)N>f;5}+`&NT%5+yK{R}dFh<&(jiPIf9IB1I396O3(F9^ZsNm|}o{GdlKi>hgBV
z;~A}5+Lv&u;#-P6BP_7c36^UXJCyV&#yg_pk+G+lgUTJ_EH~8hwNw1noudDAt&a%e
z3JTXyPKdRn1r{<*C02;#>XWm&=^|3-zw^3sp3}AP8oGdbJKCnwe%ZFaOT$4!s(aki
ztKZkq%?InH*;s2YsXpr?EvA~>J0Sbj-x>Kz1k%WpOQJ9wmBjcQI^U<E21p+#{(gGy
zh10>wi4E9iUr*wL)ah#DX1;STHY9b4@GpVU>{o>B^B<8;L7+HCo$-v+ZPkDN?HD}H
z?$Q$C?E$;-CC}XnUzEud=|Sj(j;0Gk8mH%luVTFr>h~+U_bN|K_L1yzXl8i>L;BLr
z=?A!YIUbr$3O7eyNt-jud0?2-RE^ezWY)l1%(REgXRe3w@Y|A;ZQlhZx5wF(&057P
zE^u`^wTvOUl~$xr^~lX^FXz*vsEM$j=pv@Jdm|#vbZ#9~w_LB9hKIFULZRRuF^Mr6
zKN6zmenVa;*wI7zglE0{zl!Q>2EVsMhR%))iL`}nqITb$6XN}5r0{vAY2{k>r<rS1
z>f<TRHmH<6>yr>Kra=rkp~Oe59mCXYg`R(U_s`NAX~>U5k60`3FT6ASU0&Ngm26c0
z%~@IO4_zw&O)TKAz1IYcHR&p{CSZOCyxy<gP$X9JnFr;6%Sb9g;Bky~545#jJ-@dL
zH1r`&?~gLZ62O`zhKJQY33ivi_!tALnJM224JlN@r?TuN<68f1K;%*o(RUe3YbJBM
xu{%D0x<B98v$8UHH2YIRQ=@PIH+kaNKKH|{U-ea}dj6v?z{tQ9SFPs~^FQb}@Vfv2

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable/rounded_purple_dark_square.xml b/Habitica/res/drawable/rounded_purple_dark_square.xml
new file mode 100644
index 000000000..eebd55800
--- /dev/null
+++ b/Habitica/res/drawable/rounded_purple_dark_square.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <!-- view background color -->
+    <solid
+        android:color="@color/brand_300" >
+    </solid>
+
+    <!-- Here is the corner radius -->
+    <corners
+        android:radius="5dp"   >
+    </corners>
+
+</shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/support_info_lower_bg.xml b/Habitica/res/drawable/support_info_lower_bg.xml
new file mode 100644
index 000000000..709e8e69d
--- /dev/null
+++ b/Habitica/res/drawable/support_info_lower_bg.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <!-- view background color -->
+    <solid
+        android:color="@color/brand_300" >
+    </solid>
+
+    <!-- Here is the corner radius -->
+    <corners android:bottomLeftRadius="4dp" android:bottomRightRadius="4dp">
+    </corners>
+
+</shape>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_faq_detail.xml b/Habitica/res/layout/fragment_faq_detail.xml
deleted file mode 100644
index a322c7e9c..000000000
--- a/Habitica/res/layout/fragment_faq_detail.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:scrollbarSize="3dp"
-    android:scrollbarThumbVertical="@color/scrollbarThumb"
-    android:scrollbars="vertical">
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:id="@+id/questionTextView"
-            android:layout_gravity="center_horizontal"
-            android:padding="@dimen/card_padding"/>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/answerTextView"
-            android:layout_gravity="center_horizontal"
-            android:paddingLeft="@dimen/card_padding"
-            android:paddingStart="@dimen/card_padding"
-            android:paddingEnd="@dimen/card_padding"
-            android:paddingRight="@dimen/card_padding"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            />
-    </LinearLayout>
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_faq_overview.xml b/Habitica/res/layout/fragment_faq_overview.xml
new file mode 100644
index 000000000..025f232fe
--- /dev/null
+++ b/Habitica/res/layout/fragment_faq_overview.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:background="@color/white">
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/game_mechanics"
+        style="@style/SectionHeaderCaps"
+        android:layout_marginTop="@dimen/spacing_large"/>
+
+    <com.habitrpg.android.habitica.ui.views.SupportCollapsibleSection
+        android:id="@+id/health_section"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:subtitle="HP"
+        app:title="@string/health_points"
+        app:titleColor="@color/red_10"
+        android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
+        android:layout_marginBottom="@dimen/spacing_medium"
+        android:layout_marginTop="@dimen/spacing_medium"
+        app:description="@string/health_description"/>
+    <com.habitrpg.android.habitica.ui.views.SupportCollapsibleSection
+        android:id="@+id/experience_section"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:subtitle="EXP"
+        app:title="@string/experience_points"
+        app:titleColor="@color/yellow_50"
+        android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
+        android:layout_marginBottom="@dimen/spacing_medium"
+        app:description="@string/experience_description"/>
+    <com.habitrpg.android.habitica.ui.views.SupportCollapsibleSection
+        android:id="@+id/mana_section"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:subtitle="MP"
+        app:title="@string/mana_points"
+        app:titleColor="@color/blue_10"
+        android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
+        android:layout_marginBottom="@dimen/spacing_medium"
+        app:description="@string/mana_description"/>
+    <com.habitrpg.android.habitica.ui.views.SupportCollapsibleSection
+        android:id="@+id/gold_section"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:subtitle="@string/currency"
+        app:title="@string/gold_capitalilzed"
+        app:titleColor="@color/orange_10"
+        android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
+        android:layout_marginBottom="@dimen/spacing_medium"
+        app:description="@string/gold_description"/>
+    <com.habitrpg.android.habitica.ui.views.SupportCollapsibleSection
+        android:id="@+id/gems_section"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:subtitle="@string/premium_currency"
+        app:title="@string/gems"
+        app:titleColor="@color/teal_100"
+        android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
+        android:layout_marginBottom="@dimen/spacing_medium"
+        app:description="@string/gems_description"/>
+    <com.habitrpg.android.habitica.ui.views.SupportCollapsibleSection
+        android:id="@+id/hourglasses_section"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:subtitle="@string/subscriber_currency"
+        app:title="@string/mystic_hourglasses"
+        app:titleColor="@color/brand_300"
+        android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
+        android:layout_marginBottom="@dimen/spacing_medium"
+        app:description="@string/hourglasses_description"/>
+    <com.habitrpg.android.habitica.ui.views.SupportCollapsibleSection
+        android:id="@+id/stats_section"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:subtitle="STR, CON, INT, PER"
+        app:title="@string/stat_allocation"
+        app:titleColor="#7f3300"
+        android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
+        android:layout_marginBottom="@dimen/spacing_medium"
+        app:description="@string/stat_description"/>
+
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/common_questions"
+        style="@style/SectionHeaderCaps"
+        android:layout_marginTop="@dimen/spacing_large"/>
+    <LinearLayout
+        android:id="@+id/faq_linear_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" />
+    <TextView
+        android:id="@+id/more_help_text_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/spacing_large"
+        android:paddingTop="@dimen/spacing_large"
+        android:paddingStart="@dimen/spacing_large"
+        android:paddingEnd="@dimen/spacing_large"
+        android:paddingBottom="@dimen/spacing_large"
+        android:background="@color/gray_700"/>
+</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_support_bug_fix.xml b/Habitica/res/layout/fragment_support_bug_fix.xml
new file mode 100644
index 000000000..8fe130ffc
--- /dev/null
+++ b/Habitica/res/layout/fragment_support_bug_fix.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white">
+<TextView
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:text="@string/support_bug_title"
+    android:textSize="13sp"
+    android:textColor="@color/gray_200"
+    android:paddingTop="13dp"
+    android:paddingBottom="13dp"
+    android:paddingStart="24dp"
+    android:paddingEnd="24dp"
+    android:layout_margin="@dimen/spacing_medium"
+    android:gravity="center"
+    android:background="@color/gray_700"/>
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/common_fixes"
+        android:layout_marginStart="@dimen/spacing_large"
+        style="@style/SectionHeaderCaps"
+        />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="12dp"
+        android:orientation="vertical"
+        android:background="@drawable/layout_rounded_bg_gray_700"
+        android:layout_margin="@dimen/spacing_medium">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/clear_cache"
+            android:textColor="@color/black"
+            style="@style/Body1"
+            android:layout_marginBottom="4dp"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/clear_cache_description"
+            style="@style/Body2"/>
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="12dp"
+        android:orientation="vertical"
+        android:background="@drawable/layout_rounded_bg_gray_700"
+        android:layout_margin="@dimen/spacing_medium">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/manual_sync_restart"
+            android:textColor="@color/black"
+            style="@style/Body1"
+            android:layout_marginBottom="4dp"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/manual_sync_restart_description"
+            style="@style/Body2"/>
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="12dp"
+        android:orientation="vertical"
+        android:background="@drawable/layout_rounded_bg_gray_700"
+        android:layout_margin="@dimen/spacing_medium">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/update_app"
+            android:textColor="@color/black"
+            style="@style/Body1"
+            android:layout_marginBottom="4dp"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/update_app_description"
+            style="@style/Body2"/>
+    </LinearLayout>
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/need_more_help"
+        android:gravity="center"
+        android:textStyle="bold"
+        android:textColor="@color/brand_300"
+        android:textSize="16sp"
+        android:layout_marginTop="@dimen/spacing_large"
+        />
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/send_bug_prompt"
+        android:textColor="@color/gray_300"
+        android:gravity="center"
+        android:textSize="14sp"
+        android:layout_marginTop="@dimen/spacing_small"
+        android:layout_marginBottom="@dimen/spacing_large"/>
+    <Button
+        android:id="@+id/report_bug_button"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        style="@style/HabiticaButton.Purple"
+        android:text="@string/report_bug"
+        android:elevation="0dp"
+        android:layout_marginStart="@dimen/spacing_large"
+        android:layout_marginEnd="@dimen/spacing_large" />
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_support_main.xml b/Habitica/res/layout/fragment_support_main.xml
new file mode 100644
index 000000000..dcce5be30
--- /dev/null
+++ b/Habitica/res/layout/fragment_support_main.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/layout_rounded_bg_gray_700">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:background="@color/white"
+        android:paddingTop="@dimen/spacing_large"
+        android:paddingBottom="@dimen/spacing_large">
+        <LinearLayout
+            android:id="@+id/using_habitica_wrapper"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/spacing_large"
+            android:layout_marginEnd="@dimen/spacing_large"
+            android:gravity="center_horizontal"
+            android:paddingTop="@dimen/spacing_large"
+            android:background="@drawable/layout_rounded_bg_gray_700"
+            android:orientation="vertical">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/using_habitica"
+                android:layout_marginStart="@dimen/spacing_large"
+                android:layout_marginEnd="@dimen/spacing_large"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:textColor="@color/brand_300"
+                />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/using_habitica_description"
+                android:textSize="12sp"
+                android:textColor="@color/gray_300"
+                android:layout_marginStart="40dp"
+                android:layout_marginEnd="40dp"
+                android:gravity="center"
+                android:layout_marginTop="4dp"
+                android:layout_marginBottom="10dp"
+                />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:text="@string/lets_go"
+                android:gravity="center"
+                android:layout_marginStart="@dimen/spacing_large"
+                android:layout_marginEnd="@dimen/spacing_large"
+                android:background="@drawable/support_info_lower_bg"
+                android:textColor="@color/white"
+                android:textAllCaps="true"
+                android:textStyle="bold"
+                android:textSize="12sp"
+                />
+        </LinearLayout>
+        <LinearLayout
+            android:id="@+id/bugs_fixes_wrapper"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/spacing_large"
+            android:layout_marginEnd="@dimen/spacing_large"
+            android:gravity="center_horizontal"
+            android:paddingTop="@dimen/spacing_large"
+            android:layout_marginTop="@dimen/spacing_medium"
+            android:background="@drawable/layout_rounded_bg_gray_700"
+            android:orientation="vertical">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/bugs_fixes"
+                android:layout_marginStart="@dimen/spacing_large"
+                android:layout_marginEnd="@dimen/spacing_large"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:textColor="@color/brand_300"
+                />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/bugs_fixes_description"
+                android:textSize="12sp"
+                android:textColor="@color/gray_300"
+                android:layout_marginStart="40dp"
+                android:layout_marginEnd="40dp"
+                android:gravity="center"
+                android:layout_marginTop="4dp"
+                android:layout_marginBottom="10dp"
+                />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:text="@string/get_help"
+                android:gravity="center"
+                android:layout_marginStart="@dimen/spacing_large"
+                android:layout_marginEnd="@dimen/spacing_large"
+                android:background="@drawable/support_info_lower_bg"
+                android:textColor="@color/white"
+                android:textAllCaps="true"
+                android:textStyle="bold"
+                android:textSize="12sp"
+                />
+        </LinearLayout>
+        <LinearLayout
+            android:id="@+id/suggestions_feedback_wrapper"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/spacing_medium"
+            android:layout_marginStart="@dimen/spacing_large"
+            android:layout_marginEnd="@dimen/spacing_large"
+            android:background="@drawable/layout_rounded_bg_gray_700"
+            android:gravity="center_horizontal"
+            android:paddingTop="@dimen/spacing_large"
+            android:orientation="vertical">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/suggestions_feedback"
+                android:layout_marginStart="@dimen/spacing_large"
+                android:layout_marginEnd="@dimen/spacing_large"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:textColor="@color/brand_300"
+                />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/suggestions_feedback_description"
+                android:textSize="12sp"
+                android:textColor="@color/gray_300"
+                android:layout_marginStart="40dp"
+                android:layout_marginEnd="40dp"
+                android:gravity="center"
+                android:layout_marginTop="4dp"
+                android:layout_marginBottom="10dp"
+                />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:text="@string/contact_us"
+                android:gravity="center"
+                android:layout_marginStart="@dimen/spacing_large"
+                android:layout_marginEnd="@dimen/spacing_large"
+                android:background="@drawable/support_info_lower_bg"
+                android:textColor="@color/white"
+                android:textStyle="bold"
+                android:textAllCaps="true"
+                android:textSize="12sp"
+                />
+        </LinearLayout>
+    </LinearLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/gray_500"/>
+    <Button
+        android:id="@+id/reset_tutorial_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/HabiticaButton.Blue"
+        android:text="@string/reset_walkthrough"
+        android:layout_margin="@dimen/spacing_large"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/support_collapsible_section.xml b/Habitica/res/layout/support_collapsible_section.xml
new file mode 100644
index 000000000..d2a0216aa
--- /dev/null
+++ b/Habitica/res/layout/support_collapsible_section.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:parentTag="android.widget.LinearLayout">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/spacing_medium"
+        android:layout_marginBottom="@dimen/spacing_medium"
+        android:gravity="center_vertical">
+        <ImageView
+            android:id="@+id/icon_view"
+            android:layout_width="28dp"
+            android:layout_height="28dp"
+            android:layout_marginStart="@dimen/spacing_large"
+            android:layout_marginEnd="@dimen/spacing_large"
+            />
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <TextView
+                android:id="@+id/title_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="14sp"
+                android:textStyle="bold"
+                tools:text="Title"/>
+            <TextView
+                android:id="@+id/subtitle_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/gray_200"
+                android:textSize="14sp"
+                tools:text="Subtitle" />
+        </LinearLayout>
+        <Space
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content" />
+        <ImageView
+            android:id="@+id/caret_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_keyboard_arrow_down_black_24dp"
+            android:layout_marginEnd="@dimen/spacing_large"/>
+    </LinearLayout>
+    <TextView android:id="@+id/description_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/spacing_large"
+        android:layout_marginEnd="@dimen/spacing_large"
+        android:layout_marginTop="@dimen/spacing_medium"
+        android:layout_marginBottom="12dp"
+        android:visibility="gone"
+        />
+</merge>
\ No newline at end of file
diff --git a/Habitica/res/layout/support_faq_item.xml b/Habitica/res/layout/support_faq_item.xml
new file mode 100644
index 000000000..8d78e746b
--- /dev/null
+++ b/Habitica/res/layout/support_faq_item.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:minHeight="40dp">
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/support_faq"
+        android:layout_marginLeft="26dp"
+        android:layout_marginRight="29dp"/>
+    <TextView
+        android:id="@+id/text_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="14sp"
+        android:textColor="@color/gray_100"
+        tools:text="Title"
+        android:layout_marginRight="@dimen/spacing_large"
+        android:layout_marginTop="@dimen/spacing_medium"
+        android:layout_marginBottom="@dimen/spacing_medium"
+        />
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/navigation/navigation.xml b/Habitica/res/navigation/navigation.xml
index ea8c338c2..09414ef2d 100644
--- a/Habitica/res/navigation/navigation.xml
+++ b/Habitica/res/navigation/navigation.xml
@@ -202,12 +202,9 @@
         android:label="@string/sidebar_news" />
     <fragment
         android:id="@+id/FAQOverviewFragment"
-        android:name="com.habitrpg.android.habitica.ui.fragments.faq.FAQOverviewFragment"
+        android:name="com.habitrpg.android.habitica.ui.fragments.support.FAQOverviewFragment"
         android:label="@string/sidebar_help" >
         <deepLink app:uri="habitica.com/static/faq" />
-        <action
-            android:id="@+id/openFAQDetail"
-            app:destination="@id/FAQDetailFragment" />
     </fragment>
     <fragment
         android:id="@+id/aboutFragment"
@@ -246,14 +243,6 @@
             android:id="@+id/openGuildDetail"
             app:destination="@id/guildFragment" />
     </fragment>
-    <fragment
-        android:id="@+id/FAQDetailFragment"
-        android:name="com.habitrpg.android.habitica.ui.fragments.faq.FAQDetailFragment"
-        android:label="@string/sidebar_help" >
-        <argument
-            android:name="position"
-            app:argType="integer" />
-    </fragment>
     <fragment
         android:id="@+id/avatarCustomizationFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarCustomizationFragment"
@@ -403,4 +392,16 @@
         android:id="@+id/timeTravelersShopFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.inventory.shops.TimeTravelersShopFragment"
         android:label="@string/timeTravelers" />
+    <fragment
+        android:id="@+id/supportMainFragment"
+        android:name="com.habitrpg.android.habitica.ui.fragments.support.SupportMainFragment"
+        android:label="SupportMainFragment" >
+        <action
+            android:id="@+id/showFAQFragment"
+            app:destination="@id/FAQOverviewFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/bugFixFragment"
+        android:name="com.habitrpg.android.habitica.ui.fragments.support.BugFixFragment"
+        android:label="BugFixFragment" />
 </navigation>
\ No newline at end of file
diff --git a/Habitica/res/values/attrs.xml b/Habitica/res/values/attrs.xml
index 4dd467210..3893f1ae4 100644
--- a/Habitica/res/values/attrs.xml
+++ b/Habitica/res/values/attrs.xml
@@ -14,6 +14,7 @@
     <attr name="statsColor" format="color" />
     <attr name="statsTitle" format="string" />
     <attr name="title" format="string" />
+    <attr name="description" format="string" />
     <attr name="iconDrawable" format="integer" />
     <attr name="identifier" format="string" />
     <attr name="hasLightBackground" format="boolean" />
@@ -61,7 +62,7 @@
         <attr name="barIconDrawable" format="integer" />
         <attr name="barHeight" format="dimension" />
         <attr name="lightBackground" format="boolean" />
-        <attr name="description" format="string" />
+        <attr name="description" />
         <attr name="labelSpacing" format="dimension" />
     </declare-styleable>
     <declare-styleable name="HabiticaProgressBar">
@@ -129,4 +130,11 @@
     <declare-styleable name="EquipmentOverviewItem">
         <attr name="title" />
     </declare-styleable>
+    <declare-styleable name="SupportCollapsibleSection">
+        <attr name="title" />
+        <attr name="titleColor" format="color" />
+        <attr name="subtitle" format="string" />
+        <attr name="description" />
+        <attr name="iconDrawable" />
+    </declare-styleable>
 </resources>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 600388fc8..61d8df76b 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -344,6 +344,7 @@
     <string name="create_account_short">create an account</string>
     <string name="successful_purchase">Purchased %1$s</string>
     <string name="gold_plural">gold</string>
+    <string name="gold_capitalilzed">Gold</string>
     <string name="chat_message_copied">Message copied to Clipboard</string>
     <string name="edit_tag_btn_edit">Edit</string>
     <string name="confirm_delete_tag_title">Are you sure?</string>
@@ -954,7 +955,45 @@
     <string name="unlock_level_short">Level %d</string>
     <string name="not_participating">You are not participating</string>
     <string name="quest_completed">Quest completed!</string>
+    <string name="using_habitica">Using Habitica</string>
+    <string name="using_habitica_description">Confused? We’ll go over the basics to get you up to speed.</string>
+    <string name="suggestions_feedback_description">Have input on how features could work better or an idea for something new? Tell us!</string>
+    <string name="contact_us">Contact Us</string>
+    <string name="get_help">Get Help</string>
+    <string name="suggestions_feedback"><![CDATA[Suggestions & Feedback]]></string>
+    <string name="bugs_fixes"><![CDATA[Bugs & Fixes]]></string>
+    <string name="bugs_fixes_description">Did something go wrong? Check for answers here or reach out to us for help.</string>
+    <string name="lets_go">Let\'s Go</string>
+    <string name="support_bug_title">We’re constantly trying to make our apps better based on player feedback but sometimes a few bugs pop up…</string>
+    <string name="common_fixes">Common Fixes</string>
+    <string name="send_bug_prompt">Send a bug report to us and we’ll get back to you!</string>
+    <string name="overview">Overview</string>
+    <string name="how_best_habitica">Not sure how to best use Habitica?</string>
+    <string name="stats_currency"><![CDATA[Stats & Currency]]></string>
+    <string name="health_points">Health Points</string>
+    <string name="health_description">This represents your avatars life. Missing a Daily or doing a negative Habit **reduces your HP**.\n\n**Regain HP** by completing tasks, using a Health Potion, or a healing ability.\n\nIf your **HP reaches 0** your avatar will pass out (lose a level, all Gold, and one piece of equipment). Lost equipment can be re-purchased.</string>
+    <string name="experience_points">Experience Points</string>
+    <string name="experience_description">Experience points represent your progress and allows you to level up. You’ll mainly **gain EXP** from completing tasks or quests.\n\nHigher difficulty or red colored tasks will give you **more EXP**. The **Intelligence** stat also raises your EXP gain.</string>
+    <string name="mana_points">Mana Points</string>
+    <string name="gold_description">Gold is the **main form of currency** within Habitica and allows you to buy certain gear, quests, items, or even custom rewards you make for yourself.\n\n**Earn Gold** through completing tasks or quests. **Perception** raises the amount of Gold you earn. Rogue’s can also use an ability to get more Gold.\n\nIf you subscribe to Habitica, you can even use Gold to purchase Gems.</string>
+    <string name="mana_description">Mana points are unlocked with the class system at level 10 and allow you to **use Skills**.\n\nSome **MP is restored** naturally every day, but you can regain more by completing tasks or using a Mage ability.</string>
+    <string name="stat_allocation">Stat Allocation</string>
+    <string name="stat_description">All Habitica characters have four stats that affect the gameplay aspects of Habitica.\n\n**Strength (STR)** affects critical hits and raises damage done to a Quest Boss. Mainly for Warriors and Rogues.\n\n**Constitution (CON)** raises your HP and makes you take less damage. Mainly for Healers and Warriors.\n\n**Intelligence (INT)** raises the amount of EXP you earn and gives you more Mana. Mainly for Mages and Healers.\n\n**Perception (PER)** increases the gold you earn and the rate of finding items. Mainly for Rogues and Mages.\nnAfter level 10, you earn 1 Stat Point every level you gain that you can put into any stat you’d like. You can also equip gear that has different combinations of stat boosts.</string>
 
     <string name="standard"> Standard </string>
+    <string name="premium_currency">Premium Currency</string>
+    <string name="currency">Currency</string>
+    <string name="gems_description">Gems are a currency purchased with real money that allow you to buy extra content within Habitica and are one of the main source of financial support for the Habitica team alongside subscriptions.\n\nAll content purchased through Gems is purely cosmetic or can be obtained for free with time.\n\nYou can also receive Gems through gifts, Challenge prizes, contributing work to Habitica, or subscribing.</string>
+    <string name="common_questions">Common Questions</string>
+    <string name="game_mechanics">Game Mechanics</string>
+    <string name="subscriber_currency">Subscriber Currency</string>
+    <string name="mystic_hourglasses">Mystic Hourglasses</string>
+    <string name="hourglasses_description">Mystic Hourglasses are an extremely rare form of currency you can only receive for subscribing to Habitica. They are used in the Time Traveler’s shop to buy past gear sets, pets, mounts, animated backgrounds, or even special quests.\n\nYou can receive up to four Mystic Hourglasses a year. The time they are rewarded is based on your subscription renewal schedule. They are sent out on the first day of a new month after your last subscription payment that qualified you for an hourglass. See the [Subscription] page for more details.</string>
+    <string name="clear_cache">Clear your Cache</string>
+    <string name="clear_cache_description"><![CDATA[To clear your cache, open your phone’s Settings app. Go to Storage > Apps >  Habitica, then tap Clear Cache.]]></string>
+    <string name="manual_sync_restart">Manual Sync or Restart</string>
+    <string name="manual_sync_restart_description">Sometimes the app won’t automatically update content. Try pulling to refresh or force closing the app and reopening it.</string>
+    <string name="update_app">Update the App</string>
+    <string name="update_app_description">We’re constantly pushing out new fixes, so be sure to check the Play Store to see if there are any updates available.</string>
     <string name="wacky"> Wacky </string>
 </resources>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index b6b545f14..08a53f02a 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -293,6 +293,13 @@
         <item name="android:paddingTop">@dimen/section_top_padding</item>
     </style>
 
+    <style name="SectionHeaderCaps">
+        <item name="android:textSize">10sp</item>
+        <item name="android:textColor">@color/gray_200</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:layout_marginStart">@dimen/spacing_large</item>
+    </style>
+
     <style name="BottomMenu">
         <item name="android:divider">?android:listDivider</item>
         <item name="android:showDividers">middle</item>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
index 9188749dc..cba5512de 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
@@ -42,16 +42,9 @@ import com.habitrpg.android.habitica.ui.adapter.tasks.RewardsRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.adapter.tasks.TodosRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.AboutFragment;
 import com.habitrpg.android.habitica.ui.fragments.AchievementsFragment;
-import com.habitrpg.android.habitica.ui.fragments.preferences.EmailNotificationsPreferencesFragment;
-import com.habitrpg.android.habitica.ui.fragments.purchases.GemsPurchaseFragment;
 import com.habitrpg.android.habitica.ui.fragments.NavigationDrawerFragment;
 import com.habitrpg.android.habitica.ui.fragments.NewsFragment;
 import com.habitrpg.android.habitica.ui.fragments.StatsFragment;
-import com.habitrpg.android.habitica.ui.fragments.purchases.GiftBalanceGemsFragment;
-import com.habitrpg.android.habitica.ui.fragments.purchases.GiftPurchaseGemsFragment;
-import com.habitrpg.android.habitica.ui.fragments.purchases.SubscriptionFragment;
-import com.habitrpg.android.habitica.ui.fragments.faq.FAQDetailFragment;
-import com.habitrpg.android.habitica.ui.fragments.faq.FAQOverviewFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarCustomizationFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarOverviewFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentDetailFragment;
@@ -66,9 +59,14 @@ import com.habitrpg.android.habitica.ui.fragments.inventory.stable.StableFragmen
 import com.habitrpg.android.habitica.ui.fragments.inventory.stable.StableRecyclerFragment;
 import com.habitrpg.android.habitica.ui.fragments.preferences.APIPreferenceFragment;
 import com.habitrpg.android.habitica.ui.fragments.preferences.AuthenticationPreferenceFragment;
+import com.habitrpg.android.habitica.ui.fragments.preferences.EmailNotificationsPreferencesFragment;
 import com.habitrpg.android.habitica.ui.fragments.preferences.PreferencesFragment;
 import com.habitrpg.android.habitica.ui.fragments.preferences.ProfilePreferencesFragment;
 import com.habitrpg.android.habitica.ui.fragments.preferences.PushNotificationsPreferencesFragment;
+import com.habitrpg.android.habitica.ui.fragments.purchases.GemsPurchaseFragment;
+import com.habitrpg.android.habitica.ui.fragments.purchases.GiftBalanceGemsFragment;
+import com.habitrpg.android.habitica.ui.fragments.purchases.GiftPurchaseGemsFragment;
+import com.habitrpg.android.habitica.ui.fragments.purchases.SubscriptionFragment;
 import com.habitrpg.android.habitica.ui.fragments.setup.AvatarSetupFragment;
 import com.habitrpg.android.habitica.ui.fragments.setup.IntroFragment;
 import com.habitrpg.android.habitica.ui.fragments.setup.TaskSetupFragment;
@@ -77,12 +75,12 @@ import com.habitrpg.android.habitica.ui.fragments.skills.SkillTasksRecyclerViewF
 import com.habitrpg.android.habitica.ui.fragments.skills.SkillsFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.ChatFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.ChatListFragment;
-import com.habitrpg.android.habitica.ui.fragments.social.NoPartyFragmentFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.GuildDetailFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.GuildFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.GuildsOverviewFragment;
-import com.habitrpg.android.habitica.ui.fragments.social.InboxOverviewFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.InboxMessageListFragment;
+import com.habitrpg.android.habitica.ui.fragments.social.InboxOverviewFragment;
+import com.habitrpg.android.habitica.ui.fragments.social.NoPartyFragmentFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.PublicGuildsFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.QuestDetailFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.TavernDetailFragment;
@@ -93,6 +91,9 @@ import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengesOv
 import com.habitrpg.android.habitica.ui.fragments.social.party.PartyDetailFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.party.PartyFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.party.PartyInviteFragment;
+import com.habitrpg.android.habitica.ui.fragments.support.BugFixFragment;
+import com.habitrpg.android.habitica.ui.fragments.support.FAQOverviewFragment;
+import com.habitrpg.android.habitica.ui.fragments.support.SupportMainFragment;
 import com.habitrpg.android.habitica.ui.fragments.tasks.TaskRecyclerViewFragment;
 import com.habitrpg.android.habitica.ui.fragments.tasks.TasksFragment;
 import com.habitrpg.android.habitica.ui.viewmodels.GroupViewModel;
@@ -146,8 +147,6 @@ public interface UserComponent {
 
     void inject(TasksFragment tasksFragment);
 
-    void inject(FAQDetailFragment faqDetailFragment);
-
     void inject(FAQOverviewFragment faqOverviewFragment);
 
     void inject(AvatarCustomizationFragment avatarCustomizationFragment);
@@ -331,4 +330,8 @@ public interface UserComponent {
     void inject(@NotNull GiftBalanceGemsFragment giftBalanceGemsFragment);
 
     void inject(@NotNull EmailNotificationsPreferencesFragment emailNotificationsPreferencesFragment);
+
+    void inject(@NotNull SupportMainFragment supportMainFragment);
+
+    void inject(@NotNull BugFixFragment bugFixFragment);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/FAQOverviewRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/FAQOverviewRecyclerAdapter.kt
deleted file mode 100644
index c09cc09b6..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/FAQOverviewRecyclerAdapter.kt
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.habitrpg.android.habitica.ui.adapter
-
-import android.text.method.LinkMovementMethod
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Button
-import android.widget.TextView
-import androidx.core.os.bundleOf
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.models.FAQArticle
-import com.habitrpg.android.habitica.ui.activities.MainActivity
-import com.habitrpg.android.habitica.ui.fragments.faq.FAQOverviewFragmentDirections
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.helpers.setMarkdown
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
-
-class FAQOverviewRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
-
-    var activity: MainActivity? = null
-    private var articles: List<FAQArticle> = emptyList()
-
-    private val resetWalkthroughEvents = PublishSubject.create<String>()
-
-    fun setArticles(articles: List<FAQArticle>) {
-        this.articles = articles
-        this.notifyDataSetChanged()
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder {
-        return when (viewType) {
-            VIEW_TYPE_JUSTIN -> {
-                val view = LayoutInflater.from(parent.context).inflate(R.layout.button_list_item, parent, false)
-                ResetWalkthroughViewHolder(view)
-            }
-            VIEW_TYPE_HEADER -> {
-                val view = LayoutInflater.from(parent.context).inflate(R.layout.help_header, parent, false)
-                HeaderViewHolder(view)
-            }
-            else -> {
-                val view = LayoutInflater.from(parent.context)
-                        .inflate(R.layout.plain_list_item, parent, false)
-                FAQArticleViewHolder(view)
-            }
-        }
-    }
-
-    override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) {
-        if (getItemViewType(position) == VIEW_TYPE_FAQ) {
-            (holder as? FAQArticleViewHolder)?.bind(articles[position - 1])
-        }
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        return when (position) {
-            0 -> VIEW_TYPE_HEADER
-            articles.size+1 -> VIEW_TYPE_JUSTIN
-            else -> VIEW_TYPE_FAQ
-        }
-    }
-
-    override fun getItemCount(): Int {
-        return this.articles.size + 2
-    }
-
-    fun getResetWalkthroughEvents(): Flowable<String> {
-        return resetWalkthroughEvents.toFlowable(BackpressureStrategy.DROP)
-    }
-
-    internal inner class FAQArticleViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener {
-
-        private val textView: TextView by bindView(itemView, R.id.textView)
-
-        private var article: FAQArticle? = null
-
-        init {
-            textView.setOnClickListener(this)
-        }
-
-        fun bind(article: FAQArticle) {
-            this.article = article
-            this.textView.text = this.article?.question
-        }
-
-        override fun onClick(v: View) {
-            article?.position?.let {
-                MainNavigationController.navigate(FAQOverviewFragmentDirections.openFAQDetail(it))
-            }
-        }
-    }
-
-    private inner class ResetWalkthroughViewHolder internal constructor(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
-
-        init {
-            val button = itemView as? Button
-            button?.text = itemView.context.getString(R.string.reset_walkthrough)
-            button?.setOnClickListener { resetWalkthroughEvents.onNext("") }
-        }
-    }
-
-    private inner class HeaderViewHolder internal constructor(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
-
-        init {
-            val textView = itemView.findViewById<TextView>(R.id.text_view)
-            textView.setMarkdown(itemView.context.getString(R.string.need_help_header_description, "[Habitica Help Guild](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)"))
-            textView.setOnClickListener { MainNavigationController.navigate(R.id.guildFragment, bundleOf("groupID" to "5481ccf3-5d2d-48a9-a871-70a7380cee5a")) }
-            textView.movementMethod = LinkMovementMethod.getInstance()
-        }
-    }
-
-    companion object {
-
-        private const val VIEW_TYPE_JUSTIN = 0
-        private const val VIEW_TYPE_HEADER = 1
-        private const val VIEW_TYPE_FAQ = 2
-    }
-}
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 c30887aa8..b2039953a 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
@@ -323,7 +323,7 @@ class NavigationDrawerFragment : DialogFragment() {
             items.add(HabiticaDrawerItem(R.id.subscriptionPurchaseActivity, SIDEBAR_SUBSCRIPTION, context.getString(R.string.sidebar_subscription), isHeader = false))
             items.add(HabiticaDrawerItem(0, SIDEBAR_ABOUT_HEADER, context.getString(R.string.sidebar_about), true))
             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.supportMainFragment, SIDEBAR_HELP, context.getString(R.string.sidebar_help)))
             items.add(HabiticaDrawerItem(R.id.aboutFragment, SIDEBAR_ABOUT, context.getString(R.string.sidebar_about)))
         }
         if (configManager.enableGiftOneGetOne()) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQDetailFragment.kt
deleted file mode 100644
index c5add4974..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQDetailFragment.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.habitrpg.android.habitica.ui.fragments.faq
-
-import android.os.Bundle
-import android.text.method.LinkMovementMethod
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.components.UserComponent
-import com.habitrpg.android.habitica.data.FAQRepository
-import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
-import com.habitrpg.android.habitica.ui.helpers.bindOptionalView
-import com.habitrpg.android.habitica.ui.helpers.resetViews
-import io.reactivex.functions.Consumer
-import javax.inject.Inject
-
-class FAQDetailFragment : BaseMainFragment() {
-    @Inject
-    lateinit var faqRepository: FAQRepository
-
-    private val questionTextView: TextView? by bindOptionalView(R.id.questionTextView)
-    private val answerTextView: TextView? by bindOptionalView(R.id.answerTextView)
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-        return container?.inflate(R.layout.fragment_faq_detail)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        resetViews()
-
-        arguments?.let {
-            val args = FAQDetailFragmentArgs.fromBundle(it)
-            compositeSubscription.add(faqRepository.getArticle(args.position).subscribe(Consumer { faq ->
-                this.questionTextView?.text = faq.question
-                this.answerTextView?.text = MarkdownParser.parseMarkdown(faq.answer)
-            }, RxErrorHandler.handleEmptyError()))
-        }
-
-        this.answerTextView?.movementMethod = LinkMovementMethod.getInstance()
-    }
-
-    override fun injectFragment(component: UserComponent) {
-        component.inject(this)
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.kt
deleted file mode 100644
index d33515826..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.habitrpg.android.habitica.ui.fragments.faq
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.components.UserComponent
-import com.habitrpg.android.habitica.data.FAQRepository
-import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.ui.adapter.FAQOverviewRecyclerAdapter
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.helpers.resetViews
-import io.reactivex.functions.Consumer
-import javax.inject.Inject
-
-class FAQOverviewFragment : BaseMainFragment() {
-    @Inject
-    lateinit var faqRepository: FAQRepository
-
-    private val recyclerView: androidx.recyclerview.widget.RecyclerView? by bindView(R.id.recyclerView)
-
-    internal var adapter: FAQOverviewRecyclerAdapter? = null
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                              savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-        return container?.inflate(R.layout.fragment_recyclerview)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        resetViews()
-
-        adapter = FAQOverviewRecyclerAdapter()
-        adapter?.getResetWalkthroughEvents()?.subscribe(Consumer { this.userRepository.resetTutorial(user) }, RxErrorHandler.handleEmptyError())?.let { compositeSubscription.add(it) }
-        adapter?.activity = activity
-        recyclerView?.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(activity)
-        activity?.let { recyclerView?.addItemDecoration(androidx.recyclerview.widget.DividerItemDecoration(it, androidx.recyclerview.widget.DividerItemDecoration.VERTICAL)) }
-        recyclerView?.adapter = adapter
-        recyclerView?.itemAnimator = SafeDefaultItemAnimator()
-        this.loadArticles()
-    }
-
-    override fun onDestroy() {
-        faqRepository.close()
-        super.onDestroy()
-    }
-
-    override fun injectFragment(component: UserComponent) {
-        component.inject(this)
-    }
-
-    private fun loadArticles() {
-        if (adapter == null) {
-            return
-        }
-        compositeSubscription.add(faqRepository.getArticles().subscribe(Consumer { adapter?.setArticles(it) }, RxErrorHandler.handleEmptyError()))
-    }
-
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt
new file mode 100644
index 000000000..38b437def
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt
@@ -0,0 +1,109 @@
+package com.habitrpg.android.habitica.ui.fragments.support
+
+import android.content.pm.PackageManager
+import android.os.Build
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.app.ShareCompat
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.components.UserComponent
+import com.habitrpg.android.habitica.databinding.FragmentSupportBugFixBinding
+import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.AppTestingLevel
+import com.habitrpg.android.habitica.helpers.DeviceName
+import com.habitrpg.android.habitica.modules.AppModule
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import io.reactivex.Completable
+import javax.inject.Inject
+import javax.inject.Named
+
+class BugFixFragment: BaseMainFragment() {
+    private var deviceInfo: DeviceName.DeviceInfo? = null
+
+    private lateinit var binding: FragmentSupportBugFixBinding
+
+    @field:[Inject Named(AppModule.NAMED_USER_ID)]
+    lateinit var userId: String
+    @Inject
+    lateinit var appConfigManager: AppConfigManager
+
+    override fun injectFragment(component: UserComponent) {
+        component.inject(this)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        hidesToolbar = true
+        super.onCreateView(inflater, container, savedInstanceState)
+        binding = FragmentSupportBugFixBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        compositeSubscription.add(Completable.fromAction {
+            deviceInfo = DeviceName.getDeviceInfo(context)
+        }.subscribe())
+
+        binding.reportBugButton.setOnClickListener {
+            sendEmail("[Android] Bugreport")
+        }
+    }
+
+    private val versionName: String by lazy {
+        try {
+            @Suppress("DEPRECATION")
+            activity?.packageManager?.getPackageInfo(activity?.packageName, 0)?.versionName ?: ""
+        } catch (e: PackageManager.NameNotFoundException) {
+            ""
+        }
+    }
+
+    private val versionCode: Int by lazy {
+        try {
+            @Suppress("DEPRECATION")
+            activity?.packageManager?.getPackageInfo(activity?.packageName, 0)?.versionCode ?: 0
+        } catch (e: PackageManager.NameNotFoundException) {
+            0
+        }
+    }
+
+    private fun sendEmail(subject: String) {
+        val version = Build.VERSION.SDK_INT
+        val deviceName = deviceInfo?.name ?: DeviceName.getDeviceName()
+        val manufacturer = deviceInfo?.manufacturer ?: Build.MANUFACTURER
+        var bodyOfEmail = "Device: $manufacturer $deviceName" +
+                " \nAndroid Version: $version"+
+                " \nAppVersion: " + getString(R.string.version_info, versionName, versionCode)
+
+        if (appConfigManager.testingLevel().name != AppTestingLevel.PRODUCTION.name) {
+            bodyOfEmail += " ${appConfigManager.testingLevel().name}"
+        }
+        bodyOfEmail += " \nUser ID: $userId"
+
+        val user = this.user
+        if (user != null) {
+            bodyOfEmail += " \nLevel: " + (user.stats?.lvl ?: 0) +
+                    " \nClass: " + (if (user.preferences?.disableClasses == true) "Disabled" else (user.stats?.habitClass ?: "None")) +
+                    " \nIs in Inn: " + (user.preferences?.sleep ?: false) +
+                    " \nUses Costume: " + (user.preferences?.costume ?: false) +
+                    " \nCustom Day Start: " + (user.preferences?.dayStart ?: 0) +
+                    " \nTimezone Offset: " + (user.preferences?.timezoneOffset ?: 0)
+        }
+
+        bodyOfEmail += " \nDetails:\n"
+
+        activity?.let {
+            ShareCompat.IntentBuilder.from(it)
+                    .setType("message/rfc822")
+                    .addEmailTo(appConfigManager.supportEmail())
+                    .setSubject(subject)
+                    .setText(bodyOfEmail)
+                    .setChooserTitle("Send email...")
+                    .startChooser()
+        }
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt
new file mode 100644
index 000000000..d2e9171e1
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt
@@ -0,0 +1,84 @@
+package com.habitrpg.android.habitica.ui.fragments.support
+
+import android.os.Bundle
+import android.text.method.LinkMovementMethod
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.core.os.bundleOf
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.components.UserComponent
+import com.habitrpg.android.habitica.data.FAQRepository
+import com.habitrpg.android.habitica.databinding.FragmentFaqOverviewBinding
+import com.habitrpg.android.habitica.databinding.SupportFaqItemBinding
+import com.habitrpg.android.habitica.extensions.addCloseButton
+import com.habitrpg.android.habitica.extensions.layoutInflater
+import com.habitrpg.android.habitica.helpers.MainNavigationController
+import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import com.habitrpg.android.habitica.ui.helpers.setMarkdown
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import io.reactivex.functions.Consumer
+import javax.inject.Inject
+
+class FAQOverviewFragment : BaseMainFragment() {
+
+    private lateinit var binding: FragmentFaqOverviewBinding
+
+    @Inject
+    lateinit var faqRepository: FAQRepository
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        hidesToolbar = true
+        super.onCreateView(inflater, container, savedInstanceState)
+        binding = FragmentFaqOverviewBinding.inflate(inflater, container, false)
+        binding.healthSection.findViewById<ImageView>(R.id.icon_view).setImageBitmap(HabiticaIconsHelper.imageOfHeartLarge())
+        binding.experienceSection.findViewById<ImageView>(R.id.icon_view).setImageBitmap(HabiticaIconsHelper.imageOfExperienceReward())
+        binding.manaSection.findViewById<ImageView>(R.id.icon_view).setImageBitmap(HabiticaIconsHelper.imageOfMagicLarge())
+        binding.goldSection.findViewById<ImageView>(R.id.icon_view).setImageBitmap(HabiticaIconsHelper.imageOfGoldReward())
+        binding.gemsSection.findViewById<ImageView>(R.id.icon_view).setImageBitmap(HabiticaIconsHelper.imageOfGem())
+        binding.hourglassesSection.findViewById<ImageView>(R.id.icon_view).setImageBitmap(HabiticaIconsHelper.imageOfHourglassLarge())
+        binding.statsSection.findViewById<ImageView>(R.id.icon_view).setImageBitmap(HabiticaIconsHelper.imageOfStats())
+
+        binding.moreHelpTextView.setMarkdown(context?.getString(R.string.need_help_header_description, "[Habitica Help Guild](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)"))
+        binding.moreHelpTextView.setOnClickListener { MainNavigationController.navigate(R.id.guildFragment, bundleOf("groupID" to "5481ccf3-5d2d-48a9-a871-70a7380cee5a")) }
+        binding.moreHelpTextView.movementMethod = LinkMovementMethod.getInstance()
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        this.loadArticles()
+    }
+
+    override fun onDestroy() {
+        faqRepository.close()
+        super.onDestroy()
+    }
+
+    override fun injectFragment(component: UserComponent) {
+        component.inject(this)
+    }
+
+    private fun loadArticles() {
+        compositeSubscription.add(faqRepository.getArticles().subscribe(Consumer {
+            val context = context ?: return@Consumer
+            for (article in it) {
+                val binding = SupportFaqItemBinding.inflate(context.layoutInflater, binding.faqLinearLayout, true)
+                binding.textView.text = article.question
+                binding.root.setOnClickListener {
+                    val dialog = HabiticaAlertDialog(binding.root.context)
+                    dialog.setTitle(article.question)
+                    dialog.setMessage(article.answer)
+                    dialog.addCloseButton()
+                    dialog.show()
+                }
+            }
+        }, RxErrorHandler.handleEmptyError()))
+    }
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt
new file mode 100644
index 000000000..28be1802e
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt
@@ -0,0 +1,126 @@
+package com.habitrpg.android.habitica.ui.fragments.support
+
+import android.content.pm.PackageManager
+import android.os.Build
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.app.ShareCompat
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.components.UserComponent
+import com.habitrpg.android.habitica.data.FAQRepository
+import com.habitrpg.android.habitica.databinding.FragmentSupportMainBinding
+import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.AppTestingLevel
+import com.habitrpg.android.habitica.helpers.DeviceName
+import com.habitrpg.android.habitica.helpers.MainNavigationController
+import com.habitrpg.android.habitica.modules.AppModule
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import io.reactivex.Completable
+import javax.inject.Inject
+import javax.inject.Named
+
+class SupportMainFragment : BaseMainFragment() {
+    private var deviceInfo: DeviceName.DeviceInfo? = null
+
+    private lateinit var binding: FragmentSupportMainBinding
+    @field:[Inject Named(AppModule.NAMED_USER_ID)]
+    lateinit var userId: String
+    @Inject
+    lateinit var faqRepository: FAQRepository
+    @Inject
+    lateinit var appConfigManager: AppConfigManager
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        hidesToolbar = true
+        super.onCreateView(inflater, container, savedInstanceState)
+        binding = FragmentSupportMainBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding.usingHabiticaWrapper.setOnClickListener {
+            MainNavigationController.navigate(R.id.FAQOverviewFragment)
+        }
+        binding.bugsFixesWrapper.setOnClickListener {
+            MainNavigationController.navigate(R.id.bugFixFragment)
+        }
+        binding.suggestionsFeedbackWrapper.setOnClickListener {
+            sendEmail("[Android] Feedback")
+        }
+
+        compositeSubscription.add(Completable.fromAction {
+            deviceInfo = DeviceName.getDeviceInfo(context)
+        }.subscribe())
+
+        binding.resetTutorialButton.setOnClickListener {
+            userRepository.resetTutorial(user)
+        }
+    }
+
+    override fun onDestroy() {
+        faqRepository.close()
+        super.onDestroy()
+    }
+
+    override fun injectFragment(component: UserComponent) {
+        component.inject(this)
+    }
+
+    private val versionName: String by lazy {
+        try {
+            @Suppress("DEPRECATION")
+            activity?.packageManager?.getPackageInfo(activity?.packageName, 0)?.versionName ?: ""
+        } catch (e: PackageManager.NameNotFoundException) {
+            ""
+        }
+    }
+
+    private val versionCode: Int by lazy {
+        try {
+            @Suppress("DEPRECATION")
+            activity?.packageManager?.getPackageInfo(activity?.packageName, 0)?.versionCode ?: 0
+        } catch (e: PackageManager.NameNotFoundException) {
+            0
+        }
+    }
+
+    private fun sendEmail(subject: String) {
+        val version = Build.VERSION.SDK_INT
+        val deviceName = deviceInfo?.name ?: DeviceName.getDeviceName()
+        val manufacturer = deviceInfo?.manufacturer ?: Build.MANUFACTURER
+        var bodyOfEmail = "Device: $manufacturer $deviceName" +
+                " \nAndroid Version: $version"+
+                " \nAppVersion: " + getString(R.string.version_info, versionName, versionCode)
+
+        if (appConfigManager.testingLevel().name != AppTestingLevel.PRODUCTION.name) {
+            bodyOfEmail += " ${appConfigManager.testingLevel().name}"
+        }
+        bodyOfEmail += " \nUser ID: $userId"
+
+        val user = this.user
+        if (user != null) {
+            bodyOfEmail += " \nLevel: " + (user.stats?.lvl ?: 0) +
+                    " \nClass: " + (if (user.preferences?.disableClasses == true) "Disabled" else (user.stats?.habitClass ?: "None")) +
+                    " \nIs in Inn: " + (user.preferences?.sleep ?: false) +
+                    " \nUses Costume: " + (user.preferences?.costume ?: false) +
+                    " \nCustom Day Start: " + (user.preferences?.dayStart ?: 0) +
+                    " \nTimezone Offset: " + (user.preferences?.timezoneOffset ?: 0)
+        }
+
+        bodyOfEmail += " \nDetails:\n"
+
+        activity?.let {
+            ShareCompat.IntentBuilder.from(it)
+                    .setType("message/rfc822")
+                    .addEmailTo(appConfigManager.supportEmail())
+                    .setSubject(subject)
+                    .setText(bodyOfEmail)
+                    .setChooserTitle("Send email...")
+                    .startChooser()
+        }
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java
index 664ed1fec..7907c31ab 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java
@@ -1,6 +1,7 @@
 package com.habitrpg.android.habitica.ui.views;
 
 import android.content.Context;
+import android.content.res.AssetManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.BitmapShader;
@@ -16,6 +17,7 @@ import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
 import android.graphics.RectF;
 import android.graphics.Shader;
+import android.graphics.Typeface;
 import android.text.Layout;
 import android.text.StaticLayout;
 import android.text.TextPaint;
@@ -26,8 +28,8 @@ import java.util.Stack;
 
 
 /**
- * Created by Phillip Thelen on 12. Oct 2018.
- * Copyright © 2018 HabitRPG Inc.. All rights reserved.
+ * Created by Phillip Thelen on 18. Mar 2020.
+ * Copyright © 2020 HabitRPG Inc.. All rights reserved.
  *
  * Generated by PaintCode
  * http://www.paintcodeapp.com
@@ -38,6 +40,13 @@ public class HabiticaIcons {
     private static class GlobalCache {
         static PaintCodeBitmap rageStrikeNPC = new PaintCodeBitmap();
         static PorterDuffXfermode blendModeSourceIn = new PorterDuffXfermode(PorterDuff.Mode.SRC_IN);
+        static Typeface.Builder helveticaNeue = null;
+        
+        private static void initializeTypefaceBuilders(AssetManager assetManager) {
+            if (GlobalCache.helveticaNeue == null) {
+                GlobalCache.helveticaNeue = new Typeface.Builder(assetManager, "HelveticaNeue.ttc");
+            }
+        }
     }
     
     // Resizing Behavior
@@ -88,13 +97,13 @@ public class HabiticaIcons {
         Paint paint = CacheForHeart.paint;
         
         // Local Colors
-        int fillColor6 = Color.argb(128, 181, 36, 40);
-        int heartDarkBackground = Color.argb(178, 255, 255, 255);
-        int fillColor3 = Color.argb(128, 255, 255, 255);
-        int fillColor5 = Color.argb(64, 255, 255, 255);
-        int heartLightBackground = Color.argb(255, 247, 78, 82);
-        int fillColor4 = Color.argb(89, 181, 36, 40);
         int fillColor2 = Color.argb(255, 255, 97, 101);
+        int fillColor5 = Color.argb(64, 255, 255, 255);
+        int fillColor3 = Color.argb(128, 255, 255, 255);
+        int fillColor4 = Color.argb(89, 181, 36, 40);
+        int fillColor6 = Color.argb(128, 181, 36, 40);
+        int heartLightBackground = Color.argb(255, 247, 78, 82);
+        int heartDarkBackground = Color.argb(178, 255, 255, 255);
         
         // Local Variables
         int expression = darkBackground ? heartDarkBackground : heartLightBackground;
@@ -368,11 +377,11 @@ public class HabiticaIcons {
         Paint paint = CacheForExperience.paint;
         
         // Local Colors
-        int fillColor3 = Color.argb(128, 255, 255, 255);
         int fillColor12 = Color.argb(128, 191, 125, 26);
         int fillColor11 = Color.argb(64, 191, 125, 26);
         int fillColor5 = Color.argb(64, 255, 255, 255);
         int fillColor10 = Color.argb(255, 255, 166, 35);
+        int fillColor3 = Color.argb(128, 255, 255, 255);
         
         // Resize to Target Frame
         canvas.save();
@@ -599,11 +608,11 @@ public class HabiticaIcons {
         Paint paint = CacheForMagic.paint;
         
         // Local Colors
-        int fillColor3 = Color.argb(128, 255, 255, 255);
         int fillColor5 = Color.argb(64, 255, 255, 255);
         int fillColor9 = Color.argb(64, 31, 112, 154);
         int fillColor8 = Color.argb(255, 80, 181, 233);
         int fillColor7 = Color.argb(255, 41, 149, 205);
+        int fillColor3 = Color.argb(128, 255, 255, 255);
         
         // Resize to Target Frame
         canvas.save();
@@ -750,11 +759,11 @@ public class HabiticaIcons {
         Paint paint = CacheForGold.paint;
         
         // Local Colors
-        int fillColor13 = Color.argb(191, 191, 125, 26);
         int fillColor12 = Color.argb(128, 191, 125, 26);
         int fillColor5 = Color.argb(64, 255, 255, 255);
         int fillColor3 = Color.argb(128, 255, 255, 255);
         int fillColor10 = Color.argb(255, 255, 166, 35);
+        int fillColor13 = Color.argb(191, 191, 125, 26);
         
         // Resize to Target Frame
         canvas.save();
@@ -905,9 +914,9 @@ public class HabiticaIcons {
         
         // Local Colors
         int fillColor3 = Color.argb(128, 255, 255, 255);
-        int fillColor5 = Color.argb(64, 255, 255, 255);
         int fillColor15 = Color.argb(89, 27, 153, 107);
         int fillColor14 = Color.argb(255, 36, 204, 143);
+        int fillColor5 = Color.argb(64, 255, 255, 255);
         
         // Resize to Target Frame
         canvas.save();
@@ -1531,14 +1540,14 @@ public class HabiticaIcons {
         Paint paint = CacheForWarrior.paint;
         
         // Local Colors
-        int fillColor41 = Color.argb(255, 255, 149, 152);
-        int fillColor43 = Color.argb(255, 200, 43, 43);
-        int fillColor22 = Color.argb(255, 242, 123, 134);
-        int fillColor20 = Color.argb(255, 255, 181, 183);
-        int fillColor21 = Color.argb(255, 255, 182, 184);
         int fillColor42 = Color.argb(255, 255, 149, 152);
-        int fillColor23 = Color.argb(255, 229, 65, 77);
         int fillColor = Color.argb(255, 240, 97, 102);
+        int fillColor43 = Color.argb(255, 200, 43, 43);
+        int fillColor21 = Color.argb(255, 255, 182, 184);
+        int fillColor20 = Color.argb(255, 255, 181, 183);
+        int fillColor23 = Color.argb(255, 229, 65, 77);
+        int fillColor41 = Color.argb(255, 255, 149, 152);
+        int fillColor22 = Color.argb(255, 242, 123, 134);
         
         // Local Variables
         boolean lightBackground = !darkBackground;
@@ -2705,9 +2714,9 @@ public class HabiticaIcons {
     
     public static void drawDifficultyStars(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, float difficulty) {
         // Local Variables
+        float _2StarDifficulty = difficulty >= 2f ? 1f : (difficulty >= 1.5f ? 0.5f : 0f);
         float _3StarDifficulty = difficulty >= 3f ? 1f : (difficulty >= 2.5f ? 0.5f : 0f);
         float _4StarDifficulty = difficulty >= 4f ? 1f : (difficulty >= 3.5f ? 0.5f : 0f);
-        float _2StarDifficulty = difficulty >= 2f ? 1f : (difficulty >= 1.5f ? 0.5f : 0f);
         float _1StarDifficulty = difficulty >= 1f ? 1f : (difficulty >= 0.5f ? 0.5f : 0f);
         
         // Resize to Target Frame
@@ -2785,12 +2794,12 @@ public class HabiticaIcons {
         Paint paint = CacheForDifficultyStar.paint;
         
         // Local Colors
-        int fillColor24 = Color.argb(255, 255, 166, 36);
         int fillColor25 = Color.argb(255, 225, 224, 227);
+        int fillColor24 = Color.argb(255, 255, 166, 36);
         
         // Local Variables
-        boolean isHalf = singleDifficulty == 0.5f;
         boolean isFull = singleDifficulty == 1f;
+        boolean isHalf = singleDifficulty == 0.5f;
         
         // Resize to Target Frame
         canvas.save();
@@ -3038,11 +3047,11 @@ public class HabiticaIcons {
         Paint paint = CacheForStarLarge.paint;
         
         // Local Colors
-        int fillColor28 = Color.argb(64, 229, 220, 255);
-        int fillColor31 = Color.argb(191, 229, 220, 255);
         int fillColor30 = Color.argb(166, 229, 220, 255);
+        int fillColor31 = Color.argb(191, 229, 220, 255);
         int fillColor29 = Color.argb(128, 229, 220, 255);
         int fillColor27 = Color.argb(255, 229, 220, 255);
+        int fillColor28 = Color.argb(64, 229, 220, 255);
         
         // Resize to Target Frame
         canvas.save();
@@ -3442,10 +3451,10 @@ public class HabiticaIcons {
         Paint paint = CacheForStarMedium.paint;
         
         // Local Colors
-        int fillColor27 = Color.argb(255, 229, 220, 255);
         int fillColor34 = Color.argb(38, 229, 220, 255);
         int fillColor33 = Color.argb(77, 229, 220, 255);
         int fillColor32 = Color.argb(153, 229, 220, 255);
+        int fillColor27 = Color.argb(255, 229, 220, 255);
         
         // Resize to Target Frame
         canvas.save();
@@ -3772,8 +3781,8 @@ public class HabiticaIcons {
         Paint paint = CacheForAddRemovePin.paint;
         
         // Local Colors
-        int fillColor36 = Color.argb(255, 97, 51, 180);
         int fillColor2 = Color.argb(255, 255, 97, 101);
+        int fillColor36 = Color.argb(255, 97, 51, 180);
         
         // Local Variables
         int pinColor = addPin ? fillColor36 : fillColor2;
@@ -3963,27 +3972,28 @@ public class HabiticaIcons {
         private static RectF symbolTargetRect = new RectF();
     }
     
-    public static void drawItemIndicator(Canvas canvas, int lockColor, boolean isLocked, boolean isLimited) {
-        HabiticaIcons.drawItemIndicator(canvas, new RectF(0f, 0f, 28f, 28f), ResizingBehavior.AspectFit, lockColor, isLocked, isLimited);
+    public static void drawItemIndicator(Canvas canvas, int lockColor, boolean isLocked, boolean isLimited, boolean isDark) {
+        HabiticaIcons.drawItemIndicator(canvas, new RectF(0f, 0f, 28f, 28f), ResizingBehavior.AspectFit, lockColor, isLocked, isLimited, isDark);
     }
     
-    public static void drawItemIndicator(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int lockColor, boolean isLocked, boolean isLimited) {
+    public static void drawItemIndicator(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int lockColor, boolean isLocked, boolean isLimited, boolean isDark) {
         // General Declarations
         Paint paint = CacheForItemIndicator.paint;
         
         // Local Colors
         int fillColor38 = Color.argb(255, 165, 161, 172);
+        int fillColor39 = Color.argb(255, 189, 168, 255);
         int strokeColor2 = Color.argb(255, 189, 168, 255);
+        int strokeColor = Color.argb(255, 97, 51, 180);
+        int indicatorLockedDark = Color.argb(255, 82, 82, 82);
         int shadowTint = Color.argb(255, 26, 24, 29);
         int indicatorLocked = Color.argb(255, 237, 236, 238);
-        int strokeColor = Color.argb(255, 97, 51, 180);
-        int fillColor39 = Color.argb(255, 189, 168, 255);
         
         // Local Shadows
         PaintCodeShadow shadow = CacheForItemIndicator.shadow.get(PaintCodeColor.colorByChangingAlpha(shadowTint, (int) (Color.alpha(shadowTint) * 0.12f * 255f)), 0f, 1f, 1f);
         
         // Local Variables
-        int itemIndicatorColor = isLocked ? indicatorLocked : (isLimited ? strokeColor : fillColor38);
+        int itemIndicatorColor = isLocked ? (isDark ? indicatorLockedDark : indicatorLocked) : (isLimited ? strokeColor : fillColor38);
         
         // Resize to Target Frame
         canvas.save();
@@ -4112,7 +4122,7 @@ public class HabiticaIcons {
         canvas.translate(symbolRect.left, symbolRect.top);
         RectF symbolTargetRect = CacheForItemIndicatorNumber.symbolTargetRect;
         symbolTargetRect.set(0f, 0f, symbolRect.width(), symbolRect.height());
-        HabiticaIcons.drawItemIndicator(canvas, symbolTargetRect, ResizingBehavior.Stretch, lockColor, false, false);
+        HabiticaIcons.drawItemIndicator(canvas, symbolTargetRect, ResizingBehavior.Stretch, lockColor, false, false, true);
         canvas.restore();
         
         canvas.restore();
@@ -4145,7 +4155,7 @@ public class HabiticaIcons {
         canvas.translate(symbolRect.left, symbolRect.top);
         RectF symbolTargetRect = CacheForItemIndicatorLocked.symbolTargetRect;
         symbolTargetRect.set(0f, 0f, symbolRect.width(), symbolRect.height());
-        HabiticaIcons.drawItemIndicator(canvas, symbolTargetRect, ResizingBehavior.Stretch, lockColor, true, false);
+        HabiticaIcons.drawItemIndicator(canvas, symbolTargetRect, ResizingBehavior.Stretch, lockColor, true, false, false);
         canvas.restore();
         
         canvas.restore();
@@ -4178,7 +4188,7 @@ public class HabiticaIcons {
         canvas.translate(symbolRect.left, symbolRect.top);
         RectF symbolTargetRect = CacheForItemIndicatorLimited.symbolTargetRect;
         symbolTargetRect.set(0f, 0f, symbolRect.width(), symbolRect.height());
-        HabiticaIcons.drawItemIndicator(canvas, symbolTargetRect, ResizingBehavior.Stretch, lockColor, false, true);
+        HabiticaIcons.drawItemIndicator(canvas, symbolTargetRect, ResizingBehavior.Stretch, lockColor, false, true, false);
         canvas.restore();
         
         canvas.restore();
@@ -4360,13 +4370,13 @@ public class HabiticaIcons {
         Paint paint = CacheForRogue.paint;
         
         // Local Colors
-        int fillColor46 = Color.argb(255, 122, 84, 192);
         int fillColor48 = Color.argb(255, 137, 102, 199);
-        int fillColor45 = Color.argb(255, 155, 129, 226);
         int fillColor36 = Color.argb(255, 97, 51, 180);
+        int fillColor45 = Color.argb(255, 155, 129, 226);
         int fillColor47 = Color.argb(255, 198, 182, 228);
         int fillColor19 = Color.argb(255, 79, 42, 147);
         int fillColor44 = Color.argb(255, 204, 190, 237);
+        int fillColor46 = Color.argb(255, 122, 84, 192);
         
         // Local Variables
         boolean lightBackground = !darkBackground;
@@ -5157,18 +5167,18 @@ public class HabiticaIcons {
         Paint paint = CacheForHealer.paint;
         
         // Local Colors
-        int fillColor58 = Color.argb(255, 229, 144, 37);
-        int fillColor50 = Color.argb(255, 226, 158, 69);
-        int fillColor57 = Color.argb(255, 255, 221, 181);
-        int fillColor49 = Color.argb(255, 255, 215, 168);
-        int fillColor56 = Color.argb(255, 255, 166, 35);
-        int fillColor55 = Color.argb(255, 253, 198, 126);
-        int fillColor54 = Color.argb(255, 207, 130, 41);
         int fillColor53 = Color.argb(255, 206, 129, 41);
-        int fillColor10 = Color.argb(255, 255, 166, 35);
-        int fillColor52 = Color.argb(255, 253, 198, 126);
-        int fillColor59 = Color.argb(255, 255, 228, 201);
+        int fillColor57 = Color.argb(255, 255, 221, 181);
+        int fillColor58 = Color.argb(255, 229, 144, 37);
+        int fillColor54 = Color.argb(255, 207, 130, 41);
         int fillColor51 = Color.argb(255, 229, 144, 37);
+        int fillColor50 = Color.argb(255, 226, 158, 69);
+        int fillColor59 = Color.argb(255, 255, 228, 201);
+        int fillColor55 = Color.argb(255, 253, 198, 126);
+        int fillColor56 = Color.argb(255, 255, 166, 35);
+        int fillColor49 = Color.argb(255, 255, 215, 168);
+        int fillColor52 = Color.argb(255, 253, 198, 126);
+        int fillColor10 = Color.argb(255, 255, 166, 35);
         
         // Local Variables
         boolean lightBackground = !darkBackground;
@@ -5995,16 +6005,16 @@ public class HabiticaIcons {
         
         // Local Colors
         int fillColor60 = Color.argb(255, 182, 225, 247);
-        int fillColor64 = Color.argb(255, 77, 178, 214);
-        int fillColor69 = Color.argb(255, 169, 219, 245);
-        int fillColor61 = Color.argb(255, 39, 138, 191);
-        int fillColor66 = Color.argb(255, 107, 196, 233);
-        int fillColor63 = Color.argb(255, 42, 160, 207);
+        int fillColor62 = Color.argb(255, 83, 180, 229);
         int fillColor68 = Color.argb(255, 31, 110, 162);
         int fillColor65 = Color.argb(255, 107, 196, 233);
         int fillColor70 = Color.argb(255, 132, 207, 242);
-        int fillColor62 = Color.argb(255, 83, 180, 229);
+        int fillColor63 = Color.argb(255, 42, 160, 207);
+        int fillColor64 = Color.argb(255, 77, 178, 214);
         int fillColor67 = Color.argb(255, 83, 180, 229);
+        int fillColor69 = Color.argb(255, 169, 219, 245);
+        int fillColor61 = Color.argb(255, 39, 138, 191);
+        int fillColor66 = Color.argb(255, 107, 196, 233);
         
         // Local Variables
         boolean lightBackground = !darkBackground;
@@ -6815,10 +6825,10 @@ public class HabiticaIcons {
         Paint paint = CacheForAttributeSparklesLeft.paint;
         
         // Local Colors
-        int fillColor73 = Color.argb(255, 255, 180, 69);
         int fillColor72 = Color.argb(255, 255, 97, 101);
         int fillColor18 = Color.argb(255, 154, 98, 255);
         int fillColor71 = Color.argb(255, 80, 181, 233);
+        int fillColor73 = Color.argb(255, 255, 180, 69);
         
         // Resize to Target Frame
         canvas.save();
@@ -6941,10 +6951,10 @@ public class HabiticaIcons {
         Paint paint = CacheForAttributeSparklesRight.paint;
         
         // Local Colors
-        int fillColor18 = Color.argb(255, 154, 98, 255);
-        int fillColor71 = Color.argb(255, 80, 181, 233);
         int fillColor74 = Color.argb(255, 255, 190, 93);
+        int fillColor18 = Color.argb(255, 154, 98, 255);
         int fillColor72 = Color.argb(255, 255, 97, 101);
+        int fillColor71 = Color.argb(255, 80, 181, 233);
         
         // Resize to Target Frame
         canvas.save();
@@ -7182,48 +7192,48 @@ public class HabiticaIcons {
         private static Path bezier4Path = new Path();
     }
     
-    public static void drawContributorBadge(Canvas canvas, float contributorTier, boolean isNPC) {
-        HabiticaIcons.drawContributorBadge(canvas, new RectF(0f, 0f, 16f, 16f), ResizingBehavior.AspectFit, contributorTier, isNPC);
+    public static void drawContributorBadge(Canvas canvas, float _1, boolean isNPC) {
+        HabiticaIcons.drawContributorBadge(canvas, new RectF(0f, 0f, 16f, 16f), ResizingBehavior.AspectFit, _1, isNPC);
     }
     
-    public static void drawContributorBadge(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, float contributorTier, boolean isNPC) {
+    public static void drawContributorBadge(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, float _1, boolean isNPC) {
         // General Declarations
         Stack<Matrix> currentTransformation = new Stack<Matrix>();
         currentTransformation.push(new Matrix());
         Paint paint = CacheForContributorBadge.paint;
         
         // Local Colors
+        int fillColor81 = Color.argb(255, 94, 221, 233);
+        int fillColor79 = Color.argb(255, 255, 190, 93);
         int strokeColor4 = Color.argb(255, 136, 10, 10);
         int fillColor82 = Color.argb(255, 154, 98, 255);
         int strokeColor8 = Color.argb(255, 28, 163, 114);
         int strokeColor6 = Color.argb(255, 236, 109, 23);
         int strokeColor12 = Color.argb(255, 0, 87, 55);
-        int fillColor2 = Color.argb(255, 255, 97, 101);
         int fillColor77 = Color.argb(255, 201, 43, 43);
-        int fillColor7 = Color.argb(255, 41, 149, 205);
         int strokeColor10 = Color.argb(255, 5, 112, 168);
         int fillColor80 = Color.argb(255, 63, 218, 162);
         int fillColor78 = Color.argb(255, 255, 148, 76);
         int fillColor83 = Color.argb(255, 119, 244, 199);
         int strokeColor3 = Color.argb(255, 253, 124, 127);
         int strokeColor9 = Color.argb(255, 52, 181, 193);
+        int fillColor2 = Color.argb(255, 255, 97, 101);
         int strokeColor7 = Color.argb(255, 238, 145, 9);
         int strokeColor5 = Color.argb(255, 225, 22, 27);
+        int fillColor7 = Color.argb(255, 41, 149, 205);
         int strokeColor11 = Color.argb(255, 106, 52, 204);
         int fillColor76 = Color.argb(255, 255, 182, 184);
-        int fillColor81 = Color.argb(255, 94, 221, 233);
-        int fillColor79 = Color.argb(255, 255, 190, 93);
         
         // Local Variables
-        boolean isTier8 = contributorTier == 8f && !isNPC;
-        boolean isTier4 = contributorTier == 4f && !isNPC;
-        boolean isTier6 = contributorTier == 6f && !isNPC;
-        boolean isTier3 = contributorTier == 3f && !isNPC;
-        boolean isTier2 = contributorTier == 2f && !isNPC;
-        boolean isTier7 = contributorTier == 7f && !isNPC;
-        boolean isTier1 = contributorTier == 1f && !isNPC;
-        boolean isTier5 = contributorTier == 5f && !isNPC;
-        boolean isTier9 = contributorTier == 9f && !isNPC;
+        boolean isTier7 = _1 == 7f && !isNPC;
+        boolean isTier1 = _1 == 1f && !isNPC;
+        boolean isTier9 = _1 == 9f && !isNPC;
+        boolean isTier6 = _1 == 6f && !isNPC;
+        boolean isTier5 = _1 == 5f && !isNPC;
+        boolean isTier4 = _1 == 4f && !isNPC;
+        boolean isTier2 = _1 == 2f && !isNPC;
+        boolean isTier8 = _1 == 8f && !isNPC;
+        boolean isTier3 = _1 == 3f && !isNPC;
         
         // Resize to Target Frame
         canvas.save();
@@ -8064,17 +8074,17 @@ public class HabiticaIcons {
         Paint paint = CacheForDamage.paint;
         
         // Local Colors
-        int fillColor25 = Color.argb(255, 225, 224, 227);
         int fillColor90 = Color.argb(179, 78, 74, 87);
         int fillColor89 = Color.argb(255, 227, 143, 61);
-        int fillColor37 = Color.argb(255, 255, 255, 255);
         int fillColor88 = Color.argb(255, 179, 98, 19);
-        int fillColor87 = Color.argb(255, 189, 168, 255);
-        int fillColor86 = Color.argb(255, 213, 200, 255);
-        int fillColor40 = Color.argb(255, 165, 161, 172);
         int fillColor35 = Color.argb(255, 195, 192, 199);
+        int fillColor25 = Color.argb(255, 225, 224, 227);
+        int fillColor40 = Color.argb(255, 165, 161, 172);
+        int fillColor86 = Color.argb(255, 213, 200, 255);
+        int fillColor87 = Color.argb(255, 189, 168, 255);
         int fillColor75 = Color.argb(255, 135, 129, 144);
         int fillColor85 = Color.argb(255, 237, 236, 238);
+        int fillColor37 = Color.argb(255, 255, 255, 255);
         int fillColor84 = Color.argb(255, 240, 97, 102);
         
         // Resize to Target Frame
@@ -8648,8 +8658,8 @@ public class HabiticaIcons {
         Paint paint = CacheForRageStrikeInactive.paint;
         
         // Local Colors
-        int textForeground = Color.argb(255, 183, 90, 28);
         int fillColor91 = Color.argb(255, 255, 200, 167);
+        int textForeground = Color.argb(255, 183, 90, 28);
         int strokeColor14 = Color.argb(255, 255, 148, 76);
         int strokeColor13 = Color.argb(255, 244, 120, 37);
         
@@ -8814,8 +8824,8 @@ public class HabiticaIcons {
         Paint paint = CacheForRageStrikeActive.paint;
         
         // Local Colors
-        int strokeColor13 = Color.argb(255, 244, 120, 37);
         int strokeColor14 = Color.argb(255, 255, 148, 76);
+        int strokeColor13 = Color.argb(255, 244, 120, 37);
         
         // Local Images
         PaintCodeBitmap pc_rageStrikeNPC = GlobalCache.rageStrikeNPC.get(rageStrikeNPC);
@@ -8953,12 +8963,12 @@ public class HabiticaIcons {
         Paint paint = CacheForRage.paint;
         
         // Local Colors
-        int fillColor93 = Color.argb(255, 244, 120, 37);
-        int fillColor14 = Color.argb(255, 36, 204, 143);
-        int fillColor15 = Color.argb(89, 27, 153, 107);
-        int fillColor92 = Color.argb(255, 90, 228, 178);
-        int fillColor3 = Color.argb(128, 255, 255, 255);
         int fillColor5 = Color.argb(64, 255, 255, 255);
+        int fillColor15 = Color.argb(89, 27, 153, 107);
+        int fillColor93 = Color.argb(255, 244, 120, 37);
+        int fillColor3 = Color.argb(128, 255, 255, 255);
+        int fillColor92 = Color.argb(255, 90, 228, 178);
+        int fillColor14 = Color.argb(255, 36, 204, 143);
         int fillColor94 = Color.argb(89, 180, 89, 27);
         
         // Resize to Target Frame
@@ -9268,9 +9278,9 @@ public class HabiticaIcons {
     public static void drawTaskDifficultyStars(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int taskTintColor, float difficulty, boolean isActive) {
         // Local Variables
         boolean isTrivial = difficulty == 0.1f;
+        boolean isMedium = difficulty == 1.5f;
         boolean isHard = difficulty == 2f;
         boolean isEasy = difficulty == 1f;
-        boolean isMedium = difficulty == 1.5f;
         
         // Resize to Target Frame
         canvas.save();
@@ -9424,8 +9434,8 @@ public class HabiticaIcons {
         int strokeColor15 = Color.argb(255, 195, 192, 199);
         
         // Local Variables
-        int borderColor = isActive ? taskTintColor : strokeColor15;
         int starFillColor = isActive ? taskTintColor : transparent;
+        int borderColor = isActive ? taskTintColor : strokeColor15;
         
         // Resize to Target Frame
         canvas.save();
@@ -9488,8 +9498,8 @@ public class HabiticaIcons {
         Paint paint = CacheForHabitControlPlus.paint;
         
         // Local Colors
-        int strokeColor15 = Color.argb(255, 195, 192, 199);
         int fillColor37 = Color.argb(255, 255, 255, 255);
+        int strokeColor15 = Color.argb(255, 195, 192, 199);
         int transparent = Color.argb(0, 204, 82, 82);
         
         // Local Variables
@@ -9576,8 +9586,8 @@ public class HabiticaIcons {
         Paint paint = CacheForHabitControlMinus.paint;
         
         // Local Colors
-        int strokeColor15 = Color.argb(255, 195, 192, 199);
         int fillColor37 = Color.argb(255, 255, 255, 255);
+        int strokeColor15 = Color.argb(255, 195, 192, 199);
         int transparent = Color.argb(0, 204, 82, 82);
         
         // Local Variables
@@ -9837,35 +9847,36 @@ public class HabiticaIcons {
         Stack<Matrix> currentTransformation = new Stack<Matrix>();
         currentTransformation.push(new Matrix());
         Paint paint = CacheForGuildCrest.paint;
+        GlobalCache.initializeTypefaceBuilders(context.getAssets());
         
         // Local Colors
-        int crestSilver5 = Color.argb(255, 141, 141, 141);
-        int crestBronze3 = Color.argb(255, 179, 98, 19);
-        int crestGold5 = Color.argb(255, 223, 145, 30);
-        int crestSilver6 = Color.argb(255, 141, 141, 141);
-        int crestBronze2 = Color.argb(255, 244, 165, 89);
-        int crestGold6 = Color.argb(255, 223, 145, 30);
-        int crestSilver4 = Color.argb(255, 175, 175, 175);
-        int crestBronze1 = Color.argb(255, 234, 140, 49);
-        int crestGold4 = Color.argb(255, 255, 166, 35);
-        int crestSilver3 = Color.argb(255, 141, 141, 141);
-        int crestGold3 = Color.argb(255, 223, 145, 30);
-        int crestSilver1 = Color.argb(255, 194, 194, 194);
-        int crestGold2 = Color.argb(255, 255, 210, 145);
         int crestBronze6 = Color.argb(255, 179, 98, 19);
         int crestGold1 = Color.argb(255, 255, 188, 90);
-        int crestBronze5 = Color.argb(255, 179, 98, 19);
-        int crestSilver2 = Color.argb(255, 217, 217, 217);
+        int crestSilver6 = Color.argb(255, 141, 141, 141);
+        int crestSilver1 = Color.argb(255, 194, 194, 194);
+        int crestBronze3 = Color.argb(255, 179, 98, 19);
+        int crestSilver5 = Color.argb(255, 141, 141, 141);
         int crestBronze4 = Color.argb(255, 215, 122, 32);
+        int crestGold4 = Color.argb(255, 255, 166, 35);
+        int crestGold2 = Color.argb(255, 255, 210, 145);
+        int crestBronze2 = Color.argb(255, 244, 165, 89);
+        int crestGold6 = Color.argb(255, 223, 145, 30);
+        int crestSilver3 = Color.argb(255, 141, 141, 141);
+        int crestSilver4 = Color.argb(255, 175, 175, 175);
+        int crestSilver2 = Color.argb(255, 217, 217, 217);
+        int crestBronze1 = Color.argb(255, 234, 140, 49);
+        int crestGold3 = Color.argb(255, 223, 145, 30);
+        int crestBronze5 = Color.argb(255, 179, 98, 19);
+        int crestGold5 = Color.argb(255, 223, 145, 30);
         
         // Local Variables
         boolean isPrivate = !isPublic;
-        int crestColor1 = memberCount < 100f ? crestBronze1 : (memberCount < 1000f ? crestSilver1 : crestGold1);
+        int crestColor5 = memberCount < 100f ? crestBronze5 : (memberCount < 1000f ? crestSilver5 : crestGold5);
         int crestColor4 = memberCount < 100f ? crestBronze4 : (memberCount < 1000f ? crestSilver4 : crestGold4);
+        int crestColor3 = memberCount < 100f ? crestBronze3 : (memberCount < 1000f ? crestSilver3 : crestGold3);
+        int crestColor1 = memberCount < 100f ? crestBronze1 : (memberCount < 1000f ? crestSilver1 : crestGold1);
         int crestColor6 = memberCount < 100f ? crestBronze6 : (memberCount < 1000f ? crestSilver6 : crestGold6);
         int crestColor2 = memberCount < 100f ? crestBronze2 : (memberCount < 1000f ? crestSilver2 : crestGold2);
-        int crestColor3 = memberCount < 100f ? crestBronze3 : (memberCount < 1000f ? crestSilver3 : crestGold3);
-        int crestColor5 = memberCount < 100f ? crestBronze5 : (memberCount < 1000f ? crestSilver5 : crestGold5);
         
         // Resize to Target Frame
         canvas.save();
@@ -10324,6 +10335,8 @@ public class HabiticaIcons {
         labelTextPaint.reset();
         labelTextPaint.setFlags(Paint.ANTI_ALIAS_FLAG);
         labelTextPaint.setColor(crestColor5);
+        GlobalCache.helveticaNeue.setTtcIndex(0);
+        labelTextPaint.setTypeface(GlobalCache.helveticaNeue.build());
         labelTextPaint.setTextSize(12f);
         StaticLayout labelStaticLayout = CacheForGuildCrest.labelStaticLayout.get((int) labelRect.width(), Layout.Alignment.ALIGN_CENTER, memberCountLabel, labelTextPaint);
         canvas.save();
@@ -10366,28 +10379,28 @@ public class HabiticaIcons {
         Paint paint = CacheForGuildCrestMedium.paint;
         
         // Local Colors
-        int crestBronze3 = Color.argb(255, 179, 98, 19);
-        int crestSilver6 = Color.argb(255, 141, 141, 141);
-        int crestBronze2 = Color.argb(255, 244, 165, 89);
-        int crestGold6 = Color.argb(255, 223, 145, 30);
-        int crestSilver4 = Color.argb(255, 175, 175, 175);
-        int crestBronze1 = Color.argb(255, 234, 140, 49);
-        int crestGold4 = Color.argb(255, 255, 166, 35);
-        int crestSilver3 = Color.argb(255, 141, 141, 141);
-        int crestGold3 = Color.argb(255, 223, 145, 30);
-        int crestSilver1 = Color.argb(255, 194, 194, 194);
-        int crestGold2 = Color.argb(255, 255, 210, 145);
         int crestBronze6 = Color.argb(255, 179, 98, 19);
         int crestGold1 = Color.argb(255, 255, 188, 90);
-        int crestSilver2 = Color.argb(255, 217, 217, 217);
+        int crestSilver6 = Color.argb(255, 141, 141, 141);
+        int crestSilver1 = Color.argb(255, 194, 194, 194);
+        int crestBronze3 = Color.argb(255, 179, 98, 19);
         int crestBronze4 = Color.argb(255, 215, 122, 32);
+        int crestGold4 = Color.argb(255, 255, 166, 35);
+        int crestGold2 = Color.argb(255, 255, 210, 145);
+        int crestBronze2 = Color.argb(255, 244, 165, 89);
+        int crestGold6 = Color.argb(255, 223, 145, 30);
+        int crestSilver3 = Color.argb(255, 141, 141, 141);
+        int crestSilver4 = Color.argb(255, 175, 175, 175);
+        int crestSilver2 = Color.argb(255, 217, 217, 217);
+        int crestBronze1 = Color.argb(255, 234, 140, 49);
+        int crestGold3 = Color.argb(255, 223, 145, 30);
         
         // Local Variables
-        int crestColor6 = memberCount < 100f ? crestBronze6 : (memberCount < 1000f ? crestSilver6 : crestGold6);
-        int crestColor3 = memberCount < 100f ? crestBronze3 : (memberCount < 1000f ? crestSilver3 : crestGold3);
-        int crestColor1 = memberCount < 100f ? crestBronze1 : (memberCount < 1000f ? crestSilver1 : crestGold1);
-        int crestColor2 = memberCount < 100f ? crestBronze2 : (memberCount < 1000f ? crestSilver2 : crestGold2);
         int crestColor4 = memberCount < 100f ? crestBronze4 : (memberCount < 1000f ? crestSilver4 : crestGold4);
+        int crestColor3 = memberCount < 100f ? crestBronze3 : (memberCount < 1000f ? crestSilver3 : crestGold3);
+        int crestColor2 = memberCount < 100f ? crestBronze2 : (memberCount < 1000f ? crestSilver2 : crestGold2);
+        int crestColor6 = memberCount < 100f ? crestBronze6 : (memberCount < 1000f ? crestSilver6 : crestGold6);
+        int crestColor1 = memberCount < 100f ? crestBronze1 : (memberCount < 1000f ? crestSilver1 : crestGold1);
         
         // Resize to Target Frame
         canvas.save();
@@ -10567,9 +10580,9 @@ public class HabiticaIcons {
         Paint paint = CacheForGuildCrestSmall.paint;
         
         // Local Colors
-        int crestGold4 = Color.argb(255, 255, 166, 35);
         int fillColor37 = Color.argb(255, 255, 255, 255);
         int crestSilver4 = Color.argb(255, 175, 175, 175);
+        int crestGold4 = Color.argb(255, 255, 166, 35);
         int crestBronze4 = Color.argb(255, 215, 122, 32);
         
         // Local Variables
@@ -10682,13 +10695,13 @@ public class HabiticaIcons {
         Paint paint = CacheForGuildHeaderCrest.paint;
         
         // Local Colors
-        int guildHeaderDark3 = PaintCodeColor.colorByChangingValue(guildHeader, 1f);
-        int guildHeaderDark5 = PaintCodeColor.colorByApplyingHighlight(guildHeaderDark3, 0.7f);
-        int guildHeaderDark4 = PaintCodeColor.colorByApplyingHighlight(guildHeaderDark3, 0.15f);
         int guildHeaderDark2 = PaintCodeColor.colorByChangingValue(guildHeader, 0.7f);
-        int guildHeaderDark6 = PaintCodeColor.colorByApplyingHighlight(guildHeaderDark2, 0.3f);
         int guildHeaderDark8 = PaintCodeColor.colorByApplyingHighlight(guildHeaderDark2, 0.4f);
         int guildHeaderDark7 = PaintCodeColor.colorByChangingValue(guildHeaderDark8, 1f);
+        int guildHeaderDark6 = PaintCodeColor.colorByApplyingHighlight(guildHeaderDark2, 0.3f);
+        int guildHeaderDark3 = PaintCodeColor.colorByChangingValue(guildHeader, 1f);
+        int guildHeaderDark4 = PaintCodeColor.colorByApplyingHighlight(guildHeaderDark3, 0.15f);
+        int guildHeaderDark5 = PaintCodeColor.colorByApplyingHighlight(guildHeaderDark3, 0.7f);
         int textForeground2 = Color.argb(255, 255, 255, 255);
         
         // Resize to Target Frame
@@ -11352,8 +11365,8 @@ public class HabiticaIcons {
         Paint paint = CacheForBlankAvatarIcon.paint;
         
         // Local Colors
-        int fillColor40 = Color.argb(255, 165, 161, 172);
         int fillColor101 = Color.argb(255, 247, 78, 82);
+        int fillColor40 = Color.argb(255, 165, 161, 172);
         
         // Resize to Target Frame
         canvas.save();
@@ -11627,9 +11640,9 @@ public class HabiticaIcons {
         int strokeColor19 = Color.argb(255, 154, 98, 255);
         
         // Local Variables
-        float filterNode3Position = 3f + 5f * percentage;
         float filterNode1Position = 3f + 10f * percentage;
         float filterNode2Position = 13f - 10f * percentage;
+        float filterNode3Position = 3f + 5f * percentage;
         
         // Resize to Target Frame
         canvas.save();
@@ -11954,85 +11967,6 @@ public class HabiticaIcons {
         
         canvas.restore();
     }
-
-    private static class CacheForBuffIconDark {
-        private static Paint paint = new Paint();
-        private static RectF originalFrame = new RectF(0f, 0f, 15f, 15f);
-        private static RectF resizedFrame = new RectF();
-        private static RectF rectangleRect = new RectF();
-        private static Path rectanglePath = new Path();
-        private static RectF bezier2Rect = new RectF();
-        private static Path bezier2Path = new Path();
-    }
-
-    public static void drawBuffIconDark(Canvas canvas) {
-        HabiticaIcons.drawBuffIconDark(canvas, new RectF(0f, 0f, 15f, 15f), ResizingBehavior.AspectFit);
-    }
-
-    public static void drawBuffIconDark(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
-        // General Declarations
-        Paint paint = CacheForBuffIcon.paint;
-
-        // Local Colors
-        int fillColor18 = Color.argb(255, 185, 172, 252);
-        int fillColor85 = Color.argb(255, 37, 29, 60);
-
-        // Resize to Target Frame
-        canvas.save();
-        RectF resizedFrame = CacheForBuffIcon.resizedFrame;
-        HabiticaIcons.resizingBehaviorApply(resizing, CacheForBuffIcon.originalFrame, targetFrame, resizedFrame);
-        canvas.translate(resizedFrame.left, resizedFrame.top);
-        canvas.scale(resizedFrame.width() / 15f, resizedFrame.height() / 15f);
-
-        // Rectangle
-        RectF rectangleRect = CacheForBuffIcon.rectangleRect;
-        rectangleRect.set(0f, 0f, 15f, 15f);
-        Path rectanglePath = CacheForBuffIcon.rectanglePath;
-        rectanglePath.reset();
-        rectanglePath.addRoundRect(rectangleRect, 2f, 2f, Path.Direction.CW);
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        paint.setStyle(Paint.Style.FILL);
-        paint.setColor(fillColor85);
-        canvas.drawPath(rectanglePath, paint);
-
-        // Bezier 2
-        RectF bezier2Rect = CacheForBuffIcon.bezier2Rect;
-        bezier2Rect.set(3.75f, 3f, 11.25f, 12f);
-        Path bezier2Path = CacheForBuffIcon.bezier2Path;
-        bezier2Path.reset();
-        bezier2Path.moveTo(7.5f, 3f);
-        bezier2Path.lineTo(11.25f, 7.5f);
-        bezier2Path.lineTo(9f, 7.5f);
-        bezier2Path.lineTo(9f, 9f);
-        bezier2Path.lineTo(6f, 9f);
-        bezier2Path.lineTo(6f, 7.5f);
-        bezier2Path.lineTo(3.75f, 7.5f);
-        bezier2Path.lineTo(7.5f, 3f);
-        bezier2Path.close();
-        bezier2Path.moveTo(6f, 9.75f);
-        bezier2Path.lineTo(9f, 9.75f);
-        bezier2Path.lineTo(9f, 10.5f);
-        bezier2Path.lineTo(6f, 10.5f);
-        bezier2Path.lineTo(6f, 9.75f);
-        bezier2Path.close();
-        bezier2Path.moveTo(6f, 11.25f);
-        bezier2Path.lineTo(9f, 11.25f);
-        bezier2Path.lineTo(9f, 12f);
-        bezier2Path.lineTo(6f, 12f);
-        bezier2Path.lineTo(6f, 11.25f);
-        bezier2Path.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        bezier2Path.setFillType(Path.FillType.EVEN_ODD);
-        paint.setStyle(Paint.Style.FILL);
-        paint.setColor(fillColor18);
-        canvas.drawPath(bezier2Path, paint);
-
-        canvas.restore();
-    }
     
     private static class CacheForParticipantsIcon {
         private static Paint paint = new Paint();
@@ -12055,9 +11989,9 @@ public class HabiticaIcons {
         Paint paint = CacheForParticipantsIcon.paint;
         
         // Local Colors
-        int fillColor25 = Color.argb(255, 225, 224, 227);
-        int fillColor39 = Color.argb(255, 189, 168, 255);
         int fillColor104 = Color.argb(255, 249, 249, 249);
+        int fillColor39 = Color.argb(255, 189, 168, 255);
+        int fillColor25 = Color.argb(255, 225, 224, 227);
         
         // Resize to Target Frame
         canvas.save();
@@ -12567,6 +12501,449 @@ public class HabiticaIcons {
         canvas.restore();
     }
     
+    private static class CacheForItemIndicatorLockedDark {
+        private static RectF originalFrame = new RectF(0f, 0f, 28f, 28f);
+        private static RectF resizedFrame = new RectF();
+        private static RectF symbolRect = new RectF();
+        private static RectF symbolTargetRect = new RectF();
+    }
+    
+    private static void drawItemIndicatorLockedDark(Canvas canvas, int lockColor) {
+        HabiticaIcons.drawItemIndicatorLockedDark(canvas, new RectF(0f, 0f, 28f, 28f), ResizingBehavior.AspectFit, lockColor);
+    }
+    
+    private static void drawItemIndicatorLockedDark(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int lockColor) {
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForItemIndicatorLockedDark.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForItemIndicatorLockedDark.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 28f, resizedFrame.height() / 28f);
+        
+        // Symbol
+        RectF symbolRect = CacheForItemIndicatorLockedDark.symbolRect;
+        symbolRect.set(0f, 0f, 28f, 28f);
+        canvas.save();
+        canvas.clipRect(symbolRect);
+        canvas.translate(symbolRect.left, symbolRect.top);
+        RectF symbolTargetRect = CacheForItemIndicatorLockedDark.symbolTargetRect;
+        symbolTargetRect.set(0f, 0f, symbolRect.width(), symbolRect.height());
+        HabiticaIcons.drawItemIndicator(canvas, symbolTargetRect, ResizingBehavior.Stretch, lockColor, true, false, true);
+        canvas.restore();
+        
+        canvas.restore();
+    }
+    
+    private static class CacheForBuffIconDark {
+        private static Paint paint = new Paint();
+        private static RectF originalFrame = new RectF(0f, 0f, 15f, 15f);
+        private static RectF resizedFrame = new RectF();
+        private static RectF rectangleRect = new RectF();
+        private static Path rectanglePath = new Path();
+        private static RectF bezier2Rect = new RectF();
+        private static Path bezier2Path = new Path();
+    }
+    
+    public static void drawBuffIconDark(Canvas canvas) {
+        HabiticaIcons.drawBuffIconDark(canvas, new RectF(0f, 0f, 15f, 15f), ResizingBehavior.AspectFit);
+    }
+    
+    public static void drawBuffIconDark(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
+        // General Declarations
+        Paint paint = CacheForBuffIconDark.paint;
+        
+        // Local Colors
+        int fillColor39 = Color.argb(255, 189, 168, 255);
+        int buffBackgroundColorDark = Color.argb(255, 70, 40, 125);
+        
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForBuffIconDark.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForBuffIconDark.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 15f, resizedFrame.height() / 15f);
+        
+        // Rectangle
+        RectF rectangleRect = CacheForBuffIconDark.rectangleRect;
+        rectangleRect.set(0f, 0f, 15f, 15f);
+        Path rectanglePath = CacheForBuffIconDark.rectanglePath;
+        rectanglePath.reset();
+        rectanglePath.addRoundRect(rectangleRect, 2f, 2f, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(buffBackgroundColorDark);
+        canvas.drawPath(rectanglePath, paint);
+        
+        // Bezier 2
+        RectF bezier2Rect = CacheForBuffIconDark.bezier2Rect;
+        bezier2Rect.set(3.75f, 3f, 11.25f, 12f);
+        Path bezier2Path = CacheForBuffIconDark.bezier2Path;
+        bezier2Path.reset();
+        bezier2Path.moveTo(7.5f, 3f);
+        bezier2Path.lineTo(11.25f, 7.5f);
+        bezier2Path.lineTo(9f, 7.5f);
+        bezier2Path.lineTo(9f, 9f);
+        bezier2Path.lineTo(6f, 9f);
+        bezier2Path.lineTo(6f, 7.5f);
+        bezier2Path.lineTo(3.75f, 7.5f);
+        bezier2Path.lineTo(7.5f, 3f);
+        bezier2Path.close();
+        bezier2Path.moveTo(6f, 9.75f);
+        bezier2Path.lineTo(9f, 9.75f);
+        bezier2Path.lineTo(9f, 10.5f);
+        bezier2Path.lineTo(6f, 10.5f);
+        bezier2Path.lineTo(6f, 9.75f);
+        bezier2Path.close();
+        bezier2Path.moveTo(6f, 11.25f);
+        bezier2Path.lineTo(9f, 11.25f);
+        bezier2Path.lineTo(9f, 12f);
+        bezier2Path.lineTo(6f, 12f);
+        bezier2Path.lineTo(6f, 11.25f);
+        bezier2Path.close();
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        bezier2Path.setFillType(Path.FillType.EVEN_ODD);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor39);
+        canvas.drawPath(bezier2Path, paint);
+        
+        canvas.restore();
+    }
+    
+    private static class CacheForStats {
+        private static Paint paint = new Paint();
+        private static RectF originalFrame = new RectF(0f, 0f, 30f, 22f);
+        private static RectF resizedFrame = new RectF();
+        private static RectF bezierRect = new RectF();
+        private static Path bezierPath = new Path();
+        private static RectF group = new RectF();
+        private static Path clipPath = new Path();
+        private static RectF bezier2Rect = new RectF();
+        private static Path bezier2Path = new Path();
+        private static RectF rectangleRect = new RectF();
+        private static Path rectanglePath = new Path();
+        private static RectF rectangle2Rect = new RectF();
+        private static Path rectangle2Path = new Path();
+        private static RectF rectangle3Rect = new RectF();
+        private static Path rectangle3Path = new Path();
+        private static RectF rectangle4Rect = new RectF();
+        private static Path rectangle4Path = new Path();
+        private static RectF rectangle5Rect = new RectF();
+        private static Path rectangle5Path = new Path();
+        private static RectF rectangle6Rect = new RectF();
+        private static Path rectangle6Path = new Path();
+        private static RectF rectangle7Rect = new RectF();
+        private static Path rectangle7Path = new Path();
+        private static RectF rectangle8Rect = new RectF();
+        private static Path rectangle8Path = new Path();
+        private static RectF rectangle9Rect = new RectF();
+        private static Path rectangle9Path = new Path();
+        private static RectF rectangle10Rect = new RectF();
+        private static Path rectangle10Path = new Path();
+        private static RectF rectangle11Rect = new RectF();
+        private static Path rectangle11Path = new Path();
+    }
+    
+    public static void drawStats(Canvas canvas) {
+        HabiticaIcons.drawStats(canvas, new RectF(0f, 0f, 30f, 22f), ResizingBehavior.AspectFit);
+    }
+    
+    public static void drawStats(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
+        // General Declarations
+        Paint paint = CacheForStats.paint;
+        
+        // Local Colors
+        int fillColor89 = Color.argb(255, 227, 143, 61);
+        int strokeColor21 = Color.argb(255, 135, 129, 144);
+        int fillColor25 = Color.argb(255, 225, 224, 227);
+        int fillColor106 = Color.argb(255, 216, 216, 216);
+        int fillColor107 = Color.argb(255, 179, 98, 19);
+        int fillColor35 = Color.argb(255, 195, 192, 199);
+        int fillColor40 = Color.argb(255, 165, 161, 172);
+        
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForStats.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForStats.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 30f, resizedFrame.height() / 22f);
+        
+        // Bezier
+        RectF bezierRect = CacheForStats.bezierRect;
+        bezierRect.set(1.75f, 1.75f, 28.25f, 20.25f);
+        Path bezierPath = CacheForStats.bezierPath;
+        bezierPath.reset();
+        bezierPath.moveTo(11.25f, 19f);
+        bezierPath.lineTo(10f, 20.25f);
+        bezierPath.lineTo(6f, 20.25f);
+        bezierPath.lineTo(4.75f, 19f);
+        bezierPath.lineTo(4.75f, 17.25f);
+        bezierPath.lineTo(3f, 17.25f);
+        bezierPath.lineTo(1.75f, 16f);
+        bezierPath.lineTo(1.75f, 6f);
+        bezierPath.lineTo(3f, 4.75f);
+        bezierPath.lineTo(4.75f, 4.75f);
+        bezierPath.lineTo(4.75f, 3f);
+        bezierPath.lineTo(6f, 1.75f);
+        bezierPath.lineTo(10f, 1.75f);
+        bezierPath.lineTo(11.25f, 3f);
+        bezierPath.lineTo(11.25f, 7.75f);
+        bezierPath.lineTo(18.75f, 7.75f);
+        bezierPath.lineTo(18.75f, 3f);
+        bezierPath.lineTo(20f, 1.75f);
+        bezierPath.lineTo(24f, 1.75f);
+        bezierPath.lineTo(25.25f, 3f);
+        bezierPath.lineTo(25.25f, 4.75f);
+        bezierPath.lineTo(27f, 4.75f);
+        bezierPath.lineTo(28.25f, 6f);
+        bezierPath.lineTo(28.25f, 16f);
+        bezierPath.lineTo(27f, 17.25f);
+        bezierPath.lineTo(25.25f, 17.25f);
+        bezierPath.lineTo(25.25f, 19f);
+        bezierPath.lineTo(24f, 20.25f);
+        bezierPath.lineTo(20f, 20.25f);
+        bezierPath.lineTo(18.75f, 19f);
+        bezierPath.lineTo(18.75f, 14.25f);
+        bezierPath.lineTo(11.25f, 14.25f);
+        bezierPath.lineTo(11.25f, 19f);
+        bezierPath.close();
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        bezierPath.setFillType(Path.FillType.EVEN_ODD);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor106);
+        canvas.drawPath(bezierPath, paint);
+        
+        // Group
+        {
+            RectF group = CacheForStats.group;
+            group.set(-22f, -22f, 52f, 44f);
+            canvas.save();
+            
+            // Clip
+            Path clipPath = CacheForStats.clipPath;
+            clipPath.reset();
+            clipPath.moveTo(-22f, -22f);
+            clipPath.lineTo(52f, -22f);
+            clipPath.lineTo(52f, 44f);
+            clipPath.lineTo(-22f, 44f);
+            clipPath.lineTo(-22f, -22f);
+            clipPath.close();
+            clipPath.moveTo(10f, 19f);
+            clipPath.lineTo(6f, 19f);
+            clipPath.lineTo(6f, 16f);
+            clipPath.lineTo(3f, 16f);
+            clipPath.lineTo(3f, 6f);
+            clipPath.lineTo(6f, 6f);
+            clipPath.lineTo(6f, 3f);
+            clipPath.lineTo(10f, 3f);
+            clipPath.lineTo(10f, 9f);
+            clipPath.lineTo(20f, 9f);
+            clipPath.lineTo(20f, 3f);
+            clipPath.lineTo(24f, 3f);
+            clipPath.lineTo(24f, 6f);
+            clipPath.lineTo(27f, 6f);
+            clipPath.lineTo(27f, 16f);
+            clipPath.lineTo(24f, 16f);
+            clipPath.lineTo(24f, 19f);
+            clipPath.lineTo(20f, 19f);
+            clipPath.lineTo(20f, 13f);
+            clipPath.lineTo(10f, 13f);
+            clipPath.lineTo(10f, 19f);
+            clipPath.close();
+            canvas.clipPath(clipPath);
+            
+            // Bezier 2
+            RectF bezier2Rect = CacheForStats.bezier2Rect;
+            bezier2Rect.set(3f, 3f, 27f, 19f);
+            Path bezier2Path = CacheForStats.bezier2Path;
+            bezier2Path.reset();
+            bezier2Path.moveTo(10f, 19f);
+            bezier2Path.lineTo(6f, 19f);
+            bezier2Path.lineTo(6f, 16f);
+            bezier2Path.lineTo(3f, 16f);
+            bezier2Path.lineTo(3f, 6f);
+            bezier2Path.lineTo(6f, 6f);
+            bezier2Path.lineTo(6f, 3f);
+            bezier2Path.lineTo(10f, 3f);
+            bezier2Path.lineTo(10f, 9f);
+            bezier2Path.lineTo(20f, 9f);
+            bezier2Path.lineTo(20f, 3f);
+            bezier2Path.lineTo(24f, 3f);
+            bezier2Path.lineTo(24f, 6f);
+            bezier2Path.lineTo(27f, 6f);
+            bezier2Path.lineTo(27f, 16f);
+            bezier2Path.lineTo(24f, 16f);
+            bezier2Path.lineTo(24f, 19f);
+            bezier2Path.lineTo(20f, 19f);
+            bezier2Path.lineTo(20f, 13f);
+            bezier2Path.lineTo(10f, 13f);
+            bezier2Path.lineTo(10f, 19f);
+            bezier2Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStrokeWidth(5f);
+            paint.setStrokeMiter(10f);
+            canvas.save();
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setColor(strokeColor21);
+            canvas.drawPath(bezier2Path, paint);
+            canvas.restore();
+            
+            canvas.restore();
+        }
+        
+        // Rectangle
+        RectF rectangleRect = CacheForStats.rectangleRect;
+        rectangleRect.set(3f, 6f, 6f, 16f);
+        Path rectanglePath = CacheForStats.rectanglePath;
+        rectanglePath.reset();
+        rectanglePath.addRect(rectangleRect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor40);
+        canvas.drawPath(rectanglePath, paint);
+        
+        // Rectangle 2
+        RectF rectangle2Rect = CacheForStats.rectangle2Rect;
+        rectangle2Rect.set(24f, 6f, 27f, 16f);
+        Path rectangle2Path = CacheForStats.rectangle2Path;
+        rectangle2Path.reset();
+        rectangle2Path.addRect(rectangle2Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor40);
+        canvas.drawPath(rectangle2Path, paint);
+        
+        // Rectangle 3
+        RectF rectangle3Rect = CacheForStats.rectangle3Rect;
+        rectangle3Rect.set(10f, 9f, 20f, 13f);
+        Path rectangle3Path = CacheForStats.rectangle3Path;
+        rectangle3Path.reset();
+        rectangle3Path.addRect(rectangle3Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor107);
+        canvas.drawPath(rectangle3Path, paint);
+        
+        // Rectangle 4
+        RectF rectangle4Rect = CacheForStats.rectangle4Rect;
+        rectangle4Rect.set(12f, 9f, 14f, 13f);
+        Path rectangle4Path = CacheForStats.rectangle4Path;
+        rectangle4Path.reset();
+        rectangle4Path.addRect(rectangle4Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor89);
+        canvas.drawPath(rectangle4Path, paint);
+        
+        // Rectangle 5
+        RectF rectangle5Rect = CacheForStats.rectangle5Rect;
+        rectangle5Rect.set(16f, 9f, 18f, 13f);
+        Path rectangle5Path = CacheForStats.rectangle5Path;
+        rectangle5Path.reset();
+        rectangle5Path.addRect(rectangle5Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor89);
+        canvas.drawPath(rectangle5Path, paint);
+        
+        // Rectangle 6
+        RectF rectangle6Rect = CacheForStats.rectangle6Rect;
+        rectangle6Rect.set(6f, 3f, 10f, 19f);
+        Path rectangle6Path = CacheForStats.rectangle6Path;
+        rectangle6Path.reset();
+        rectangle6Path.addRect(rectangle6Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor35);
+        canvas.drawPath(rectangle6Path, paint);
+        
+        // Rectangle 7
+        RectF rectangle7Rect = CacheForStats.rectangle7Rect;
+        rectangle7Rect.set(20f, 3f, 24f, 19f);
+        Path rectangle7Path = CacheForStats.rectangle7Path;
+        rectangle7Path.reset();
+        rectangle7Path.addRect(rectangle7Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor35);
+        canvas.drawPath(rectangle7Path, paint);
+        
+        // Rectangle 8
+        RectF rectangle8Rect = CacheForStats.rectangle8Rect;
+        rectangle8Rect.set(6f, 3f, 10f, 11f);
+        Path rectangle8Path = CacheForStats.rectangle8Path;
+        rectangle8Path.reset();
+        rectangle8Path.addRect(rectangle8Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor25);
+        canvas.drawPath(rectangle8Path, paint);
+        
+        // Rectangle 9
+        RectF rectangle9Rect = CacheForStats.rectangle9Rect;
+        rectangle9Rect.set(3f, 6f, 6f, 11f);
+        Path rectangle9Path = CacheForStats.rectangle9Path;
+        rectangle9Path.reset();
+        rectangle9Path.addRect(rectangle9Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor35);
+        canvas.drawPath(rectangle9Path, paint);
+        
+        // Rectangle 10
+        RectF rectangle10Rect = CacheForStats.rectangle10Rect;
+        rectangle10Rect.set(24f, 6f, 27f, 11f);
+        Path rectangle10Path = CacheForStats.rectangle10Path;
+        rectangle10Path.reset();
+        rectangle10Path.addRect(rectangle10Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor35);
+        canvas.drawPath(rectangle10Path, paint);
+        
+        // Rectangle 11
+        RectF rectangle11Rect = CacheForStats.rectangle11Rect;
+        rectangle11Rect.set(20f, 3f, 24f, 11f);
+        Path rectangle11Path = CacheForStats.rectangle11Path;
+        rectangle11Path.reset();
+        rectangle11Path.addRect(rectangle11Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor25);
+        canvas.drawPath(rectangle11Path, paint);
+        
+        canvas.restore();
+    }
+    
     
     // Canvas Images
     // Tab
@@ -12967,10 +13344,10 @@ public class HabiticaIcons {
         return imageOfInfoIcon;
     }
     
-    public static Bitmap imageOfContributorBadge(float contributorTier, boolean isNPC) {
+    public static Bitmap imageOfContributorBadge(float _1, boolean isNPC) {
         Bitmap imageOfContributorBadge = Bitmap.createBitmap(16, 16, Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(imageOfContributorBadge);
-        HabiticaIcons.drawContributorBadge(canvas, contributorTier, isNPC);
+        HabiticaIcons.drawContributorBadge(canvas, _1, isNPC);
         
         return imageOfContributorBadge;
     }
@@ -13199,6 +13576,26 @@ public class HabiticaIcons {
         return imageOfAlertIcon;
     }
     
+    public static Bitmap imageOfItemIndicatorLockedDark(int lockColor) {
+        Bitmap imageOfItemIndicatorLockedDark = Bitmap.createBitmap(28, 28, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfItemIndicatorLockedDark);
+        HabiticaIcons.drawItemIndicatorLockedDark(canvas, lockColor);
+        
+        return imageOfItemIndicatorLockedDark;
+    }
+    
+    private static Bitmap imageOfBuffIconDark = null;
+    public static Bitmap imageOfBuffIconDark() {
+        if (imageOfBuffIconDark != null)
+            return imageOfBuffIconDark;
+        
+        imageOfBuffIconDark = Bitmap.createBitmap(15, 15, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfBuffIconDark);
+        HabiticaIcons.drawBuffIconDark(canvas);
+        
+        return imageOfBuffIconDark;
+    }
+    
     
     // Resizing Behavior
     public static void resizingBehaviorApply(ResizingBehavior behavior, RectF rect, RectF target, RectF result) {
@@ -13244,25 +13641,25 @@ public class HabiticaIcons {
 
 class PaintCodeColor extends Color {
     private static float[] ColorToHSV(int originalColor) {
-        float[] hsv = new float[3];
+        float hsv[] = new float[3];
         RGBToHSV(red(originalColor), green(originalColor), blue(originalColor), hsv);
         return hsv;
     }
     
     public static int colorByChangingHue(int originalColor, float newHue) {
-        float[] hsv = ColorToHSV(originalColor);
+        float hsv[] = ColorToHSV(originalColor);
         hsv[0] = newHue;
         return HSVToColor(alpha(originalColor), hsv);
     }
     
     public static int colorByChangingSaturation(int originalColor, float newSaturation) {
-        float[] hsv = ColorToHSV(originalColor);
+        float hsv[] = ColorToHSV(originalColor);
         hsv[1] = newSaturation;
         return HSVToColor(alpha(originalColor), hsv);
     }
     
     public static int colorByChangingValue(int originalColor, float newValue) {
-        float[] hsv = ColorToHSV(originalColor);
+        float hsv[] = ColorToHSV(originalColor);
         hsv[2] = newValue;
         return HSVToColor(alpha(originalColor), hsv);
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
index 79889cb5d..16ac411a9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
@@ -51,6 +51,19 @@ public class HabiticaIconsHelper {
         return imageOfMagic;
     }
 
+    private static Bitmap imageOfMagicLarge = null;
+    public static Bitmap imageOfMagicLarge() {
+        if (imageOfMagicLarge != null)
+            return imageOfMagicLarge;
+
+        int size = scaleSize(36);
+        imageOfMagicLarge = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfMagicLarge);
+        HabiticaIcons.drawMagic(canvas, new RectF(0f, 0f, size, size), HabiticaIcons.ResizingBehavior.AspectFit);
+
+        return imageOfMagicLarge;
+    }
+
     private static Bitmap imageOfGold = null;
     public static Bitmap imageOfGold() {
         if (imageOfGold != null)
@@ -93,6 +106,19 @@ public class HabiticaIconsHelper {
         return imageOfHourglass;
     }
 
+    private static Bitmap imageOfHourglassLarge = null;
+    public static Bitmap imageOfHourglassLarge() {
+        if (imageOfHourglassLarge != null)
+            return imageOfHourglassLarge;
+
+        int size = scaleSize(40);
+        imageOfHourglassLarge = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfHourglassLarge);
+        HabiticaIcons.drawHourglass(canvas, new RectF(0f, 0f, size, size), HabiticaIcons.ResizingBehavior.AspectFit);
+
+        return imageOfHourglassLarge;
+    }
+
     private static Bitmap imageOfExperienceReward = null;
     public static Bitmap imageOfExperienceReward() {
         if (imageOfExperienceReward != null)
@@ -155,8 +181,7 @@ public class HabiticaIconsHelper {
         int size = scaleSize(36);
         imageOfHeartLarge = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(imageOfHeartLarge);
-        canvas.scale(displayDensity, displayDensity);
-        HabiticaIcons.drawHeart(canvas, false);
+        HabiticaIcons.drawHeart(canvas, new RectF(0f, 0f, size, size), HabiticaIcons.ResizingBehavior.AspectFit, false);
 
         return imageOfHeartLarge;
     }
@@ -263,7 +288,7 @@ public class HabiticaIconsHelper {
         imageOfItemIndicatorNumber = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(imageOfItemIndicatorNumber);
         canvas.scale(displayDensity, displayDensity);
-        HabiticaIcons.drawItemIndicator(canvas, Color.parseColor("#C3C0C7"), false, false);
+        HabiticaIcons.drawItemIndicator(canvas, Color.parseColor("#C3C0C7"), false, false, false);
 
         return imageOfItemIndicatorNumber;
     }
@@ -277,7 +302,7 @@ public class HabiticaIconsHelper {
         imageOfItemIndicatorLocked = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(imageOfItemIndicatorLocked);
         canvas.scale(displayDensity, displayDensity);
-        HabiticaIcons.drawItemIndicator(canvas, Color.parseColor("#C3C0C7"), true, false);
+        HabiticaIcons.drawItemIndicator(canvas, Color.parseColor("#C3C0C7"), true, false, false);
         return imageOfItemIndicatorLocked;
     }
 
@@ -290,7 +315,7 @@ public class HabiticaIconsHelper {
         imageOfItemIndicatorLimited = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(imageOfItemIndicatorLimited);
         canvas.scale(displayDensity, displayDensity);
-        HabiticaIcons.drawItemIndicator(canvas, Color.parseColor("#C3C0C7"), false, true);
+        HabiticaIcons.drawItemIndicator(canvas, Color.parseColor("#C3C0C7"), false, true, false);
 
         return imageOfItemIndicatorLimited;
     }
@@ -750,4 +775,15 @@ public class HabiticaIconsHelper {
 
         return imageOfHabitControlMinus;
     }
+
+    public static Bitmap imageOfStats() {
+        int width = scaleSize(30);
+        int height = scaleSize(30);
+        Bitmap imageOfHabitControlMinus = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfHabitControlMinus);
+        canvas.scale(displayDensity, displayDensity);
+        HabiticaIcons.drawStats(canvas);
+
+        return imageOfHabitControlMinus;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SupportCollapsibleSection.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SupportCollapsibleSection.kt
new file mode 100644
index 000000000..b960feebd
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SupportCollapsibleSection.kt
@@ -0,0 +1,52 @@
+package com.habitrpg.android.habitica.ui.views
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.widget.LinearLayout
+import androidx.core.content.ContextCompat
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.SupportCollapsibleSectionBinding
+import com.habitrpg.android.habitica.extensions.layoutInflater
+import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
+
+class SupportCollapsibleSection : LinearLayout {
+    constructor(context: Context) : super(context) {
+        init(null, 0)
+    }
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+        init(attrs, 0)
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle) {
+        init(attrs, defStyle)
+    }
+
+    private fun init(attrs: AttributeSet?, defStyle: Int) {
+        val binding = SupportCollapsibleSectionBinding.inflate(context.layoutInflater, this)
+        val a = context.obtainStyledAttributes(
+                attrs, R.styleable.SupportCollapsibleSection, defStyle, 0)
+
+        orientation = VERTICAL
+
+        binding.titleView.text = a.getString(R.styleable.SupportCollapsibleSection_title)
+        binding.subtitleView.text = a.getString(R.styleable.SupportCollapsibleSection_subtitle)
+        binding.descriptionView.text = MarkdownParser.parseMarkdown(a.getString(R.styleable.SupportCollapsibleSection_description))
+        binding.titleView.setTextColor(a.getColor(R.styleable.SupportCollapsibleSection_titleColor, ContextCompat.getColor(context, R.color.gray_50)))
+
+        background = context.getDrawable(R.drawable.layout_rounded_bg_gray_700)
+
+        a.recycle()
+
+        setOnClickListener {
+            binding.descriptionView.visibility = if (binding.descriptionView.visibility == View.VISIBLE){
+                binding.caretView.setImageResource(R.drawable.ic_keyboard_arrow_down_black_24dp)
+                View.GONE
+            } else{
+                binding.caretView.setImageResource(R.drawable.ic_keyboard_arrow_up_black_24dp)
+                View.VISIBLE
+            }
+        }
+    }
+}
diff --git a/build.gradle b/build.gradle
index 3c189c5d7..520febb9d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0-rc03'
+        classpath 'com.android.tools.build:gradle:3.6.1'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.google.gms:google-services:4.3.3'
         classpath "io.realm:realm-gradle-plugin:6.0.2"

From ff13231a1b37ad2d5ee096b283feb779b45a292a Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 18 Mar 2020 15:33:40 +0100
Subject: [PATCH 41/62] change about screen

---
 Habitica/res/layout/fragment_about.xml        | 12 ------
 Habitica/res/navigation/navigation.xml        |  6 +--
 Habitica/res/values/strings.xml               |  2 +
 .../habitica/ui/fragments/AboutFragment.kt    | 43 +------------------
 4 files changed, 7 insertions(+), 56 deletions(-)

diff --git a/Habitica/res/layout/fragment_about.xml b/Habitica/res/layout/fragment_about.xml
index f7d922441..787574e97 100644
--- a/Habitica/res/layout/fragment_about.xml
+++ b/Habitica/res/layout/fragment_about.xml
@@ -115,18 +115,6 @@
             android:textColor="@color/white"
             android:textSize="@dimen/card_medium_text" />
 
-        <Button
-            android:id="@+id/sendFeedback"
-            android:layout_width="250dp"
-            android:layout_height="35dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="20sp"
-            android:background="@drawable/rounded_purple_square"
-            android:text="@string/about_give_us_feedback"
-            android:textAllCaps="false"
-            android:textColor="@color/white"
-            android:textSize="@dimen/card_medium_text" />
-
         <TextView
             android:id="@+id/sourceCodeLink"
             android:layout_width="match_parent"
diff --git a/Habitica/res/navigation/navigation.xml b/Habitica/res/navigation/navigation.xml
index 09414ef2d..4c102edb9 100644
--- a/Habitica/res/navigation/navigation.xml
+++ b/Habitica/res/navigation/navigation.xml
@@ -203,7 +203,7 @@
     <fragment
         android:id="@+id/FAQOverviewFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.support.FAQOverviewFragment"
-        android:label="@string/sidebar_help" >
+        android:label="@string/habitica_questions">
         <deepLink app:uri="habitica.com/static/faq" />
     </fragment>
     <fragment
@@ -395,7 +395,7 @@
     <fragment
         android:id="@+id/supportMainFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.support.SupportMainFragment"
-        android:label="SupportMainFragment" >
+        android:label="@string/support" >
         <action
             android:id="@+id/showFAQFragment"
             app:destination="@id/FAQOverviewFragment" />
@@ -403,5 +403,5 @@
     <fragment
         android:id="@+id/bugFixFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.support.BugFixFragment"
-        android:label="BugFixFragment" />
+        android:label="@string/bugs_fixes" />
 </navigation>
\ No newline at end of file
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 61d8df76b..1e0792821 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -995,5 +995,7 @@
     <string name="manual_sync_restart_description">Sometimes the app won’t automatically update content. Try pulling to refresh or force closing the app and reopening it.</string>
     <string name="update_app">Update the App</string>
     <string name="update_app_description">We’re constantly pushing out new fixes, so be sure to check the Play Store to see if there are any updates available.</string>
+    <string name="support">Support</string>
     <string name="wacky"> Wacky </string>
+    <string name="habitica_questions">Habitica Questions</string>
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.kt
index 339e4cff8..c34f920ab 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.kt
@@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.ui.fragments
 
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.os.Build
 import android.os.Bundle
 import android.view.Gravity
 import android.view.LayoutInflater
@@ -11,14 +10,13 @@ import android.view.ViewGroup
 import android.view.animation.AccelerateInterpolator
 import android.widget.TextView
 import android.widget.Toast
-import androidx.core.app.ShareCompat
 import androidx.core.net.toUri
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.AppTestingLevel
 import com.habitrpg.android.habitica.helpers.DeviceName
+import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import com.habitrpg.android.habitica.ui.helpers.bindView
@@ -122,8 +120,7 @@ class AboutFragment : BaseMainFragment() {
         sourceCodeLink.setOnClickListener { openBrowserLink(androidSourceCodeLink) }
         twitter.setOnClickListener { openBrowserLink(twitterLink) }
         sourceCodeButton.setOnClickListener { openBrowserLink(androidSourceCodeLink) }
-        reportBug.setOnClickListener { sendEmail("[Android] Bugreport") }
-        sendFeedback.setOnClickListener { sendEmail("[Android] Feedback") }
+        reportBug.setOnClickListener { MainNavigationController.navigate(R.id.bugFixFragment) }
         googlePlayStoreButton.setOnClickListener { openGooglePlay() }
         updateAvailableWrapper.setOnClickListener { openGooglePlay() }
     }
@@ -134,42 +131,6 @@ class AboutFragment : BaseMainFragment() {
         startActivity(launchBrowser)
     }
 
-    private fun sendEmail(subject: String) {
-        val version = Build.VERSION.SDK_INT
-        val deviceName = deviceInfo?.name ?: DeviceName.getDeviceName()
-        val manufacturer = deviceInfo?.manufacturer ?: Build.MANUFACTURER
-        var bodyOfEmail = "Device: $manufacturer $deviceName" +
-                " \nAndroid Version: $version"+
-                " \nAppVersion: " + getString(R.string.version_info, versionName, versionCode)
-
-        if (appConfigManager.testingLevel().name != AppTestingLevel.PRODUCTION.name) {
-            bodyOfEmail += " ${appConfigManager.testingLevel().name}"
-        }
-        bodyOfEmail += " \nUser ID: $userId"
-
-        val user = this.user
-        if (user != null) {
-            bodyOfEmail += " \nLevel: " + (user.stats?.lvl ?: 0) +
-                    " \nClass: " + (if (user.preferences?.disableClasses == true) "Disabled" else (user.stats?.habitClass ?: "None")) +
-                    " \nIs in Inn: " + (user.preferences?.sleep ?: false) +
-                    " \nUses Costume: " + (user.preferences?.costume ?: false) +
-                    " \nCustom Day Start: " + (user.preferences?.dayStart ?: 0) +
-                    " \nTimezone Offset: " + (user.preferences?.timezoneOffset ?: 0)
-        }
-
-        bodyOfEmail += " \nDetails:\n"
-
-        activity?.let {
-            ShareCompat.IntentBuilder.from(it)
-                .setType("message/rfc822")
-                .addEmailTo(appConfigManager.supportEmail())
-                .setSubject(subject)
-                .setText(bodyOfEmail)
-                .setChooserTitle("Send email...")
-                .startChooser()
-        }
-    }
-
     private fun doTheThing() {
         context?.let { FirebaseAnalytics.getInstance(it).logEvent("found_easter_egg", null) }
         DataBindingUtils.loadImage("Pet-Sabretooth-Base") {bitmap ->

From fad0c956d941f10fc68bac3d901cf7ab8bd94de1 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 18 Mar 2020 16:50:17 +0100
Subject: [PATCH 42/62] =?UTF-8?q?Fix=20showing=20=E2=80=9CRead=20more?=
 =?UTF-8?q?=E2=80=9D=20#1245?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../habitrpg/android/habitica/ui/views/EllipsisTextView.kt | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EllipsisTextView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EllipsisTextView.kt
index afbbb7a5b..2842b3002 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EllipsisTextView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EllipsisTextView.kt
@@ -16,7 +16,6 @@ package com.habitrpg.android.habitica.ui.views
 
 import android.content.Context
 import android.util.AttributeSet
-import com.habitrpg.android.habitica.R
 
 class EllipsisTextView : HabiticaEmojiTextView {
 
@@ -56,10 +55,8 @@ class EllipsisTextView : HabiticaEmojiTextView {
         val layout = layout
         if (layout != null) {
             val lines = layout.lineCount
-            if (lines > 0) {
-                if (layout.getEllipsisCount(lines - 1) > 0) {
-                    ellipses = true
-                }
+            if (lines >= maxLines) {
+                ellipses = true
             }
         }
 

From bcaf8762f5f78d8f5efd1685f6dc756642b89199 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 18 Mar 2020 17:02:16 +0100
Subject: [PATCH 43/62] Give feedback when quest invitation is accepted. Fixes
 #1253

---
 .../android/habitica/ui/viewmodels/PartyViewModel.kt      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/PartyViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/PartyViewModel.kt
index ef0546baf..3540b9e52 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/PartyViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/PartyViewModel.kt
@@ -44,13 +44,17 @@ class PartyViewModel: GroupViewModel() {
 
     fun acceptQuest() {
         groupIDSubject.value?.value?.let {
-            disposable.add(socialRepository.acceptQuest(null, it).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+            disposable.add(socialRepository.acceptQuest(null, it)
+                    .flatMap { userRepository.retrieveUser() }
+                    .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
         }
     }
 
     fun rejectQuest() {
         groupIDSubject.value?.value?.let {
-            disposable.add(socialRepository.rejectQuest(null, it).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+            disposable.add(socialRepository.rejectQuest(null, it)
+                    .flatMap { userRepository.retrieveUser() }
+                    .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
         }
     }
 

From 55bac855dbbcc7d44b0422fe7451f226751e2625 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 19 Mar 2020 13:12:49 +0100
Subject: [PATCH 44/62] Add back ability to message from overview screen. Fixes
 #1075

---
 Habitica/build.gradle                         |  2 +-
 .../dialog_choose_message_recipient.xml       | 29 ++++++++++--
 Habitica/res/menu/inbox.xml                   | 10 +++++
 Habitica/res/values/strings.xml               |  1 +
 .../fragments/social/InboxOverviewFragment.kt | 45 ++++++++++++-------
 .../ui/views/dialogs/HabiticaAlertDialog.kt   |  6 +--
 6 files changed, 70 insertions(+), 23 deletions(-)
 create mode 100644 Habitica/res/menu/inbox.xml

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index a4fb03b4a..03707291e 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -155,7 +155,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 2384
+        versionCode 2386
         versionName "2.5"
     }
 
diff --git a/Habitica/res/layout/dialog_choose_message_recipient.xml b/Habitica/res/layout/dialog_choose_message_recipient.xml
index 36f4e7712..5408a9872 100644
--- a/Habitica/res/layout/dialog_choose_message_recipient.xml
+++ b/Habitica/res/layout/dialog_choose_message_recipient.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:paddingLeft="20dp"
-    android:paddingRight="20dp">
+    android:paddingRight="20dp"
+    android:gravity="center_horizontal">
 
     <TextView
             android:layout_width="match_parent"
@@ -18,4 +20,23 @@
             android:id="@+id/uuidEditText" android:layout_gravity="center_horizontal"
             android:focusable="true"
             android:maxLines="1"/>
+
+    <ProgressBar
+        android:id="@+id/progress_circular"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        tools:visibility="visible"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/error_text_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/spacing_medium"
+        android:layout_marginBottom="@dimen/spacing_medium"
+        android:text="@string/could_not_find_user"
+        android:textColor="@color/red_50"
+        tools:visibility="visible"
+        android:gravity="center_horizontal"
+        android:visibility="gone"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/menu/inbox.xml b/Habitica/res/menu/inbox.xml
new file mode 100644
index 000000000..a2c69decb
--- /dev/null
+++ b/Habitica/res/menu/inbox.xml
@@ -0,0 +1,10 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.habitrpg.android.habitica.TaskActivity">
+
+    <item android:id="@+id/send_message"
+        android:icon="@drawable/menu_messages"
+        android:title="@string/send_message"
+        app:showAsAction="ifRoom" />
+</menu>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 1e0792821..204c34edb 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -998,4 +998,5 @@
     <string name="support">Support</string>
     <string name="wacky"> Wacky </string>
     <string name="habitica_questions">Habitica Questions</string>
+    <string name="could_not_find_user">Could not find user</string>
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt
index 204e61d1d..21ba46114 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt
@@ -2,15 +2,12 @@ package com.habitrpg.android.habitica.ui.fragments.social
 
 import android.content.Context
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import android.widget.EditText
+import android.view.*
 import android.widget.TextView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.databinding.DialogChooseMessageRecipientBinding
 import com.habitrpg.android.habitica.extensions.getAgoString
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.MainNavigationController
@@ -37,8 +34,6 @@ class InboxOverviewFragment : BaseMainFragment(), androidx.swiperefreshlayout.wi
     @Inject
     lateinit var configManager: AppConfigManager
 
-    private var chooseRecipientDialogView: View? = null
-
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         this.hidesToolbar = true
@@ -69,6 +64,11 @@ class InboxOverviewFragment : BaseMainFragment(), androidx.swiperefreshlayout.wi
         super.onDestroy()
     }
 
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        this.activity?.menuInflater?.inflate(R.menu.inbox, menu)
+        super.onCreateOptionsMenu(menu, inflater)
+    }
+
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.send_message -> {
@@ -81,19 +81,34 @@ class InboxOverviewFragment : BaseMainFragment(), androidx.swiperefreshlayout.wi
 
     private fun openNewMessageDialog() {
         assert(this.activity != null)
-        this.chooseRecipientDialogView = this.activity?.layoutInflater?.inflate(R.layout.dialog_choose_message_recipient, null)
+        val binding = DialogChooseMessageRecipientBinding.inflate(layoutInflater)
 
         this.activity?.let { thisActivity ->
             val alert = HabiticaAlertDialog(thisActivity)
             alert.setTitle(getString(R.string.choose_recipient_title))
-            alert.addButton(getString(R.string.action_continue), true) { _, _ ->
-                    val uuidEditText = chooseRecipientDialogView?.findViewById<View>(R.id.uuidEditText) as? EditText
-                    openInboxMessages(uuidEditText?.text?.toString() ?: "", "")
-                }
+            alert.addButton(
+                    getString(R.string.action_continue),
+                    true,
+                    false,
+                    false
+            ) { _, _ ->
+                binding.errorTextView.visibility = View.GONE
+                binding.progressCircular.visibility = View.VISIBLE
+                val username = binding.uuidEditText.text?.toString() ?: ""
+                socialRepository.getMemberWithUsername(username)
+                        .subscribe({
+                            alert.dismiss()
+                            openInboxMessages("", username)
+                            binding.progressCircular.visibility = View.GONE
+                        }, {
+                            binding.errorTextView.visibility = View.VISIBLE
+                            binding.progressCircular.visibility = View.GONE
+                        })
+            }
             alert.addButton(getString(R.string.action_cancel), false) { dialog, _ ->
-                    thisActivity.dismissKeyboard()
-                }
-            alert.setAdditionalContentView(chooseRecipientDialogView)
+                thisActivity.dismissKeyboard()
+            }
+            alert.setAdditionalContentView(binding.root)
             alert.show()
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt
index 4aaf10598..3d099bff8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt
@@ -149,10 +149,10 @@ open class HabiticaAlertDialog(context: Context) : AlertDialog(context, R.style.
     fun getContentView(): View? = additionalContentView
 
     fun addButton(stringRes: Int, isPrimary: Boolean, isDestructive: Boolean = false, function: ((HabiticaAlertDialog, Int) -> Unit)? = null): Button {
-        return addButton(context.getString(stringRes), isPrimary, isDestructive, function)
+        return addButton(context.getString(stringRes), isPrimary, isDestructive, true, function)
     }
 
-    fun addButton(string: String, isPrimary: Boolean, isDestructive: Boolean = false, function: ((HabiticaAlertDialog, Int) -> Unit)? = null): Button {
+    fun addButton(string: String, isPrimary: Boolean, isDestructive: Boolean = false, autoDismiss: Boolean = true, function: ((HabiticaAlertDialog, Int) -> Unit)? = null): Button {
         val button: Button = if (isPrimary) {
             if (isDestructive) {
                 buttonsWrapper.inflate(R.layout.dialog_habitica_primary_destructive_button) as? Button
@@ -169,7 +169,7 @@ open class HabiticaAlertDialog(context: Context) : AlertDialog(context, R.style.
         button.text = string
         button.minWidth = 147.dpToPx(context)
         button.setScaledPadding(context, 20, 0, 20, 0)
-        return addButton(button, true, function) as Button
+        return addButton(button, autoDismiss, function) as Button
     }
 
 

From af286c8ac8cbef528a81b4fb15d798b0f4ecc854 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 19 Mar 2020 13:32:18 +0100
Subject: [PATCH 45/62] add profile button to inbox messages

---
 Habitica/res/menu/inbox_chat.xml              |  6 +++++
 .../social/InboxMessageListFragment.kt        | 23 ++++++++++++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 Habitica/res/menu/inbox_chat.xml

diff --git a/Habitica/res/menu/inbox_chat.xml b/Habitica/res/menu/inbox_chat.xml
new file mode 100644
index 000000000..0d735c0bc
--- /dev/null
+++ b/Habitica/res/menu/inbox_chat.xml
@@ -0,0 +1,6 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+    <item android:id="@+id/open_profile" android:title="@string/profile"
+        android:orderInCategory="100" app:showAsAction="always" />
+</menu>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt
index 1dbf353e8..0ddcc3387 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt
@@ -4,9 +4,7 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
+import android.view.*
 import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
@@ -101,6 +99,21 @@ class InboxMessageListFragment : BaseMainFragment(), androidx.swiperefreshlayout
         super.onDestroy()
     }
 
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        this.activity?.menuInflater?.inflate(R.menu.inbox_chat, menu)
+        super.onCreateOptionsMenu(menu, inflater)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.open_profile -> {
+                openProfile()
+                return true
+            }
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
     override fun injectFragment(component: UserComponent) {
         component.inject(this)
     }
@@ -136,6 +149,7 @@ class InboxMessageListFragment : BaseMainFragment(), androidx.swiperefreshlayout
     private fun setReceivingUser(chatRoomUser: String?, replyToUserUUID: String) {
         this.chatRoomUser = chatRoomUser
         this.replyToUserUUID = replyToUserUUID
+        activity?.title = chatRoomUser
     }
 
     private fun copyMessageToClipboard(chatMessage: ChatMessage) {
@@ -165,4 +179,7 @@ class InboxMessageListFragment : BaseMainFragment(), androidx.swiperefreshlayout
         }
     }
 
+    private fun openProfile() {
+        replyToUserUUID?.let { FullProfileActivity.open(it) }
+    }
 }

From 3d9a4eb950c0c51872747c5e13d170a0222eaf46 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 19 Mar 2020 16:50:55 +0100
Subject: [PATCH 46/62] Fix minor display issues

---
 .../res/layout/fragment_avatar_overview.xml   |  15 ++
 Habitica/res/values/strings.xml               |   2 +
 .../habitica/components/UserComponent.java    |   3 +
 .../RealmInventoryLocalRepository.kt          |   2 +-
 .../habitica/models/inventory/Equipment.kt    |   1 +
 .../habitica/models/user/Preferences.kt       |   2 +-
 .../AvatarCustomizationFragment.kt            |   3 +
 .../customization/AvatarEquipmentFragment.kt  | 159 ++++++++++++++++++
 .../customization/AvatarOverviewFragment.kt   |  85 ++++++----
 .../utils/EquipmentListDeserializer.java      |   1 +
 10 files changed, 234 insertions(+), 39 deletions(-)
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt

diff --git a/Habitica/res/layout/fragment_avatar_overview.xml b/Habitica/res/layout/fragment_avatar_overview.xml
index a7fc72751..73006f3e3 100644
--- a/Habitica/res/layout/fragment_avatar_overview.xml
+++ b/Habitica/res/layout/fragment_avatar_overview.xml
@@ -71,6 +71,21 @@
                     android:layout_height="wrap_content"
                     android:id="@+id/avatarChairView"
                     app:equipmentTitle="@string/avatar_wheelchair"/>
+                <com.habitrpg.android.habitica.ui.views.EquipmentItemRow
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/avatar_glasses_view"
+                    app:equipmentTitle="@string/avatar_glasses"/>
+                <com.habitrpg.android.habitica.ui.views.EquipmentItemRow
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/avatar_animal_ears_view"
+                    app:equipmentTitle="@string/animal_ears"/>
+                <com.habitrpg.android.habitica.ui.views.EquipmentItemRow
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/avatar_animal_tail_view"
+                    app:equipmentTitle="@string/animal_tail"/>
             </LinearLayout>
         </androidx.cardview.widget.CardView>
         <TextView
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 204c34edb..cb7ae02c8 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -999,4 +999,6 @@
     <string name="wacky"> Wacky </string>
     <string name="habitica_questions">Habitica Questions</string>
     <string name="could_not_find_user">Could not find user</string>
+    <string name="animal_ears">Animal Ears</string>
+    <string name="animal_tail">Animal Tail</string>
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
index cba5512de..125a3a599 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
@@ -46,6 +46,7 @@ import com.habitrpg.android.habitica.ui.fragments.NavigationDrawerFragment;
 import com.habitrpg.android.habitica.ui.fragments.NewsFragment;
 import com.habitrpg.android.habitica.ui.fragments.StatsFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarCustomizationFragment;
+import com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarEquipmentFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarOverviewFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentDetailFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentOverviewFragment;
@@ -334,4 +335,6 @@ public interface UserComponent {
     void inject(@NotNull SupportMainFragment supportMainFragment);
 
     void inject(@NotNull BugFixFragment bugFixFragment);
+
+    void inject(@NotNull AvatarEquipmentFragment avatarEquipmentFragment);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
index d831b2f65..d331ce09a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
@@ -316,7 +316,7 @@ class RealmInventoryLocalRepository(realm: Realm, private val context: Context)
     override fun getLatestMysteryItem(): Flowable<Equipment> {
         return realm.where(Equipment::class.java)
                 .contains("key", "mystery_2")
-                .sort("key", Sort.DESCENDING)
+                .sort("mystery", Sort.DESCENDING)
                 .findAll()
                 .asFlowable()
                 .filter { it.isLoaded && it.size > 0}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Equipment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Equipment.kt
index e28d7c761..2eadf6a3f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Equipment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Equipment.kt
@@ -23,4 +23,5 @@ open class Equipment : RealmObject() {
     var _int: Int = 0
     var owned: Boolean? = null
     var twoHanded = false
+    var mystery = ""
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
index ef7644cda..a70c6a7ed 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
@@ -94,7 +94,7 @@ open class Preferences : RealmObject(), AvatarPreferences {
 
     override fun getChair(): String? {
         return if (chair != null && chair != "none") {
-            if (chair!!.length > 5 && chair!!.substring(0, 6) != "chair_") {
+            if (chair?.substring(0, 6) == "chair_") {
                 chair
             } else {
                 "chair_" + chair!!
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
index 9f59a5ce1..7de853f05 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
@@ -8,6 +8,7 @@ import androidx.recyclerview.widget.GridLayoutManager
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.CustomizationRepository
+import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.inventory.Customization
@@ -27,6 +28,8 @@ class AvatarCustomizationFragment : BaseMainFragment() {
 
     @Inject
     lateinit var customizationRepository: CustomizationRepository
+    @Inject
+    lateinit var inventoryRepository: InventoryRepository
 
     var type: String? = null
     var category: String? = null
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt
new file mode 100644
index 000000000..11a8ff1c7
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt
@@ -0,0 +1,159 @@
+package com.habitrpg.android.habitica.ui.fragments.inventory.customization
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.GridLayoutManager
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.components.UserComponent
+import com.habitrpg.android.habitica.data.InventoryRepository
+import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
+import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.models.responses.UnlockResponse
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.ui.adapter.CustomizationRecyclerViewAdapter
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import com.habitrpg.android.habitica.ui.helpers.MarginDecoration
+import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
+import io.reactivex.Flowable
+import io.reactivex.functions.Consumer
+import kotlinx.android.synthetic.main.fragment_recyclerview.*
+import javax.inject.Inject
+
+class AvatarEquipmentFragment : BaseMainFragment() {
+
+    @Inject
+    lateinit var inventoryRepository: InventoryRepository
+
+    var type: String? = null
+    var category: String? = null
+    private var activeEquipment: String? = null
+
+    internal var adapter: CustomizationRecyclerViewAdapter = CustomizationRecyclerViewAdapter()
+    internal var layoutManager: GridLayoutManager = GridLayoutManager(activity, 2)
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        super.onCreateView(inflater, container, savedInstanceState)
+        val view = inflater.inflate(R.layout.fragment_recyclerview, container, false)
+
+        compositeSubscription.add(adapter.getSelectCustomizationEvents()
+                .flatMap { customization ->
+                    userRepository.useCustomization(user, customization.type ?: "", customization.category, customization.identifier ?: "")
+                }
+                .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(adapter.getUnlockCustomizationEvents()
+                .flatMap<UnlockResponse> { customization ->
+                    val user = this.user
+                    if (user != null) {
+                        userRepository.unlockPath(user, customization)
+                    } else {
+                        Flowable.empty()
+                    }
+                }
+                .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(adapter.getUnlockSetEvents()
+                .flatMap<UnlockResponse> { set ->
+                    val user = this.user
+                    if (user != null) {
+                        userRepository.unlockPath(user, set)
+                    } else {
+                        Flowable.empty()
+                    }
+                }
+                .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+        return view
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        arguments?.let {
+            val args = AvatarCustomizationFragmentArgs.fromBundle(it)
+            type = args.type
+            if (args.category.isNotEmpty()) {
+                category = args.category
+            }
+        }
+
+        setGridSpanCount(view.width)
+        val layoutManager = GridLayoutManager(activity, 2)
+        layoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
+            override fun getSpanSize(position: Int): Int {
+                return if (adapter.getItemViewType(position) == 0) {
+                    layoutManager.spanCount
+                } else {
+                    1
+                }
+            }
+        }
+        recyclerView.layoutManager = layoutManager
+        recyclerView.addItemDecoration(MarginDecoration(context))
+
+        recyclerView.adapter = adapter
+        recyclerView.itemAnimator = SafeDefaultItemAnimator()
+        this.loadEquipment()
+
+        compositeSubscription.add(userRepository.getUser().subscribeWithErrorHandler(Consumer {
+            updateUser(it)
+        }))
+    }
+
+    override fun injectFragment(component: UserComponent) {
+        component.inject(this)
+    }
+
+    private fun loadEquipment() {
+        val type = this.type ?: return
+    }
+
+    private fun setGridSpanCount(width: Int) {
+        val itemWidth = context?.resources?.getDimension(R.dimen.customization_width) ?: 0F
+        var spanCount = (width / itemWidth).toInt()
+        if (spanCount == 0) {
+            spanCount = 1
+        }
+        layoutManager.spanCount = spanCount
+    }
+
+    fun updateUser(user: User) {
+        this.updateActiveCustomization(user)
+        if (adapter.customizationList.size != 0) {
+            val ownedCustomizations = ArrayList<String>()
+            user.purchased?.customizations?.filter { it.type == this.type }?.mapTo(ownedCustomizations) { it.id }
+            adapter.updateOwnership(ownedCustomizations)
+        } else {
+            this.loadEquipment()
+        }
+        this.adapter.userSize = this.user?.preferences?.size
+        this.adapter.hairColor = this.user?.preferences?.hair?.color
+        this.adapter.gemBalance = user.gemCount
+        adapter.notifyDataSetChanged()
+    }
+
+    private fun updateActiveCustomization(user: User) {
+        if (this.type == null || user.preferences == null) {
+            return
+        }
+        val prefs = this.user?.preferences
+        val activeEquipment = when (this.type) {
+            "skin" -> prefs?.skin
+            "shirt" -> prefs?.shirt
+            "background" -> prefs?.background
+            "hair" -> when (this.category) {
+                "bangs" -> prefs?.hair?.bangs.toString()
+                "base" -> prefs?.hair?.base.toString()
+                "color" -> prefs?.hair?.color
+                "flower" -> prefs?.hair?.flower.toString()
+                "beard" -> prefs?.hair?.beard.toString()
+                "mustache" -> prefs?.hair?.mustache.toString()
+                else -> ""
+            }
+            else -> ""
+        }
+        if (activeEquipment != null) {
+            this.activeEquipment = activeEquipment
+            this.adapter.activeCustomization = activeEquipment
+        }
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
index 082512a2a..66e3efef2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
@@ -5,38 +5,43 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.AdapterView
-import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
+import com.habitrpg.android.habitica.databinding.FragmentAvatarOverviewBinding
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import io.reactivex.functions.Consumer
-import kotlinx.android.synthetic.main.fragment_avatar_overview.*
 
 class AvatarOverviewFragment : BaseMainFragment(), AdapterView.OnItemSelectedListener {
 
+    private lateinit var binding: FragmentAvatarOverviewBinding
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         super.onCreateView(inflater, container, savedInstanceState)
-        return inflater.inflate(R.layout.fragment_avatar_overview, container, false)
+        binding = FragmentAvatarOverviewBinding.inflate(inflater, container, false)
+        return binding.root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        avatarSizeSpinner.onItemSelectedListener = this
+        binding.avatarSizeSpinner.onItemSelectedListener = this
 
-        avatarShirtView.setOnClickListener { displayCustomizationFragment("shirt", null) }
-        avatarSkinView.setOnClickListener { displayCustomizationFragment("skin", null) }
-        avatarChairView.setOnClickListener { displayCustomizationFragment("chair", null) }
-        avatarHairColorView.setOnClickListener { displayCustomizationFragment("hair", "color") }
-        avatarHairBangsView.setOnClickListener { displayCustomizationFragment("hair", "bangs") }
-        avatarHairBaseView.setOnClickListener { displayCustomizationFragment("hair", "base") }
-        avatarHairFlowerView.setOnClickListener { displayCustomizationFragment("hair", "flower") }
-        avatarHairBeardView.setOnClickListener { displayCustomizationFragment("hair", "beard") }
-        avatarHairMustacheView.setOnClickListener { displayCustomizationFragment("hair", "mustache") }
-        avatarBackgroundView.setOnClickListener { displayCustomizationFragment("background", null) }
+        binding.avatarShirtView.setOnClickListener { displayCustomizationFragment("shirt", null) }
+        binding.avatarSkinView.setOnClickListener { displayCustomizationFragment("skin", null) }
+        binding.avatarChairView.setOnClickListener { displayCustomizationFragment("chair", null) }
+        binding.avatarGlassesView.setOnClickListener { displayCustomizationFragment("eyewear", null) }
+        binding.avatarAnimalEarsView.setOnClickListener { displayCustomizationFragment("animal_ears", null) }
+        binding.avatarAnimalTailView.setOnClickListener { displayCustomizationFragment("animal_tails", null) }
+        binding.avatarHairColorView.setOnClickListener { displayCustomizationFragment("hair", "color") }
+        binding.avatarHairBangsView.setOnClickListener { displayCustomizationFragment("hair", "bangs") }
+        binding.avatarHairBaseView.setOnClickListener { displayCustomizationFragment("hair", "base") }
+        binding.avatarHairFlowerView.setOnClickListener { displayCustomizationFragment("hair", "flower") }
+        binding.avatarHairBeardView.setOnClickListener { displayCustomizationFragment("hair", "beard") }
+        binding.avatarHairMustacheView.setOnClickListener { displayCustomizationFragment("hair", "mustache") }
+        binding.avatarBackgroundView.setOnClickListener { displayCustomizationFragment("background", null) }
 
         compositeSubscription.add(userRepository.getUser().subscribeWithErrorHandler(Consumer {
             updateUser(it)
@@ -57,37 +62,43 @@ class AvatarOverviewFragment : BaseMainFragment(), AdapterView.OnItemSelectedLis
     }
 
     private fun setCustomizations(user: User) {
-        avatarShirtView.customizationIdentifier = user.preferences?.size + "_shirt_" + user.preferences?.shirt
-        avatarShirtView.equipmentName = user.preferences?.shirt
-        avatarSkinView.customizationIdentifier = "skin_" + user.preferences?.skin
-        avatarSkinView.equipmentName = user.preferences?.skin
+        binding.avatarShirtView.customizationIdentifier = user.preferences?.size + "_shirt_" + user.preferences?.shirt
+        binding.avatarShirtView.equipmentName = user.preferences?.shirt
+        binding.avatarSkinView.customizationIdentifier = "skin_" + user.preferences?.skin
+        binding.avatarSkinView.equipmentName = user.preferences?.skin
         val chair = user.preferences?.chair
-        avatarChairView.customizationIdentifier = if (chair?.startsWith("handleless") == true) "chair_$chair" else chair
-        avatarChairView.equipmentName = chair?.removePrefix("chair_")
-        avatarHairColorView.customizationIdentifier = if (user.preferences?.hair?.color != null && user.preferences?.hair?.color != "") "hair_bangs_1_" + user.preferences?.hair?.color else ""
-        avatarHairColorView.equipmentName = user.preferences?.hair?.color
-        avatarHairBangsView.customizationIdentifier = if (user.preferences?.hair?.bangs != null && user.preferences?.hair?.bangs != 0) "hair_bangs_" + user.preferences?.hair?.bangs + "_" + user.preferences?.hair?.color else ""
-        avatarHairBangsView.equipmentName = user.preferences?.hair?.bangs.toString()
-        avatarHairBaseView.customizationIdentifier = if (user.preferences?.hair?.base != null && user.preferences?.hair?.base != 0) "hair_base_" + user.preferences?.hair?.base + "_" + user.preferences?.hair?.color else ""
-        avatarHairBaseView.equipmentName = user.preferences?.hair?.base.toString()
-        avatarHairFlowerView.customizationIdentifier = if (user.preferences?.hair?.flower != null && user.preferences?.hair?.flower != 0) "hair_flower_" + user.preferences?.hair?.flower else ""
-        avatarHairFlowerView.equipmentName = user.preferences?.hair?.bangs.toString()
-        avatarHairBeardView.customizationIdentifier = if (user.preferences?.hair?.beard != null && user.preferences?.hair?.beard != 0) "hair_beard_" + user.preferences?.hair?.beard + "_" + user.preferences?.hair?.color else ""
-        avatarHairBeardView.equipmentName = user.preferences?.hair?.beard.toString()
-        avatarHairMustacheView.customizationIdentifier = if (user.preferences?.hair?.mustache != null && user.preferences?.hair?.mustache != 0) "hair_mustache_" + user.preferences?.hair?.mustache + "_" + user.preferences?.hair?.color else ""
-        avatarHairMustacheView.equipmentName = user.preferences?.hair?.mustache.toString()
-        avatarBackgroundView.customizationIdentifier = "background_" + user.preferences?.background
-        avatarBackgroundView.equipmentName = user.preferences?.background
+        binding.avatarChairView.customizationIdentifier = if (chair?.startsWith("handleless") == true) "chair_$chair" else chair
+        binding.avatarChairView.equipmentName = chair?.removePrefix("chair_")
+        binding.avatarGlassesView.customizationIdentifier = "shop_" + user.equipped?.eyeWear
+        binding.avatarGlassesView.equipmentName = user.equipped?.eyeWear
+        binding.avatarAnimalEarsView.customizationIdentifier = "shop_" + user.equipped?.headAccessory
+        binding.avatarAnimalEarsView.equipmentName = user.equipped?.headAccessory
+        binding.avatarAnimalTailView.customizationIdentifier = "shop_" + user.equipped?.back
+        binding.avatarAnimalTailView.equipmentName = user.equipped?.back
+        binding.avatarHairColorView.customizationIdentifier = if (user.preferences?.hair?.color != null && user.preferences?.hair?.color != "") "hair_bangs_1_" + user.preferences?.hair?.color else ""
+        binding.avatarHairColorView.equipmentName = user.preferences?.hair?.color
+        binding.avatarHairBangsView.customizationIdentifier = if (user.preferences?.hair?.bangs != null && user.preferences?.hair?.bangs != 0) "hair_bangs_" + user.preferences?.hair?.bangs + "_" + user.preferences?.hair?.color else ""
+        binding.avatarHairBangsView.equipmentName = user.preferences?.hair?.bangs.toString()
+        binding.avatarHairBaseView.customizationIdentifier = if (user.preferences?.hair?.base != null && user.preferences?.hair?.base != 0) "hair_base_" + user.preferences?.hair?.base + "_" + user.preferences?.hair?.color else ""
+        binding.avatarHairBaseView.equipmentName = user.preferences?.hair?.base.toString()
+        binding.avatarHairFlowerView.customizationIdentifier = if (user.preferences?.hair?.flower != null && user.preferences?.hair?.flower != 0) "hair_flower_" + user.preferences?.hair?.flower else ""
+        binding.avatarHairFlowerView.equipmentName = user.preferences?.hair?.bangs.toString()
+        binding.avatarHairBeardView.customizationIdentifier = if (user.preferences?.hair?.beard != null && user.preferences?.hair?.beard != 0) "hair_beard_" + user.preferences?.hair?.beard + "_" + user.preferences?.hair?.color else ""
+        binding.avatarHairBeardView.equipmentName = user.preferences?.hair?.beard.toString()
+        binding.avatarHairMustacheView.customizationIdentifier = if (user.preferences?.hair?.mustache != null && user.preferences?.hair?.mustache != 0) "hair_mustache_" + user.preferences?.hair?.mustache + "_" + user.preferences?.hair?.color else ""
+        binding.avatarHairMustacheView.equipmentName = user.preferences?.hair?.mustache.toString()
+        binding.avatarBackgroundView.customizationIdentifier = "background_" + user.preferences?.background
+        binding.avatarBackgroundView.equipmentName = user.preferences?.background
     }
 
     private fun setSize(size: String?) {
-        if (avatarSizeSpinner == null || size == null) {
+        if (size == null) {
             return
         }
         if (size == "slim") {
-            avatarSizeSpinner.setSelection(0, false)
+            binding.avatarSizeSpinner.setSelection(0, false)
         } else {
-            avatarSizeSpinner.setSelection(1, false)
+            binding.avatarSizeSpinner.setSelection(1, false)
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EquipmentListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EquipmentListDeserializer.java
index 1f35d1c32..d1516f9ff 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EquipmentListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EquipmentListDeserializer.java
@@ -43,6 +43,7 @@ public class EquipmentListDeserializer implements JsonDeserializer<List<Equipmen
                         item.setPer(parsedItem.getPer());
                         item.set_int(parsedItem.get_int());
                         item.setTwoHanded(parsedItem.getTwoHanded());
+                        item.setMystery(parsedItem.getMystery());
                     } else {
                         item.setOwned(itemObject.getAsBoolean());
                     }

From dadc3885fa2629bce24d2572cc19d41acdc53688 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Fri, 20 Mar 2020 17:37:29 +0100
Subject: [PATCH 47/62] Implement more avatar customization options. Fixes
 #1137

---
 Habitica/build.gradle                         |   2 +-
 ...ayout_rounded_bg_gray_700_brand_border.xml |   7 +
 .../res/layout/customization_grid_item.xml    |  64 +++----
 .../layout/customization_section_header.xml   |  39 ++++-
 .../res/layout/fragment_avatar_overview.xml   |  42 ++++-
 Habitica/res/navigation/navigation.xml        |  14 ++
 Habitica/res/values/dimens.xml                |   2 +-
 Habitica/res/values/strings.xml               |   3 +
 .../habitica/data/InventoryRepository.kt      |   1 +
 .../implementation/InventoryRepositoryImpl.kt |   4 +
 .../data/local/InventoryLocalRepository.kt    |   1 +
 .../RealmInventoryLocalRepository.kt          |   9 +
 .../habitica/models/inventory/Equipment.kt    |   1 +
 ...stomizationEquipmentRecyclerViewAdapter.kt | 157 ++++++++++++++++++
 .../CustomizationRecyclerViewAdapter.kt       |  48 +++---
 .../AvatarCustomizationFragment.kt            |   4 +-
 .../customization/AvatarEquipmentFragment.kt  |  52 ++----
 .../customization/AvatarOverviewFragment.kt   |  35 ++--
 .../habitica/ui/views/EquipmentItemRow.kt     |  21 +--
 .../utils/EquipmentListDeserializer.java      |   1 +
 20 files changed, 363 insertions(+), 144 deletions(-)
 create mode 100644 Habitica/res/drawable/layout_rounded_bg_gray_700_brand_border.xml
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationEquipmentRecyclerViewAdapter.kt

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 03707291e..dcdbfa64f 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -155,7 +155,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 2386
+        versionCode 2388
         versionName "2.5"
     }
 
diff --git a/Habitica/res/drawable/layout_rounded_bg_gray_700_brand_border.xml b/Habitica/res/drawable/layout_rounded_bg_gray_700_brand_border.xml
new file mode 100644
index 000000000..727262a5e
--- /dev/null
+++ b/Habitica/res/drawable/layout_rounded_bg_gray_700_brand_border.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/gray_700" />
+    <corners android:radius="@dimen/rounded_button_radius"/>
+    <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
+    <stroke android:color="@color/brand_300" android:width="2dp" />
+</shape>
\ No newline at end of file
diff --git a/Habitica/res/layout/customization_grid_item.xml b/Habitica/res/layout/customization_grid_item.xml
index c37ca4360..5d60f1577 100644
--- a/Habitica/res/layout/customization_grid_item.xml
+++ b/Habitica/res/layout/customization_grid_item.xml
@@ -1,37 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/card_view"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_width="match_parent">
-    <RelativeLayout
-        android:id="@+id/linearLayout"
-        android:layout_width="match_parent"
-        android:layout_height="90dp"
-        android:minHeight="60dp"
+    android:minHeight="60dp">
+
+    <LinearLayout
+        android:id="@+id/wrapper"
+        android:layout_width="76dp"
+        android:layout_height="wrap_content"
+        android:background="@drawable/layout_rounded_bg_gray_700"
         android:orientation="vertical"
-        android:clickable="true"
-        android:background="@drawable/selection_highlight">
-        <View
-            android:id="@+id/purchaseOverlay"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:background="@android:color/black" />
+        android:layout_gravity="center">
+
         <com.facebook.drawee.view.SimpleDraweeView
             android:id="@+id/imageView"
             android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:layout_gravity="center_horizontal"
-            android:scaleType="fitEnd"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
-            android:layout_centerVertical="true"
-            android:layout_centerHorizontal="true" />
-
-    </RelativeLayout>
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+            android:layout_height="76dp"
+            android:layout_gravity="start"
+            android:scaleType="fitEnd" />
+        <FrameLayout
+            android:id="@+id/buy_button"
+            android:layout_width="match_parent"
+            android:layout_height="32dp"
+            android:background="@drawable/layout_rounded_bg_shopitem_price">
+                    <com.habitrpg.android.habitica.ui.views.CurrencyView
+                        android:id="@+id/price_label"
+                        android:layout_width="wrap_content"
+                        android:layout_height="32dp"
+                        android:textColor="@color/gray_300"
+                        tools:text="150"
+                        style="@style/Body1"
+                        app:hasLightBackground="true"
+                        android:textSize="15sp"
+                        android:layout_gravity="center" />
+        </FrameLayout>
+    </LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/customization_section_header.xml b/Habitica/res/layout/customization_section_header.xml
index 66ef678c9..8a7df6961 100644
--- a/Habitica/res/layout/customization_section_header.xml
+++ b/Habitica/res/layout/customization_section_header.xml
@@ -1,21 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal" android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
     android:layout_height="65dp"
-    android:paddingTop="16dp">
+    android:paddingTop="16dp"
+    android:gravity="bottom"
+    android:layout_marginStart="20dp"
+    android:layout_marginEnd="20dp">
 <TextView
     android:id="@+id/label"
     android:layout_width="0dp"
     android:layout_height="wrap_content"
     android:layout_weight="1"
-    android:layout_gravity="bottom"
-    android:textAppearance="?android:attr/textAppearanceMedium"
-    android:layout_marginLeft="@dimen/section_leftright_padding"
-    android:layout_marginRight="@dimen/section_leftright_padding"/>
+    android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-    <Button
+    <LinearLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="40dp"
         android:id="@+id/purchaseSetButton"
-        android:visibility="gone" />
+        android:visibility="gone"
+        android:orientation="horizontal"
+        android:gravity="center"
+        tools:visibility="visible"
+        android:paddingStart="@dimen/spacing_medium"
+        android:paddingEnd="@dimen/spacing_medium"
+        android:background="@drawable/layout_rounded_bg_gray_700">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/buy_all"
+            android:textAllCaps="true"
+            android:textColor="@color/brand_300"
+            style="@style/Body1"
+            android:layout_marginEnd="@dimen/spacing_medium"/>
+        <com.habitrpg.android.habitica.ui.views.CurrencyView
+            android:id="@+id/set_price_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_avatar_overview.xml b/Habitica/res/layout/fragment_avatar_overview.xml
index 73006f3e3..3df829751 100644
--- a/Habitica/res/layout/fragment_avatar_overview.xml
+++ b/Habitica/res/layout/fragment_avatar_overview.xml
@@ -33,7 +33,8 @@
                 <LinearLayout
                     android:orientation="horizontal"
                     android:layout_width="match_parent"
-                    android:layout_height="50dp">
+                    android:layout_height="50dp"
+                    android:gravity="center_vertical">
 
                     <TextView
                         android:layout_width="0dp"
@@ -52,7 +53,6 @@
                         android:layout_height="match_parent"
                         android:id="@+id/avatarSizeSpinner"
                         android:spinnerMode="dropdown"
-                        android:layout_marginRight="8dp"
                         android:layout_marginEnd="8dp"
                         android:entries="@array/avatar_sizes"/>
                 </LinearLayout>
@@ -66,6 +66,30 @@
                     android:layout_height="wrap_content"
                     android:id="@+id/avatarSkinView"
                     app:equipmentTitle="@string/avatar_skin"/>
+            </LinearLayout>
+        </androidx.cardview.widget.CardView>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/avatar_extras"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            style="@style/SectionTitle"/>
+
+        <androidx.cardview.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/CardView.Default">
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:divider="?android:listDivider"
+                android:showDividers="middle">
+                <com.habitrpg.android.habitica.ui.views.EquipmentItemRow
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/avatar_glasses_view"
+                    app:equipmentTitle="@string/avatar_glasses"/>
                 <com.habitrpg.android.habitica.ui.views.EquipmentItemRow
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -74,8 +98,8 @@
                 <com.habitrpg.android.habitica.ui.views.EquipmentItemRow
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:id="@+id/avatar_glasses_view"
-                    app:equipmentTitle="@string/avatar_glasses"/>
+                    android:id="@+id/avatar_accent_view"
+                    app:equipmentTitle="@string/avatar_accent" />
                 <com.habitrpg.android.habitica.ui.views.EquipmentItemRow
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -86,6 +110,11 @@
                     android:layout_height="wrap_content"
                     android:id="@+id/avatar_animal_tail_view"
                     app:equipmentTitle="@string/animal_tail"/>
+                <com.habitrpg.android.habitica.ui.views.EquipmentItemRow
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/avatar_headband_view"
+                    app:equipmentTitle="@string/avatar_headband"/>
             </LinearLayout>
         </androidx.cardview.widget.CardView>
         <TextView
@@ -120,11 +149,6 @@
                     android:layout_height="wrap_content"
                     android:id="@+id/avatarHairBangsView"
                     app:equipmentTitle="@string/avatar_bangs" />
-                <com.habitrpg.android.habitica.ui.views.EquipmentItemRow
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/avatarHairFlowerView"
-                    app:equipmentTitle="@string/avatar_flower" />
                 <com.habitrpg.android.habitica.ui.views.EquipmentItemRow
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
diff --git a/Habitica/res/navigation/navigation.xml b/Habitica/res/navigation/navigation.xml
index 4c102edb9..2ffe26ba0 100644
--- a/Habitica/res/navigation/navigation.xml
+++ b/Habitica/res/navigation/navigation.xml
@@ -123,6 +123,9 @@
         <action
             android:id="@+id/openAvatarDetail"
             app:destination="@id/avatarCustomizationFragment" />
+        <action
+            android:id="@+id/openAvatarEquipment"
+            app:destination="@id/avatarEquipmentFragment" />
     </fragment>
     <fragment
         android:id="@+id/itemsFragment"
@@ -254,6 +257,17 @@
             android:name="category"
             app:argType="string" />
     </fragment>
+    <fragment
+        android:id="@+id/avatarEquipmentFragment"
+        android:name="com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarEquipmentFragment"
+        android:label="@string/sidebar_avatar" >
+        <argument
+            android:name="type"
+            app:argType="string" />
+        <argument
+            android:name="category"
+            app:argType="string" />
+    </fragment>
     <activity
         android:id="@+id/prefsActivity"
         android:name="com.habitrpg.android.habitica.ui.activities.PrefsActivity"
diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml
index 8148fdabb..3b56e5900 100644
--- a/Habitica/res/values/dimens.xml
+++ b/Habitica/res/values/dimens.xml
@@ -44,7 +44,7 @@
     <dimen name="grid_item_margin">6dp</dimen>
     <dimen name="avatar_small_width">90dp</dimen>
     <dimen name="avatar_small_height">90dp</dimen>
-    <dimen name="customization_width">100dp</dimen>
+    <dimen name="customization_width">76dp</dimen>
     <dimen name="gear_image_size">68dp</dimen>
     <dimen name="row_padding">12dp</dimen>
     <dimen name="row_title_size">16sp</dimen>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index cb7ae02c8..fc6d791a1 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -1001,4 +1001,7 @@
     <string name="could_not_find_user">Could not find user</string>
     <string name="animal_ears">Animal Ears</string>
     <string name="animal_tail">Animal Tail</string>
+    <string name="avatar_headband">Headband</string>
+    <string name="avatar_accent">Accent</string>
+    <string name="buy_all">Buy All</string>
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt
index 310a24668..2b64387ac 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt
@@ -31,6 +31,7 @@ interface InventoryRepository : BaseRepository {
     fun retrieveInAppRewards(): Flowable<List<ShopItem>>
 
     fun getOwnedEquipment(type: String): Flowable<RealmResults<Equipment>>
+    fun getEquipmentType(type: String, set: String): Flowable<RealmResults<Equipment>>
 
     fun getOwnedItems(itemType: String): Flowable<RealmResults<OwnedItem>>
     fun getOwnedItems(): Flowable<Map<String, OwnedItem>>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
index 81fcc8f4a..328826ac5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
@@ -46,6 +46,10 @@ class InventoryRepositoryImpl(localRepository: InventoryLocalRepository, apiClie
         return localRepository.getOwnedEquipment()
     }
 
+    override fun getEquipmentType(type: String, set: String): Flowable<RealmResults<Equipment>> {
+        return localRepository.getEquipmentType(type, set)
+    }
+
     override fun getOwnedItems(itemType: String): Flowable<RealmResults<OwnedItem>> {
         return localRepository.getOwnedItems(itemType, userID)
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt
index be2942e53..08331e26e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt
@@ -33,6 +33,7 @@ interface InventoryLocalRepository : ContentLocalRepository {
     fun getItems(itemClass: Class<out Item>, keys: Array<String>, user: User?): Flowable<out RealmResults<out Item>>
     fun getOwnedItems(itemType: String, userID: String): Flowable<RealmResults<OwnedItem>>
     fun getOwnedItems(userID: String): Flowable<Map<String, OwnedItem>>
+    fun getEquipmentType(type: String, set: String): Flowable<RealmResults<Equipment>>
 
     fun getEquipment(key: String): Flowable<Equipment>
     fun getMounts(type: String, group: String, color: String?): Flowable<RealmResults<Mount>>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
index d331ce09a..2d5aeb0d6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
@@ -70,6 +70,15 @@ class RealmInventoryLocalRepository(realm: Realm, private val context: Context)
                 .filter { it.isLoaded }
     }
 
+    override fun getEquipmentType(type: String, set: String): Flowable<RealmResults<Equipment>> {
+        return realm.where(Equipment::class.java)
+                .equalTo("type", type)
+                .equalTo("gearSet", set)
+                .findAll()
+                .asFlowable()
+                .filter { it.isLoaded }
+    }
+
     override fun getOwnedItems(itemType: String, userID: String): Flowable<RealmResults<OwnedItem>> {
         return realm.where(OwnedItem::class.java)
                 .greaterThan("numberOwned", 0)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Equipment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Equipment.kt
index 2eadf6a3f..7213096d8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Equipment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Equipment.kt
@@ -24,4 +24,5 @@ open class Equipment : RealmObject() {
     var owned: Boolean? = null
     var twoHanded = false
     var mystery = ""
+    var gearSet = ""
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationEquipmentRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationEquipmentRecyclerViewAdapter.kt
new file mode 100644
index 000000000..68f6edf29
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationEquipmentRecyclerViewAdapter.kt
@@ -0,0 +1,157 @@
+package com.habitrpg.android.habitica.ui.adapter
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.core.os.bundleOf
+import com.facebook.drawee.view.SimpleDraweeView
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.CustomizationGridItemBinding
+import com.habitrpg.android.habitica.helpers.MainNavigationController
+import com.habitrpg.android.habitica.models.inventory.CustomizationSet
+import com.habitrpg.android.habitica.models.inventory.Equipment
+import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import io.reactivex.BackpressureStrategy
+import io.reactivex.Flowable
+import io.reactivex.subjects.PublishSubject
+import java.util.*
+
+class CustomizationEquipmentRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
+
+    var gemBalance: Int = 0
+    var equipmentList
+            : MutableList<Equipment> = ArrayList()
+    set(value) {
+        field = value
+        notifyDataSetChanged()
+    }
+    var activeEquipment: String? = null
+    set(value) {
+        field = value
+        this.notifyDataSetChanged()
+    }
+
+    private val selectCustomizationEvents = PublishSubject.create<Equipment>()
+    private val unlockCustomizationEvents = PublishSubject.create<Equipment>()
+    private val unlockSetEvents = PublishSubject.create<CustomizationSet>()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder {
+        val viewID: Int = R.layout.customization_grid_item
+
+        val view = LayoutInflater.from(parent.context).inflate(viewID, parent, false)
+        return EquipmentViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) {
+        (holder as EquipmentViewHolder).bind(equipmentList[position])
+    }
+
+    override fun getItemCount(): Int {
+        return equipmentList.size
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return if (this.equipmentList[position].javaClass == CustomizationSet::class.java) {
+            0
+        } else {
+            1
+        }
+    }
+
+    fun setEquipment(newEquipmentList: List<Equipment>) {
+        this.equipmentList = newEquipmentList.toMutableList()
+        this.notifyDataSetChanged()
+    }
+
+    fun getSelectCustomizationEvents(): Flowable<Equipment> {
+        return selectCustomizationEvents.toFlowable(BackpressureStrategy.DROP)
+    }
+
+    fun getUnlockCustomizationEvents(): Flowable<Equipment> {
+        return unlockCustomizationEvents.toFlowable(BackpressureStrategy.DROP)
+    }
+
+    fun getUnlockSetEvents(): Flowable<CustomizationSet> {
+        return unlockSetEvents.toFlowable(BackpressureStrategy.DROP)
+    }
+
+    internal inner class EquipmentViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener {
+
+        private val binding = CustomizationGridItemBinding.bind(itemView)
+        var equipment: Equipment? = null
+
+        init {
+            itemView.setOnClickListener(this)
+        }
+
+        fun bind(equipment: Equipment) {
+            this.equipment = equipment
+            DataBindingUtils.loadImage(binding.imageView, "shop_" + this.equipment?.key)
+            if (equipment.owned == true || equipment.value == 0.0) {
+                binding.buyButton.visibility = View.GONE
+            } else {
+                binding.buyButton.visibility = View.VISIBLE
+                binding.priceLabel.currency = "gems"
+                binding.priceLabel.value = if (equipment.gearSet == "animal") {
+                    2.0
+                } else {
+                    equipment.value
+                }
+            }
+
+            if (activeEquipment == equipment.key) {
+                binding.wrapper.background = itemView.context.getDrawable(R.drawable.layout_rounded_bg_gray_700_brand_border)
+            } else {
+                binding.wrapper.background = itemView.context.getDrawable(R.drawable.layout_rounded_bg_gray_700)
+            }
+        }
+
+        override fun onClick(v: View) {
+            if (equipment?.owned != true && (equipment?.value ?: 0.0) > 0.0) {
+                val dialogContent = LayoutInflater.from(itemView.context).inflate(R.layout.dialog_purchase_customization, null) as LinearLayout
+
+                val imageView = dialogContent.findViewById<SimpleDraweeView>(R.id.imageView)
+                DataBindingUtils.loadImage(imageView, "shop_" + this.equipment?.key)
+
+                val priceLabel = dialogContent.findViewById<TextView>(R.id.priceLabel)
+                priceLabel.text = if (equipment?.gearSet == "animal") {
+                    2.0
+                } else {
+                    equipment?.value ?: 0
+                }.toString()
+
+                (dialogContent.findViewById<View>(R.id.gem_icon) as? ImageView)?.setImageBitmap(HabiticaIconsHelper.imageOfGem())
+
+                val dialog = HabiticaAlertDialog(itemView.context)
+                dialog.addButton(R.string.purchase_button, true) { _, _ ->
+                    if (equipment?.value ?: 0.0 > gemBalance) {
+                        MainNavigationController.navigate(R.id.gemPurchaseActivity, bundleOf(Pair("openSubscription", false)))
+                        return@addButton
+                    }
+
+                    equipment?.let {
+                        unlockCustomizationEvents.onNext(it)
+                    }
+                }
+                dialog.setTitle(R.string.purchase_customization)
+                dialog.setAdditionalContentView(dialogContent)
+                dialog.addButton(R.string.reward_dialog_dismiss, false)
+                dialog.show()
+                return
+            }
+
+            if (equipment?.key == activeEquipment) {
+                return
+            }
+
+            equipment?.let {
+                selectCustomizationEvents.onNext(it)
+            }
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
index 97cd93b1b..d1603b19e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
@@ -4,11 +4,14 @@ import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.*
-import androidx.core.content.ContextCompat
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
 import androidx.core.os.bundleOf
 import com.facebook.drawee.view.SimpleDraweeView
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.CustomizationGridItemBinding
+import com.habitrpg.android.habitica.databinding.CustomizationSectionHeaderBinding
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.models.inventory.Customization
 import com.habitrpg.android.habitica.models.inventory.CustomizationSet
@@ -125,35 +128,33 @@ class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerVi
 
     internal inner class CustomizationViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener {
 
-        private val cardView: androidx.cardview.widget.CardView by bindView(itemView, R.id.card_view)
-        private val linearLayout: RelativeLayout by bindView(itemView, R.id.linearLayout)
-        private val imageView: SimpleDraweeView by bindView(itemView, R.id.imageView)
-        private val purchaseOverlay: View by bindView(itemView, R.id.purchaseOverlay)
-
+        private val binding = CustomizationGridItemBinding.bind(itemView)
         var customization: Customization? = null
 
         init {
-            linearLayout.setOnClickListener(this)
+            itemView.setOnClickListener(this)
         }
 
         fun bind(customization: Customization) {
             this.customization = customization
 
             if (customization.customizationSet?.contains("timeTravel") == true) {
-                DataBindingUtils.loadImage(this.imageView, customization.getImageName(userSize, hairColor), imageFormat = "gif")
+                DataBindingUtils.loadImage(binding.imageView, customization.getImageName(userSize, hairColor), imageFormat = "gif")
             } else {
-                DataBindingUtils.loadImage(this.imageView, customization.getImageName(userSize, hairColor))
+                DataBindingUtils.loadImage(binding.imageView, customization.getImageName(userSize, hairColor))
             }
-            cardView.setCardBackgroundColor(ContextCompat.getColor(itemView.context, android.R.color.white))
             if (customization.isUsable) {
-                imageView.alpha = 1.0f
-                purchaseOverlay.alpha = 0.0f
-                if (customization.identifier == activeCustomization) {
-                    cardView.setCardBackgroundColor(ContextCompat.getColor(itemView.context, R.color.brand_500))
-                }
+                binding.buyButton.visibility = View.GONE
             } else {
-                imageView.alpha = 0.3f
-                purchaseOverlay.alpha = 0.8f
+                binding.buyButton.visibility = View.VISIBLE
+                binding.priceLabel.currency = "gems"
+                binding.priceLabel.value = customization.price.toDouble()
+            }
+
+            if (activeCustomization == customization.identifier) {
+                binding.wrapper.background = itemView.context.getDrawable(R.drawable.layout_rounded_bg_gray_700_brand_border)
+            } else {
+                binding.wrapper.background = itemView.context.getDrawable(R.drawable.layout_rounded_bg_gray_700)
             }
         }
 
@@ -209,23 +210,24 @@ class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerVi
 
     internal inner class SectionViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener {
 
+        private val binding = CustomizationSectionHeaderBinding.bind(itemView)
         private val label: TextView by bindView(itemView, R.id.label)
-        private val purchaseSetButton: Button by bindView(itemView, R.id.purchaseSetButton)
         var context: Context = itemView.context
         private var set: CustomizationSet? = null
 
         init {
-            purchaseSetButton.setOnClickListener(this)
+            binding.purchaseSetButton.setOnClickListener(this)
         }
 
         fun bind(set: CustomizationSet) {
             this.set = set
             this.label.text = set.text
             if (set.hasPurchasable && !set.identifier.contains("timeTravel")) {
-                this.purchaseSetButton.visibility = View.VISIBLE
-                this.purchaseSetButton.text = context.getString(R.string.purchase_set_button, set.price)
+                binding.purchaseSetButton.visibility = View.VISIBLE
+                binding.setPriceLabel.value = set.price.toDouble()
+                binding.setPriceLabel.currency = "gems"
             } else {
-                this.purchaseSetButton.visibility = View.GONE
+                binding.purchaseSetButton.visibility = View.GONE
             }
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
index 7de853f05..682c31e50 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
@@ -83,8 +83,7 @@ class AvatarCustomizationFragment : BaseMainFragment() {
             }
         }
 
-        setGridSpanCount(view.width)
-        val layoutManager = GridLayoutManager(activity, 2)
+        val layoutManager = GridLayoutManager(activity, 4)
         layoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
             override fun getSpanSize(position: Int): Int {
                 return if (adapter.getItemViewType(position) == 0) {
@@ -94,6 +93,7 @@ class AvatarCustomizationFragment : BaseMainFragment() {
                 }
             }
         }
+        setGridSpanCount(view.width)
         recyclerView.layoutManager = layoutManager
         recyclerView.addItemDecoration(MarginDecoration(context))
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt
index 11a8ff1c7..2e55d5d05 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt
@@ -12,7 +12,7 @@ import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.responses.UnlockResponse
 import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.adapter.CustomizationRecyclerViewAdapter
+import com.habitrpg.android.habitica.ui.adapter.CustomizationEquipmentRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.helpers.MarginDecoration
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
@@ -30,7 +30,7 @@ class AvatarEquipmentFragment : BaseMainFragment() {
     var category: String? = null
     private var activeEquipment: String? = null
 
-    internal var adapter: CustomizationRecyclerViewAdapter = CustomizationRecyclerViewAdapter()
+    internal var adapter: CustomizationEquipmentRecyclerViewAdapter = CustomizationEquipmentRecyclerViewAdapter()
     internal var layoutManager: GridLayoutManager = GridLayoutManager(activity, 2)
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
@@ -39,18 +39,13 @@ class AvatarEquipmentFragment : BaseMainFragment() {
         val view = inflater.inflate(R.layout.fragment_recyclerview, container, false)
 
         compositeSubscription.add(adapter.getSelectCustomizationEvents()
-                .flatMap { customization ->
-                    userRepository.useCustomization(user, customization.type ?: "", customization.category, customization.identifier ?: "")
+                .flatMap { equipment ->
+                    inventoryRepository.equip(user, if (user?.preferences?.costume == true) "costume" else "equipped", equipment.key ?: "")
                 }
                 .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
         compositeSubscription.add(adapter.getUnlockCustomizationEvents()
-                .flatMap<UnlockResponse> { customization ->
-                    val user = this.user
-                    if (user != null) {
-                        userRepository.unlockPath(user, customization)
-                    } else {
-                        Flowable.empty()
-                    }
+                .flatMap<UnlockResponse> {
+                    Flowable.empty()
                 }
                 .subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
         compositeSubscription.add(adapter.getUnlockSetEvents()
@@ -69,7 +64,7 @@ class AvatarEquipmentFragment : BaseMainFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         arguments?.let {
-            val args = AvatarCustomizationFragmentArgs.fromBundle(it)
+            val args = AvatarEquipmentFragmentArgs.fromBundle(it)
             type = args.type
             if (args.category.isNotEmpty()) {
                 category = args.category
@@ -77,7 +72,7 @@ class AvatarEquipmentFragment : BaseMainFragment() {
         }
 
         setGridSpanCount(view.width)
-        val layoutManager = GridLayoutManager(activity, 2)
+        val layoutManager = GridLayoutManager(activity, 4)
         layoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
             override fun getSpanSize(position: Int): Int {
                 return if (adapter.getItemViewType(position) == 0) {
@@ -105,6 +100,9 @@ class AvatarEquipmentFragment : BaseMainFragment() {
 
     private fun loadEquipment() {
         val type = this.type ?: return
+        inventoryRepository.getEquipmentType(type, category ?: "").subscribe(Consumer {
+            adapter.setEquipment(it)
+        }, RxErrorHandler.handleEmptyError())
     }
 
     private fun setGridSpanCount(width: Int) {
@@ -118,15 +116,6 @@ class AvatarEquipmentFragment : BaseMainFragment() {
 
     fun updateUser(user: User) {
         this.updateActiveCustomization(user)
-        if (adapter.customizationList.size != 0) {
-            val ownedCustomizations = ArrayList<String>()
-            user.purchased?.customizations?.filter { it.type == this.type }?.mapTo(ownedCustomizations) { it.id }
-            adapter.updateOwnership(ownedCustomizations)
-        } else {
-            this.loadEquipment()
-        }
-        this.adapter.userSize = this.user?.preferences?.size
-        this.adapter.hairColor = this.user?.preferences?.hair?.color
         this.adapter.gemBalance = user.gemCount
         adapter.notifyDataSetChanged()
     }
@@ -135,25 +124,16 @@ class AvatarEquipmentFragment : BaseMainFragment() {
         if (this.type == null || user.preferences == null) {
             return
         }
-        val prefs = this.user?.preferences
+        val outfit = if (user.preferences?.costume == true) this.user?.items?.gear?.costume else this.user?.items?.gear?.equipped
         val activeEquipment = when (this.type) {
-            "skin" -> prefs?.skin
-            "shirt" -> prefs?.shirt
-            "background" -> prefs?.background
-            "hair" -> when (this.category) {
-                "bangs" -> prefs?.hair?.bangs.toString()
-                "base" -> prefs?.hair?.base.toString()
-                "color" -> prefs?.hair?.color
-                "flower" -> prefs?.hair?.flower.toString()
-                "beard" -> prefs?.hair?.beard.toString()
-                "mustache" -> prefs?.hair?.mustache.toString()
-                else -> ""
-            }
+            "headAccessory" -> outfit?.headAccessory
+            "back" -> outfit?.back
+            "eyewear" -> outfit?.eyeWear
             else -> ""
         }
         if (activeEquipment != null) {
             this.activeEquipment = activeEquipment
-            this.adapter.activeCustomization = activeEquipment
+            this.adapter.activeEquipment = activeEquipment
         }
     }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
index 66e3efef2..2cfb1db99 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
@@ -32,13 +32,14 @@ class AvatarOverviewFragment : BaseMainFragment(), AdapterView.OnItemSelectedLis
         binding.avatarShirtView.setOnClickListener { displayCustomizationFragment("shirt", null) }
         binding.avatarSkinView.setOnClickListener { displayCustomizationFragment("skin", null) }
         binding.avatarChairView.setOnClickListener { displayCustomizationFragment("chair", null) }
-        binding.avatarGlassesView.setOnClickListener { displayCustomizationFragment("eyewear", null) }
-        binding.avatarAnimalEarsView.setOnClickListener { displayCustomizationFragment("animal_ears", null) }
-        binding.avatarAnimalTailView.setOnClickListener { displayCustomizationFragment("animal_tails", null) }
+        binding.avatarGlassesView.setOnClickListener { displayEquipmentFragment("eyewear", "glasses") }
+        binding.avatarAnimalEarsView.setOnClickListener { displayEquipmentFragment("headAccessory", "animal") }
+        binding.avatarAnimalTailView.setOnClickListener { displayEquipmentFragment("back", "animal") }
+        binding.avatarHeadbandView.setOnClickListener { displayEquipmentFragment("headAccessory", "headband") }
         binding.avatarHairColorView.setOnClickListener { displayCustomizationFragment("hair", "color") }
         binding.avatarHairBangsView.setOnClickListener { displayCustomizationFragment("hair", "bangs") }
         binding.avatarHairBaseView.setOnClickListener { displayCustomizationFragment("hair", "base") }
-        binding.avatarHairFlowerView.setOnClickListener { displayCustomizationFragment("hair", "flower") }
+        binding.avatarAccentView.setOnClickListener { displayCustomizationFragment("hair", "flower") }
         binding.avatarHairBeardView.setOnClickListener { displayCustomizationFragment("hair", "beard") }
         binding.avatarHairMustacheView.setOnClickListener { displayCustomizationFragment("hair", "mustache") }
         binding.avatarBackgroundView.setOnClickListener { displayCustomizationFragment("background", null) }
@@ -56,6 +57,10 @@ class AvatarOverviewFragment : BaseMainFragment(), AdapterView.OnItemSelectedLis
         MainNavigationController.navigate(AvatarOverviewFragmentDirections.openAvatarDetail(type, category ?: ""))
     }
 
+    private fun displayEquipmentFragment(type: String, category: String?) {
+        MainNavigationController.navigate(AvatarOverviewFragmentDirections.openAvatarEquipment(type, category ?: ""))
+    }
+
     fun updateUser(user: User) {
         this.setSize(user.preferences?.size)
         setCustomizations(user)
@@ -63,32 +68,20 @@ class AvatarOverviewFragment : BaseMainFragment(), AdapterView.OnItemSelectedLis
 
     private fun setCustomizations(user: User) {
         binding.avatarShirtView.customizationIdentifier = user.preferences?.size + "_shirt_" + user.preferences?.shirt
-        binding.avatarShirtView.equipmentName = user.preferences?.shirt
         binding.avatarSkinView.customizationIdentifier = "skin_" + user.preferences?.skin
-        binding.avatarSkinView.equipmentName = user.preferences?.skin
         val chair = user.preferences?.chair
         binding.avatarChairView.customizationIdentifier = if (chair?.startsWith("handleless") == true) "chair_$chair" else chair
-        binding.avatarChairView.equipmentName = chair?.removePrefix("chair_")
-        binding.avatarGlassesView.customizationIdentifier = "shop_" + user.equipped?.eyeWear
-        binding.avatarGlassesView.equipmentName = user.equipped?.eyeWear
-        binding.avatarAnimalEarsView.customizationIdentifier = "shop_" + user.equipped?.headAccessory
-        binding.avatarAnimalEarsView.equipmentName = user.equipped?.headAccessory
-        binding.avatarAnimalTailView.customizationIdentifier = "shop_" + user.equipped?.back
-        binding.avatarAnimalTailView.equipmentName = user.equipped?.back
+        binding.avatarGlassesView.equipmentIdentifier = user.equipped?.eyeWear
+        binding.avatarAnimalEarsView.equipmentIdentifier = user.equipped?.headAccessory
+        binding.avatarHeadbandView.equipmentIdentifier = user.equipped?.headAccessory
+        binding.avatarAnimalTailView.equipmentIdentifier = user.equipped?.back
         binding.avatarHairColorView.customizationIdentifier = if (user.preferences?.hair?.color != null && user.preferences?.hair?.color != "") "hair_bangs_1_" + user.preferences?.hair?.color else ""
-        binding.avatarHairColorView.equipmentName = user.preferences?.hair?.color
         binding.avatarHairBangsView.customizationIdentifier = if (user.preferences?.hair?.bangs != null && user.preferences?.hair?.bangs != 0) "hair_bangs_" + user.preferences?.hair?.bangs + "_" + user.preferences?.hair?.color else ""
-        binding.avatarHairBangsView.equipmentName = user.preferences?.hair?.bangs.toString()
         binding.avatarHairBaseView.customizationIdentifier = if (user.preferences?.hair?.base != null && user.preferences?.hair?.base != 0) "hair_base_" + user.preferences?.hair?.base + "_" + user.preferences?.hair?.color else ""
-        binding.avatarHairBaseView.equipmentName = user.preferences?.hair?.base.toString()
-        binding.avatarHairFlowerView.customizationIdentifier = if (user.preferences?.hair?.flower != null && user.preferences?.hair?.flower != 0) "hair_flower_" + user.preferences?.hair?.flower else ""
-        binding.avatarHairFlowerView.equipmentName = user.preferences?.hair?.bangs.toString()
+        binding.avatarAccentView.customizationIdentifier = if (user.preferences?.hair?.flower != null && user.preferences?.hair?.flower != 0) "hair_flower_" + user.preferences?.hair?.flower else ""
         binding.avatarHairBeardView.customizationIdentifier = if (user.preferences?.hair?.beard != null && user.preferences?.hair?.beard != 0) "hair_beard_" + user.preferences?.hair?.beard + "_" + user.preferences?.hair?.color else ""
-        binding.avatarHairBeardView.equipmentName = user.preferences?.hair?.beard.toString()
         binding.avatarHairMustacheView.customizationIdentifier = if (user.preferences?.hair?.mustache != null && user.preferences?.hair?.mustache != 0) "hair_mustache_" + user.preferences?.hair?.mustache + "_" + user.preferences?.hair?.color else ""
-        binding.avatarHairMustacheView.equipmentName = user.preferences?.hair?.mustache.toString()
         binding.avatarBackgroundView.customizationIdentifier = "background_" + user.preferences?.background
-        binding.avatarBackgroundView.equipmentName = user.preferences?.background
     }
 
     private fun setSize(size: String?) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EquipmentItemRow.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EquipmentItemRow.kt
index 8e50fe6bd..f53dda804 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EquipmentItemRow.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EquipmentItemRow.kt
@@ -5,40 +5,37 @@ import android.util.AttributeSet
 import android.view.View
 import android.widget.LinearLayout
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.ItemImageRowBinding
+import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
-import kotlinx.android.synthetic.main.item_image_row.view.*
 
-class EquipmentItemRow(context: Context?, attrs: AttributeSet?) : LinearLayout(context, attrs) {
+class EquipmentItemRow(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs) {
 
+    private val binding: ItemImageRowBinding = ItemImageRowBinding.inflate(context.layoutInflater, this)
     var equipmentIdentifier: String? = null
     set(value) {
         field = value
         val imageName = if (equipmentIdentifier?.isNotEmpty() == true && equipmentIdentifier?.endsWith("base_0") == false) "shop_$equipmentIdentifier" else "head_0"
-        DataBindingUtils.loadImage(imageView, imageName)
+        DataBindingUtils.loadImage(binding.imageView, imageName)
     }
 
     var customizationIdentifier: String? = null
     set(value) {
         field = value
         val imageName = if (customizationIdentifier?.isNotEmpty() == true) customizationIdentifier else "head_0"
-        DataBindingUtils.loadImage(imageView, imageName)
-    }
-
-    var equipmentName: String? = ""
-    set(value) {
-        field = value
-        valueTextView.text = equipmentName
+        DataBindingUtils.loadImage(binding.imageView, imageName)
     }
 
     init {
         View.inflate(context, R.layout.item_image_row, this)
         isClickable = true
 
-        val attributes = context?.theme?.obtainStyledAttributes(
+        val attributes = context.theme?.obtainStyledAttributes(
                 attrs,
                 R.styleable.EquipmentItemRow,
                 0, 0)
 
-        titleTextView.text = attributes?.getString(R.styleable.EquipmentItemRow_equipmentTitle)
+        binding.titleTextView.text = attributes?.getString(R.styleable.EquipmentItemRow_equipmentTitle)
+        binding.valueTextView.visibility = View.GONE
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EquipmentListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EquipmentListDeserializer.java
index d1516f9ff..366a3009a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EquipmentListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EquipmentListDeserializer.java
@@ -44,6 +44,7 @@ public class EquipmentListDeserializer implements JsonDeserializer<List<Equipmen
                         item.set_int(parsedItem.get_int());
                         item.setTwoHanded(parsedItem.getTwoHanded());
                         item.setMystery(parsedItem.getMystery());
+                        item.setGearSet(parsedItem.getGearSet());
                     } else {
                         item.setOwned(itemObject.getAsBoolean());
                     }

From 944493652ea6b7820c40ea12464250bba9e82265 Mon Sep 17 00:00:00 2001
From: Leland Wu <leland.wu4@gmail.com>
Date: Sat, 21 Mar 2020 14:45:22 -0400
Subject: [PATCH 48/62] fix crash happening in pets & mounts (#1275)

* create binding variable to make consistent with Customization section view holder in stablerecycleradapter

* remove comment
---
 .../android/habitica/ui/viewHolders/SectionViewHolder.kt     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.kt
index 9a74a2b70..b05085a9a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.kt
@@ -9,12 +9,13 @@ import android.widget.Button
 import android.widget.Spinner
 import android.widget.TextView
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.CustomizationSectionHeaderBinding
 import com.habitrpg.android.habitica.ui.helpers.bindView
 
 class SectionViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
+    private val binding = CustomizationSectionHeaderBinding.bind(itemView)
     private val label: TextView by bindView(itemView, R.id.label)
-    private val purchaseSetButton: Button? by bindView(itemView, R.id.purchaseSetButton)
     private val selectionSpinner: Spinner? by bindView(itemView, R.id.classSelectionSpinner)
     internal val notesView: TextView? by bindView(itemView, R.id.headerNotesView)
     var context: Context = itemView.context
@@ -22,7 +23,7 @@ class SectionViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
     var spinnerSelectionChanged: (() -> Unit)? = null
 
     init {
-        this.purchaseSetButton?.visibility = View.GONE
+        binding.purchaseSetButton.visibility = View.GONE
         selectionSpinner?.onItemSelectedListener = object: AdapterView.OnItemSelectedListener {
             override fun onNothingSelected(parent: AdapterView<*>?) {
                 spinnerSelectionChanged?.invoke()

From 36ccb21bb62b5f06942d3e8e2c219fbc1b194ed9 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Mon, 23 Mar 2020 17:08:46 +0100
Subject: [PATCH 49/62] Fix crash when loading wheelchairs

---
 .../com/habitrpg/android/habitica/models/user/Preferences.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
index a70c6a7ed..9b4a87f3e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
@@ -94,7 +94,7 @@ open class Preferences : RealmObject(), AvatarPreferences {
 
     override fun getChair(): String? {
         return if (chair != null && chair != "none") {
-            if (chair?.substring(0, 6) == "chair_") {
+            if (chair?.contains("chair_") == true) {
                 chair
             } else {
                 "chair_" + chair!!

From 95c9590be4d1baaaade6f404196aa13e4db2c036 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 25 Mar 2020 10:51:49 +0100
Subject: [PATCH 50/62] Fix crash in shops

---
 Habitica/build.gradle                                     | 2 +-
 .../habitrpg/android/habitica/models/user/Preferences.kt  | 3 ++-
 .../android/habitica/ui/viewHolders/SectionViewHolder.kt  | 8 ++------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index dcdbfa64f..8631a26a5 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -155,7 +155,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 2388
+        versionCode 2390
         versionName "2.5"
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
index 9b4a87f3e..8d450cfc4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
@@ -6,6 +6,7 @@ import com.habitrpg.android.habitica.models.AvatarPreferences
 
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
+import java.util.*
 
 open class Preferences : RealmObject(), AvatarPreferences {
 
@@ -121,6 +122,6 @@ open class Preferences : RealmObject(), AvatarPreferences {
     }
 
     fun hasTaskBasedAllocation(): Boolean {
-        return allocationMode?.toLowerCase() == "taskbased" && automaticAllocation
+        return allocationMode?.toLowerCase(Locale.ROOT) == "taskbased" && automaticAllocation
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.kt
index b05085a9a..59c3f0b14 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.kt
@@ -1,20 +1,17 @@
 package com.habitrpg.android.habitica.ui.viewHolders
 
 import android.content.Context
-import androidx.recyclerview.widget.RecyclerView
 import android.view.View
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
-import android.widget.Button
 import android.widget.Spinner
 import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.databinding.CustomizationSectionHeaderBinding
 import com.habitrpg.android.habitica.ui.helpers.bindView
 
 class SectionViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
-    private val binding = CustomizationSectionHeaderBinding.bind(itemView)
     private val label: TextView by bindView(itemView, R.id.label)
     private val selectionSpinner: Spinner? by bindView(itemView, R.id.classSelectionSpinner)
     internal val notesView: TextView? by bindView(itemView, R.id.headerNotesView)
@@ -23,7 +20,7 @@ class SectionViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
     var spinnerSelectionChanged: (() -> Unit)? = null
 
     init {
-        binding.purchaseSetButton.visibility = View.GONE
+        itemView.findViewById<View?>(R.id.purchaseSetButton)?.visibility = View.GONE
         selectionSpinner?.onItemSelectedListener = object: AdapterView.OnItemSelectedListener {
             override fun onNothingSelected(parent: AdapterView<*>?) {
                 spinnerSelectionChanged?.invoke()
@@ -33,7 +30,6 @@ class SectionViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
                 spinnerSelectionChanged?.invoke()
             }
         }
-
     }
 
     fun bind(title: String) {

From 2ea68a1b5842590957db3ad6306f27b1de3cbb97 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 2 Apr 2020 13:55:16 +0200
Subject: [PATCH 51/62] Implement bulk buying gems

---
 Habitica/build.gradle                         |  2 +-
 .../ic_arrow_drop_up_gray_48dp_disabled.xml   |  4 ++
 .../ic_arrow_drop_up_gray_48dp_states.xml     |  5 ++
 Habitica/res/layout/activity_task_form.xml    |  2 +-
 Habitica/res/layout/dialog_purchase_gems.xml  | 45 ++++++++++++++++++
 ...eward_value.xml => form_stepper_value.xml} |  2 +-
 Habitica/res/values/attrs.xml                 |  6 +++
 .../android/habitica/api/ApiService.kt        |  4 +-
 .../android/habitica/data/ApiClient.kt        |  4 +-
 .../habitica/data/InventoryRepository.kt      |  4 +-
 .../data/implementation/ApiClientImpl.kt      |  8 ++--
 .../implementation/InventoryRepositoryImpl.kt | 10 ++--
 .../android/habitica/models/shops/ShopItem.kt |  8 ++--
 .../ui/activities/TaskFormActivity.kt         |  8 ++--
 .../adapter/inventory/ShopRecyclerAdapter.kt  |  2 +-
 .../tasks/RewardsRecyclerViewAdapter.kt       |  2 +-
 .../preferences/ProfilePreferencesFragment.kt |  9 ++--
 .../habitica/ui/views/shops/PurchaseDialog.kt | 43 +++++++++++------
 .../views/shops/PurchaseDialogGemsContent.kt  | 13 +++++-
 ...lueFormView.kt => StepperValueFormView.kt} | 46 ++++++++++++++++---
 20 files changed, 171 insertions(+), 56 deletions(-)
 create mode 100644 Habitica/res/drawable/ic_arrow_drop_up_gray_48dp_disabled.xml
 create mode 100644 Habitica/res/drawable/ic_arrow_drop_up_gray_48dp_states.xml
 create mode 100644 Habitica/res/layout/dialog_purchase_gems.xml
 rename Habitica/res/layout/{task_form_reward_value.xml => form_stepper_value.xml} (96%)
 rename Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/{RewardValueFormView.kt => StepperValueFormView.kt} (58%)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 8631a26a5..cedf0c625 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -155,7 +155,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 2390
+        versionCode 2392
         versionName "2.5"
     }
 
diff --git a/Habitica/res/drawable/ic_arrow_drop_up_gray_48dp_disabled.xml b/Habitica/res/drawable/ic_arrow_drop_up_gray_48dp_disabled.xml
new file mode 100644
index 000000000..0d441d1cc
--- /dev/null
+++ b/Habitica/res/drawable/ic_arrow_drop_up_gray_48dp_disabled.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="48dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="48dp">
+    <path android:fillColor="#33878190" android:pathData="M7,14l5,-5 5,5z"/>
+</vector>
diff --git a/Habitica/res/drawable/ic_arrow_drop_up_gray_48dp_states.xml b/Habitica/res/drawable/ic_arrow_drop_up_gray_48dp_states.xml
new file mode 100644
index 000000000..41b906774
--- /dev/null
+++ b/Habitica/res/drawable/ic_arrow_drop_up_gray_48dp_states.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:drawable="@drawable/ic_arrow_drop_up_gray_48dp_disabled" />
+    <item android:drawable="@drawable/ic_arrow_drop_up_gray_48dp" />
+</selector>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_task_form.xml b/Habitica/res/layout/activity_task_form.xml
index b377a792f..82f5f0b12 100644
--- a/Habitica/res/layout/activity_task_form.xml
+++ b/Habitica/res/layout/activity_task_form.xml
@@ -83,7 +83,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/cost"
                     style="@style/TaskFormSectionheader"/>
-                <com.habitrpg.android.habitica.ui.views.tasks.form.RewardValueFormView
+                <com.habitrpg.android.habitica.ui.views.tasks.form.StepperValueFormView
                     android:id="@+id/reward_value"
                     android:layout_width="match_parent"
                     android:layout_height="56dp" />
diff --git a/Habitica/res/layout/dialog_purchase_gems.xml b/Habitica/res/layout/dialog_purchase_gems.xml
new file mode 100644
index 000000000..8bc9e122e
--- /dev/null
+++ b/Habitica/res/layout/dialog_purchase_gems.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/shopitem_dialog_content_inset"
+    android:paddingRight="@dimen/shopitem_dialog_content_inset"
+    android:gravity="center_horizontal"
+    tools:parentTag="LinearLayout"
+    tools:background="@color/white"
+    tools:orientation="vertical">
+
+    <com.facebook.drawee.view.SimpleDraweeView
+        android:id="@+id/imageView"
+        android:layout_width="@dimen/shopitem_image_size"
+        android:layout_height="@dimen/shopitem_image_size" />
+    <TextView
+        android:id="@+id/titleTextView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/Headline"
+        tools:text="This is the Title"
+        android:gravity="center"
+        android:layout_marginTop="14dp"
+        android:layout_marginBottom="4dp"/>
+    <TextView
+        android:id="@+id/notesTextView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/Body2"
+        android:textColor="@color/black_50_alpha"
+        tools:text="These are the notes"
+        android:gravity="center"/>
+
+    <com.habitrpg.android.habitica.ui.views.tasks.form.StepperValueFormView
+        android:id="@+id/stepper_view"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:layout_marginTop="@dimen/spacing_large"
+        app:defaultValue="1"
+        app:minValue="1"
+        />
+</merge>
\ No newline at end of file
diff --git a/Habitica/res/layout/task_form_reward_value.xml b/Habitica/res/layout/form_stepper_value.xml
similarity index 96%
rename from Habitica/res/layout/task_form_reward_value.xml
rename to Habitica/res/layout/form_stepper_value.xml
index 203e3d079..17387eadc 100644
--- a/Habitica/res/layout/task_form_reward_value.xml
+++ b/Habitica/res/layout/form_stepper_value.xml
@@ -20,7 +20,7 @@
         android:layout_width="56dp"
         android:layout_height="match_parent"
         android:background="@color/gray_600"
-        android:src="@drawable/ic_arrow_drop_up_gray_48dp"
+        android:src="@drawable/ic_arrow_drop_up_gray_48dp_states"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
         />
diff --git a/Habitica/res/values/attrs.xml b/Habitica/res/values/attrs.xml
index 3893f1ae4..c892eeec8 100644
--- a/Habitica/res/values/attrs.xml
+++ b/Habitica/res/values/attrs.xml
@@ -137,4 +137,10 @@
         <attr name="description" />
         <attr name="iconDrawable" />
     </declare-styleable>
+    <declare-styleable name="StepperValueFormView">
+        <attr name="defaultValue" />
+        <attr name="iconDrawable" />
+        <attr name="maxValue" format="integer" />
+        <attr name="minValue" format="integer" />
+    </declare-styleable>
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
index db6cfab56..fc98d19c1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
@@ -62,10 +62,10 @@ interface ApiService {
     fun equipItem(@Path("type") type: String, @Path("key") itemKey: String): Flowable<HabitResponse<Items>>
 
     @POST("user/buy/{key}")
-    fun buyItem(@Path("key") itemKey: String): Flowable<HabitResponse<BuyResponse>>
+    fun buyItem(@Path("key") itemKey: String, @Body quantity: Map<String, Int>): Flowable<HabitResponse<BuyResponse>>
 
     @POST("user/purchase/{type}/{key}")
-    fun purchaseItem(@Path("type") type: String, @Path("key") itemKey: String): Flowable<HabitResponse<Void>>
+    fun purchaseItem(@Path("type") type: String, @Path("key") itemKey: String, @Body quantity: Map<String, Int>): Flowable<HabitResponse<Void>>
 
     @POST("user/purchase-hourglass/{type}/{key}")
     fun purchaseHourglassItem(@Path("type") type: String, @Path("key") itemKey: String): Flowable<HabitResponse<Void>>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
index 6ae204161..f0437e8b6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
@@ -52,9 +52,9 @@ interface ApiClient {
 
     fun equipItem(type: String, itemKey: String): Flowable<Items>
 
-    fun buyItem(itemKey: String): Flowable<BuyResponse>
+    fun buyItem(itemKey: String, purchaseQuantity: Int): Flowable<BuyResponse>
 
-    fun purchaseItem(type: String, itemKey: String): Flowable<Any>
+    fun purchaseItem(type: String, itemKey: String, purchaseQuantity: Int): Flowable<Any>
 
     fun purchaseHourglassItem(type: String, itemKey: String): Flowable<Any>
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt
index 2b64387ac..e420d130a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt
@@ -60,7 +60,7 @@ interface InventoryRepository : BaseRepository {
 
     fun inviteToQuest(quest: QuestContent): Flowable<Quest>
 
-    fun buyItem(user: User?, id: String, value: Double): Flowable<BuyResponse>
+    fun buyItem(user: User?, id: String, value: Double, purchaseQuantity: Int): Flowable<BuyResponse>
 
     fun retrieveShopInventory(identifier: String): Flowable<Shop>
     fun retrieveMarketGear(): Flowable<Shop>
@@ -71,7 +71,7 @@ interface InventoryRepository : BaseRepository {
 
     fun purchaseQuest(key: String): Flowable<Any>
 
-    fun purchaseItem(purchaseType: String, key: String): Flowable<Any>
+    fun purchaseItem(purchaseType: String, key: String, purchaseQuantity: Int): Flowable<Any>
 
     fun togglePinnedItem(item: ShopItem): Flowable<List<ShopItem>>
     fun getItems(itemClass: Class<out Item>, keys: Array<String>, user: User?): Flowable<out RealmResults<out Item>>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
index 309d16b10..d127013e5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
@@ -321,12 +321,12 @@ class ApiClientImpl//private OnHabitsAPIResult mResultListener;
         return apiService.equipItem(type, itemKey).compose(configureApiCallObserver())
     }
 
-    override fun buyItem(itemKey: String): Flowable<BuyResponse> {
-        return apiService.buyItem(itemKey).compose(configureApiCallObserver())
+    override fun buyItem(itemKey: String, purchaseQuantity: Int): Flowable<BuyResponse> {
+        return apiService.buyItem(itemKey, mapOf(Pair("quantity", purchaseQuantity))).compose(configureApiCallObserver())
     }
 
-    override fun purchaseItem(type: String, itemKey: String): Flowable<Any> {
-        return apiService.purchaseItem(type, itemKey).compose(configureApiCallObserver())
+    override fun purchaseItem(type: String, itemKey: String, purchaseQuantity: Int): Flowable<Any> {
+        return apiService.purchaseItem(type, itemKey, mapOf(Pair("quantity", purchaseQuantity))).compose(configureApiCallObserver())
     }
 
     override fun validateSubscription(request: SubscriptionValidationRequest): Flowable<Any> {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
index 328826ac5..8a8b91bd4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
@@ -228,8 +228,8 @@ class InventoryRepositoryImpl(localRepository: InventoryLocalRepository, apiClie
                 .doOnNext { localRepository.changeOwnedCount("quests", quest.key, userID, -1) }
     }
 
-    override fun buyItem(user: User?, id: String, value: Double): Flowable<BuyResponse> {
-        return apiClient.buyItem(id)
+    override fun buyItem(user: User?, id: String, value: Double, purchaseQuantity: Int): Flowable<BuyResponse> {
+        return apiClient.buyItem(id, purchaseQuantity)
                 .doOnNext { buyResponse ->
                     if (user == null) {
                         return@doOnNext
@@ -251,7 +251,7 @@ class InventoryRepositoryImpl(localRepository: InventoryLocalRepository, apiClie
                     if (buyResponse.gp != null) {
                         copiedUser.stats?.gp = buyResponse.gp
                     } else {
-                        copiedUser.stats?.gp = copiedUser.stats?.gp ?: 0 - value
+                        copiedUser.stats?.gp = copiedUser.stats?.gp ?: 0 - (value * purchaseQuantity)
                     }
                     if (buyResponse.lvl != null) {
                         copiedUser.stats?.lvl = buyResponse.lvl
@@ -280,8 +280,8 @@ class InventoryRepositoryImpl(localRepository: InventoryLocalRepository, apiClie
         return apiClient.purchaseQuest(key)
     }
 
-    override fun purchaseItem(purchaseType: String, key: String): Flowable<Any> {
-        return apiClient.purchaseItem(purchaseType, key)
+    override fun purchaseItem(purchaseType: String, key: String, purchaseQuantity: Int): Flowable<Any> {
+        return apiClient.purchaseItem(purchaseType, key, purchaseQuantity)
     }
 
     override fun togglePinnedItem(item: ShopItem): Flowable<List<ShopItem>> {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
index ffb204910..543fc0994 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.kt
@@ -68,10 +68,10 @@ open class ShopItem : RealmObject() {
     val isTypeAnimal: Boolean
         get() = "pets" == purchaseType || "mounts" == purchaseType
 
-    fun canAfford(user: User?, canAlwaysAffordSpecial: Boolean): Boolean = when(currency) {
-        "gold" -> value <= user?.stats?.gp ?: 0.0
-        "gems" -> if (canAlwaysAffordSpecial) true else value <= user?.gemCount ?: 0
-        "hourglasses" -> if (canAlwaysAffordSpecial) true else value <= user?.purchased?.plan?.consecutive?.trinkets ?: 0
+    fun canAfford(user: User?, quantity: Int): Boolean = when(currency) {
+        "gold" -> (value * quantity) <= user?.stats?.gp ?: 0.0
+        "gems" -> true
+        "hourglasses" -> true
         else -> false
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
index 8f74022b8..b602e61dd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
@@ -85,7 +85,7 @@ class TaskFormActivity : BaseActivity() {
     private val statPerceptionButton: TextView by bindView(R.id.stat_perception_button)
 
     private val rewardValueTitleView: TextView by bindView(R.id.reward_value_title)
-    private val rewardValueFormView: RewardValueFormView by bindView(R.id.reward_value)
+    private val stepperValueFormView: StepperValueFormView by bindView(R.id.reward_value)
 
     private val tagsTitleView: TextView by bindView(R.id.tags_title)
     private val tagsWrapper: LinearLayout by bindView(R.id.tags_wrapper)
@@ -271,7 +271,7 @@ class TaskFormActivity : BaseActivity() {
 
         val rewardViewsVisibility = if (taskType == Task.TYPE_REWARD) View.VISIBLE else View.GONE
         rewardValueTitleView.visibility = rewardViewsVisibility
-        rewardValueFormView.visibility = rewardViewsVisibility
+        stepperValueFormView.visibility = rewardViewsVisibility
 
         tagsTitleView.visibility = if (isChallengeTask) View.GONE else View.VISIBLE
         tagsWrapper.visibility = if (isChallengeTask) View.GONE else View.VISIBLE
@@ -346,7 +346,7 @@ class TaskFormActivity : BaseActivity() {
                 taskSchedulingControls.frequency = task.frequency ?: Task.FREQUENCY_DAILY
             }
             Task.TYPE_TODO -> taskSchedulingControls.dueDate = task.dueDate
-            Task.TYPE_REWARD -> rewardValueFormView.value = task.value
+            Task.TYPE_REWARD -> stepperValueFormView.value = task.value
         }
         if (taskType == Task.TYPE_DAILY || taskType == Task.TYPE_TODO) {
             task.checklist?.let { checklistContainer.checklistItems = it }
@@ -420,7 +420,7 @@ class TaskFormActivity : BaseActivity() {
         } else if (taskType == Task.TYPE_TODO) {
             thisTask.dueDate = taskSchedulingControls.dueDate
         } else if (taskType == Task.TYPE_REWARD) {
-            thisTask.value = rewardValueFormView.value
+            thisTask.value = stepperValueFormView.value
         }
 
         val resultIntent = Intent()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
index 0d98050d8..9136c0c5f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
@@ -139,7 +139,7 @@ class ShopRecyclerAdapter(private val configManager: AppConfigManager) : android
                 ShopItem::class.java -> {
                     val item = obj as? ShopItem ?: return
                     val itemHolder = holder as? ShopItemViewHolder ?: return
-                    itemHolder.bind(item, item.canAfford(user, configManager.insufficientGemPurchase()))
+                    itemHolder.bind(item, item.canAfford(user, 1))
                     if (ownedItems.containsKey(item.key+"-"+item.pinType)) {
                         itemHolder.itemCount = ownedItems[item.key+"-"+item.pinType]?.numberOwned ?: 0
                     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.kt
index a409ce8d3..89ab638fa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.kt
@@ -75,7 +75,7 @@ class RewardsRecyclerViewAdapter(private var customRewards: OrderedRealmCollecti
         } else if (inAppRewards != null) {
             val item = inAppRewards?.get(position - customRewardCount) ?: return
             if (holder is ShopItemViewHolder) {
-                holder.bind(item, item.canAfford(user, configManager.insufficientGemPurchase()))
+                holder.bind(item, item.canAfford(user, 1))
                 holder.isPinned = true
                 holder.hidePinIndicator()
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ProfilePreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ProfilePreferencesFragment.kt
index 661322830..95a5da80d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ProfilePreferencesFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/ProfilePreferencesFragment.kt
@@ -55,7 +55,7 @@ class ProfilePreferencesFragment: BasePreferencesFragment(), SharedPreferences.O
         val profileCategory = findPreference("profile") as? PreferenceCategory
         configurePreference(profileCategory?.findPreference(key), sharedPreferences?.getString(key, ""))
         if (sharedPreferences != null) {
-            val newValue = sharedPreferences.getString(key, "") ?: ""
+            val newValue = sharedPreferences.getString(key, "") ?: return
             val observable: Flowable<User>? = when (key) {
                 "display_name" -> {
                     if (newValue != user?.profile?.name) {
@@ -65,16 +65,14 @@ class ProfilePreferencesFragment: BasePreferencesFragment(), SharedPreferences.O
                     }
                 }
                 "photo_url" -> {
-                    val newName = sharedPreferences.getString(key, "") ?: ""
-                    if (newName != user?.profile?.imageUrl) {
+                    if (newValue != user?.profile?.imageUrl) {
                         userRepository.updateUser(user, "profile.imageUrl", newValue)
                     } else {
                         null
                     }
                 }
                 "about" -> {
-                    val newName = sharedPreferences.getString(key, "") ?: ""
-                    if (newName != user?.profile?.blurb) {
+                    if (newValue != user?.profile?.blurb) {
                         userRepository.updateUser(user, "profile.blurb", newValue)
                     } else {
                         null
@@ -85,5 +83,4 @@ class ProfilePreferencesFragment: BasePreferencesFragment(), SharedPreferences.O
             observable?.subscribe(Consumer {}, RxErrorHandler.handleEmptyError())?.let { compositeSubscription.add(it) }
         }
     }
-
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
index a698aaff1..5be4dfaf3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
@@ -60,6 +60,8 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
     private val buyLabel: TextView
     private val pinButton: Button by bindView(customHeader, R.id.pin_button)
 
+    private var purchaseQuantity = 1
+
     var purchaseCardAction: ((ShopItem) -> Unit)? = null
 
     private var shopItem: ShopItem = item
@@ -74,7 +76,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
             }
 
             if (shopItem.lockedReason(context) == null) {
-                priceLabel.value = shopItem.value.toDouble()
+                updatePurchaseTotal()
                 priceLabel.currency = shopItem.currency
             } else {
                 limitedTextView.text = shopItem.lockedReason(context)
@@ -100,13 +102,34 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
                     inventoryRepository.getEquipment(shopItem.key).firstElement().subscribe(Consumer<Equipment> { contentView.setEquipment(it) }, RxErrorHandler.handleEmptyError())
                     checkGearClass()
                 }
-                "gems" == shopItem.purchaseType -> contentView = PurchaseDialogGemsContent(context)
+                "gems" == shopItem.purchaseType -> {
+                    val gemContent = PurchaseDialogGemsContent(context)
+                    gemContent.stepperView.onValueChanged = {
+                        purchaseQuantity = it.toInt()
+                        updatePurchaseTotal()
+                    }
+                    contentView = gemContent
+                }
                 else -> contentView = PurchaseDialogBaseContent(context)
             }
             contentView.setItem(shopItem)
             setAdditionalContentView(contentView)
         }
 
+    fun updatePurchaseTotal() {
+        priceLabel.value = shopItem.value.toDouble() * purchaseQuantity
+
+        if (shopItem.canAfford(user, purchaseQuantity) && !shopItem.locked) {
+            buyButton.background = context.getDrawable(R.drawable.button_background_primary)
+            priceLabel.setTextColor(ContextCompat.getColor(context, R.color.white))
+            buyLabel.setTextColor(ContextCompat.getColor(context, R.color.white))
+        } else {
+            buyButton.background = context.getDrawable(R.drawable.button_background_gray_600)
+            priceLabel.setTextColor(ContextCompat.getColor(context, R.color.gray_100))
+            buyLabel.setTextColor(ContextCompat.getColor(context, R.color.gray_100))
+        }
+    }
+
     private fun checkGearClass() {
         val user = user ?: return
 
@@ -183,15 +206,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
         }
 
         buyButton.elevation = 0f
-        if (shopItem.canAfford(user, configManager.insufficientGemPurchase()) && !shopItem.locked) {
-            buyButton.background = context.getDrawable(R.drawable.button_background_primary)
-            priceLabel.setTextColor(ContextCompat.getColor(context, R.color.white))
-            buyLabel.setTextColor(ContextCompat.getColor(context, R.color.white))
-        } else {
-            buyButton.background = context.getDrawable(R.drawable.button_background_gray_600)
-            priceLabel.setTextColor(ContextCompat.getColor(context, R.color.gray_100))
-            buyLabel.setTextColor(ContextCompat.getColor(context, R.color.gray_100))
-        }
+        updatePurchaseTotal()
 
         if (shopItem.isTypeGear) {
             checkGearClass()
@@ -211,7 +226,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
         val snackbarText = arrayOf("")
         if (shopItem.isValid && !shopItem.locked) {
             val gemsLeft = if (shopItem.limitedNumberLeft != null) shopItem.limitedNumberLeft else 0
-            if ((gemsLeft == 0 && shopItem.purchaseType == "gems") || shopItem.canAfford(user, false)) {
+            if ((gemsLeft == 0 && shopItem.purchaseType == "gems") || shopItem.canAfford(user, purchaseQuantity)) {
                 val observable: Flowable<Any>
                 if (shopIdentifier != null && shopIdentifier == Shop.TIME_TRAVELERS_SHOP || "mystery_set" == shopItem.purchaseType || shopItem.currency == "hourglasses") {
                     observable = if (shopItem.purchaseType == "gear") {
@@ -226,7 +241,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
                     dismiss()
                     return
                 } else if ("gold" == shopItem.currency && "gem" != shopItem.key) {
-                    observable = inventoryRepository.buyItem(user, shopItem.key, shopItem.value.toDouble()).map { buyResponse ->
+                    observable = inventoryRepository.buyItem(user, shopItem.key, shopItem.value.toDouble(), purchaseQuantity).map { buyResponse ->
                         if (shopItem.key == "armoire") {
                             snackbarText[0] = when {
                                 buyResponse.armoire["type"] == "gear" -> context.getString(R.string.armoireEquipment, buyResponse.armoire["dropText"])
@@ -237,7 +252,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
                         buyResponse
                     }
                 } else {
-                    observable = inventoryRepository.purchaseItem(shopItem.purchaseType, shopItem.key)
+                    observable = inventoryRepository.purchaseItem(shopItem.purchaseType, shopItem.key, purchaseQuantity)
                 }
                 observable
                         .doOnNext {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGemsContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGemsContent.kt
index 9b64ff5fb..f84a51a23 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGemsContent.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogGemsContent.kt
@@ -3,20 +3,29 @@ package com.habitrpg.android.habitica.ui.views.shops
 import android.content.Context
 import android.widget.TextView
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.ui.helpers.bindView
+import com.habitrpg.android.habitica.extensions.asDrawable
 import com.habitrpg.android.habitica.models.shops.ShopItem
+import com.habitrpg.android.habitica.ui.helpers.bindView
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.tasks.form.StepperValueFormView
 
 internal class PurchaseDialogGemsContent(context: Context) : PurchaseDialogContent(context) {
 
     val notesTextView: TextView by bindView(R.id.notesTextView)
+    val stepperView: StepperValueFormView by bindView(R.id.stepper_view)
 
     override val viewId: Int
-        get() = R.layout.dialog_purchase_content_item
+        get() = R.layout.dialog_purchase_gems
 
+    init {
+        stepperView.iconDrawable = HabiticaIconsHelper.imageOfGem().asDrawable(context.resources)
+    }
 
     override fun setItem(item: ShopItem) {
         super.setItem(item)
 
         notesTextView.text = item.notes
+
+        stepperView.maxValue = item.limitedNumberLeft?.toDouble()
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/RewardValueFormView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/StepperValueFormView.kt
similarity index 58%
rename from Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/RewardValueFormView.kt
rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/StepperValueFormView.kt
index 1c58d7265..80a78eae0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/RewardValueFormView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/StepperValueFormView.kt
@@ -1,6 +1,7 @@
 package com.habitrpg.android.habitica.ui.views.tasks.form
 
 import android.content.Context
+import android.graphics.drawable.Drawable
 import android.util.AttributeSet
 import android.widget.EditText
 import android.widget.ImageButton
@@ -13,7 +14,7 @@ import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import java.text.DecimalFormat
 
-class RewardValueFormView @JvmOverloads constructor(
+class StepperValueFormView @JvmOverloads constructor(
         context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
 ) : RelativeLayout(context, attrs, defStyleAttr) {
 
@@ -21,20 +22,36 @@ class RewardValueFormView @JvmOverloads constructor(
     private val upButton: ImageButton by bindView(R.id.up_button)
     private val downButton: ImageButton by bindView(R.id.down_button)
 
+    var onValueChanged: ((Double) -> Unit)? = null
+
     private val decimalFormat = DecimalFormat("0.###")
     private var editTextIsFocused = false
 
     var value = 0.0
     set(value) {
-        val newValue = if (value >= 0) value else 0.0
+        var newValue = if (value >= minValue) value else minValue
+        maxValue?.let {
+            if (newValue > it) {
+                newValue = it
+            }
+        }
         val oldValue = field
         field = newValue
         if (oldValue != newValue) {
             valueString = decimalFormat.format(newValue)
         }
-        downButton.isEnabled = field > 0
+        downButton.isEnabled = field > minValue
+        maxValue?.let {
+            if (it == 0.0) return@let
+            upButton.isEnabled = value < it
+        }
+
+        onValueChanged?.invoke(value)
     }
 
+    var maxValue: Double? = null
+    var minValue: Double = 0.0
+
     private var valueString = ""
     set(value) {
         field = value
@@ -51,11 +68,28 @@ class RewardValueFormView @JvmOverloads constructor(
         }
     }
 
+    var iconDrawable: Drawable?
+    get() {
+        return editText.compoundDrawables.firstOrNull()
+    }
+    set(value) {
+        editText.setCompoundDrawablesWithIntrinsicBounds(value, null, null, null)
+    }
+
     init {
-        inflate(R.layout.task_form_reward_value, true)
+        inflate(R.layout.form_stepper_value, true)
+
+        val attributes = context.theme?.obtainStyledAttributes(
+                attrs,
+                R.styleable.StepperValueFormView,
+                0, 0)
+
         //set value here, so that the setter is called and everything is set up correctly
-        value = 10.0
-        editText.setCompoundDrawablesWithIntrinsicBounds(HabiticaIconsHelper.imageOfGold().asDrawable(context.resources), null, null, null)
+        maxValue = attributes?.getFloat(R.styleable.StepperValueFormView_maxValue, 0f)?.toDouble()
+        minValue = attributes?.getFloat(R.styleable.StepperValueFormView_minValue, 0f)?.toDouble() ?: 0.0
+        value = attributes?.getFloat(R.styleable.StepperValueFormView_defaultValue, 10.0f)?.toDouble() ?: 10.0
+        iconDrawable = attributes?.getDrawable(R.styleable.StepperValueFormView_iconDrawable) ?: HabiticaIconsHelper.imageOfGold().asDrawable(context.resources)
+
 
         upButton.setOnClickListener {
             value += 1

From fd74aaf155468e38e04661f80712610f50f6a97c Mon Sep 17 00:00:00 2001
From: Leland Wu <leland.wu4@gmail.com>
Date: Fri, 3 Apr 2020 05:32:39 -0400
Subject: [PATCH 52/62] add matt banner to pet and mounts screen (#1268)

* modify layout

* revert changes

* revert to original

* add matt banner

* remove files

* add margin decorator to specific viewtype

* remove unused imports

* add parameter to marginDecoration class

* edit margindecorator to fix scrolling issue

* make margindecorator parameter a default parameter
---
 .../inventory/StableRecyclerAdapter.kt        | 53 ++++++++++++++++---
 .../AvatarCustomizationFragment.kt            |  1 +
 .../inventory/stable/StableFragment.kt        |  1 +
 .../stable/StableRecyclerFragment.kt          | 10 ++--
 .../habitica/ui/helpers/MarginDecoration.kt   | 11 +++-
 5 files changed, 63 insertions(+), 13 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
index 3e47a9a54..280a3a0fe 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
@@ -2,12 +2,17 @@ package com.habitrpg.android.habitica.ui.adapter.inventory
 
 import android.content.Context
 import android.graphics.drawable.BitmapDrawable
-import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.LinearLayout
+import android.widget.RelativeLayout
 import android.widget.TextView
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.recyclerview.widget.GridLayoutManager
 import com.facebook.drawee.view.SimpleDraweeView
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.inventory.Animal
@@ -16,15 +21,18 @@ import com.habitrpg.android.habitica.ui.fragments.inventory.stable.StableFragmen
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder
+import com.habitrpg.android.habitica.ui.views.NPCBannerView
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.functions.Consumer
 
+
 class StableRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
 
     var itemType: String? = null
     var context: Context? = null
     var activity: MainActivity? = null
+
     private var itemList: List<Any> = ArrayList()
 
     fun setItemList(itemList: List<Any>) {
@@ -34,17 +42,29 @@ class StableRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder =
             if (viewType == 0) {
-                val view = LayoutInflater.from(parent.context).inflate(R.layout.customization_section_header, parent, false)
+                val view = parent.inflate(R.layout.shop_header)
+                StableHeaderViewHolder(view)
+            } else if (viewType == 1) {
+                val view = parent.inflate(R.layout.customization_section_header)
                 SectionViewHolder(view)
-            } else {
-                val view = LayoutInflater.from(parent.context).inflate(R.layout.animal_overview_item, parent, false)
+            }
+            else {
+                val view = parent.inflate(R.layout.animal_overview_item)
                 StableViewHolder(view)
             }
-
+    
     override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) {
         val obj = this.itemList[position]
-        if (obj.javaClass == String::class.java) {
+        if (obj == "header") {
+            (holder as? StableHeaderViewHolder)?.bind()
+        } else if (obj.javaClass == String::class.java) {
+            if (obj == "Standard") {
+                var params = holder.itemView.layoutParams as GridLayoutManager.LayoutParams
+                params.height = 135
+                holder.itemView.layoutParams = params
+            }
             (holder as? SectionViewHolder)?.bind(obj as? String ?: "")
+
         } else {
             (obj as? Animal)?.let { (holder as? StableViewHolder)?.bind(it) }
 
@@ -52,15 +72,32 @@ class StableRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<
     }
 
     override fun getItemViewType(position: Int): Int {
-        return if (this.itemList[position].javaClass == String::class.java) {
+        return if (itemList[position] == "header") {
             0
-        } else {
+        }
+        else if (itemList[position].javaClass == String::class.java) {
             1
         }
+        else {
+            2
+        }
     }
 
     override fun getItemCount(): Int = itemList.size
 
+    internal class StableHeaderViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
+
+        private val npcBannerView: NPCBannerView by bindView(itemView, R.id.npcBannerView)
+        private val namePlate: TextView by bindView(itemView, R.id.namePlate)
+        private val descriptionView: TextView by bindView(itemView, R.id.descriptionView)
+
+        fun bind() {
+            npcBannerView.identifier = "stable"
+            namePlate.setText(R.string.stable_owner)
+            descriptionView.visibility = View.GONE
+        }
+    }
+    
     internal inner class StableViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener {
         private var animal: Animal? = null
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
index 682c31e50..8814a81db 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
@@ -95,6 +95,7 @@ class AvatarCustomizationFragment : BaseMainFragment() {
         }
         setGridSpanCount(view.width)
         recyclerView.layoutManager = layoutManager
+
         recyclerView.addItemDecoration(MarginDecoration(context))
 
         recyclerView.adapter = adapter
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.kt
index ad59ba89d..c4149332d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.kt
@@ -19,6 +19,7 @@ class StableFragment : BaseMainFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         this.usesTabLayout = true
+        this.hidesToolbar = true
         super.onCreateView(inflater, container, savedInstanceState)
         return inflater.inflate(R.layout.fragment_viewpager, container, false)
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt
index 5abbc77f2..2919a411a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt
@@ -70,19 +70,19 @@ class StableRecyclerFragment : BaseFragment() {
         layoutManager = androidx.recyclerview.widget.GridLayoutManager(activity, 2)
         layoutManager?.spanSizeLookup = object : androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup() {
             override fun getSpanSize(position: Int): Int {
-                return if (adapter?.getItemViewType(position) == 0) {
+                return if (adapter?.getItemViewType(position) == 0 || adapter?.getItemViewType(position) == 1) {
                     layoutManager?.spanCount ?: 1
                 } else {
                     1
                 }
             }
         }
+
         recyclerView?.layoutManager = layoutManager
         activity?.let {
-            recyclerView?.addItemDecoration(MarginDecoration(it))
+            recyclerView?.addItemDecoration(MarginDecoration(it, setOf(HEADER_VIEW_TYPE)))
         }
 
-
         adapter = recyclerView?.adapter as? StableRecyclerAdapter
         if (adapter == null) {
             adapter = StableRecyclerAdapter()
@@ -179,10 +179,14 @@ class StableRecyclerFragment : BaseFragment() {
         if (!((lastAnimal.type == "premium" || lastAnimal.type == "special") && lastAnimal.numberOwned == 0)) {
             items.add(lastAnimal)
         }
+
+        items.add(0, "header")
         return items
     }
 
     companion object {
         private const val ITEM_TYPE_KEY = "CLASS_TYPE_KEY"
+        private const val HEADER_VIEW_TYPE = 0
+        private const val SECTION_VIEW_TYPE = 1
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarginDecoration.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarginDecoration.kt
index 46302b14a..57408da6a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarginDecoration.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarginDecoration.kt
@@ -6,10 +6,17 @@ import android.view.View
 import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
 
-class MarginDecoration(context: Context?) : RecyclerView.ItemDecoration() {
+class MarginDecoration(context: Context?, noMarginViewTypes: Set<Int> = setOf()) : RecyclerView.ItemDecoration() {
     private val margin: Int = context?.resources?.getDimensionPixelSize(R.dimen.grid_item_margin) ?: 0
+    private var noMarginViewTypes = noMarginViewTypes
 
     override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
-        outRect.set(margin, margin, margin, margin)
+        val position = parent.getChildAdapterPosition(view)
+        val viewType: Int? = parent.adapter?.getItemViewType(position)
+        if (noMarginViewTypes.contains(viewType)) {
+            outRect.setEmpty();
+        } else {
+            outRect.set(margin, margin, margin, margin);
+        }
     }
 }

From 4d6435b007945040a0ea1b7310a2cd5dce544e98 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Fri, 3 Apr 2020 15:36:37 +0200
Subject: [PATCH 53/62] Support screen tweaks

---
 .../res/drawable/support_info_lower_bg.xml    |  4 +-
 Habitica/res/layout/fragment_faq_detail.xml   | 36 +++++++++
 Habitica/res/layout/fragment_faq_overview.xml |  2 +-
 Habitica/res/layout/fragment_support_main.xml | 73 ++++++++++---------
 .../layout/support_collapsible_section.xml    |  5 +-
 Habitica/res/navigation/navigation.xml        | 11 +++
 Habitica/res/values/strings.xml               |  1 +
 .../habitica/components/UserComponent.java    |  3 +
 .../ui/fragments/support/FAQDetailFragment.kt | 53 ++++++++++++++
 .../fragments/support/FAQOverviewFragment.kt  |  8 +-
 10 files changed, 147 insertions(+), 49 deletions(-)
 create mode 100644 Habitica/res/layout/fragment_faq_detail.xml
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQDetailFragment.kt

diff --git a/Habitica/res/drawable/support_info_lower_bg.xml b/Habitica/res/drawable/support_info_lower_bg.xml
index 709e8e69d..26a2c3030 100644
--- a/Habitica/res/drawable/support_info_lower_bg.xml
+++ b/Habitica/res/drawable/support_info_lower_bg.xml
@@ -5,11 +5,11 @@
 
     <!-- view background color -->
     <solid
-        android:color="@color/brand_300" >
+        android:color="@color/brand_400" >
     </solid>
 
     <!-- Here is the corner radius -->
-    <corners android:bottomLeftRadius="4dp" android:bottomRightRadius="4dp">
+    <corners android:radius="8dp">
     </corners>
 
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_faq_detail.xml b/Habitica/res/layout/fragment_faq_detail.xml
new file mode 100644
index 000000000..a2a2f46de
--- /dev/null
+++ b/Habitica/res/layout/fragment_faq_detail.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:scrollbarSize="3dp"
+    android:scrollbarThumbVertical="@color/scrollbarThumb"
+    android:scrollbars="vertical">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        >
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:id="@+id/questionTextView"
+            android:layout_gravity="center_horizontal"
+            android:padding="@dimen/card_padding"/>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/answerTextView"
+            android:layout_gravity="center_horizontal"
+            android:paddingLeft="@dimen/card_padding"
+            android:paddingStart="@dimen/card_padding"
+            android:paddingEnd="@dimen/card_padding"
+            android:paddingRight="@dimen/card_padding"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            />
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_faq_overview.xml b/Habitica/res/layout/fragment_faq_overview.xml
index 025f232fe..94ec908d9 100644
--- a/Habitica/res/layout/fragment_faq_overview.xml
+++ b/Habitica/res/layout/fragment_faq_overview.xml
@@ -66,7 +66,7 @@
         android:layout_height="wrap_content"
         app:subtitle="@string/premium_currency"
         app:title="@string/gems"
-        app:titleColor="@color/teal_100"
+        app:titleColor="@color/green_10"
         android:layout_marginStart="@dimen/spacing_medium"
         android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_medium"
diff --git a/Habitica/res/layout/fragment_support_main.xml b/Habitica/res/layout/fragment_support_main.xml
index dcce5be30..aa87da7f2 100644
--- a/Habitica/res/layout/fragment_support_main.xml
+++ b/Habitica/res/layout/fragment_support_main.xml
@@ -25,36 +25,36 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/using_habitica"
+                android:text="@string/habitica_questions"
                 android:layout_marginStart="@dimen/spacing_large"
                 android:layout_marginEnd="@dimen/spacing_large"
-                android:textSize="16sp"
-                android:textStyle="bold"
-                android:textColor="@color/brand_300"
+                style="@style/Subheader2"
+                android:textColor="@color/black"
                 />
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/using_habitica_description"
-                android:textSize="12sp"
-                android:textColor="@color/gray_300"
+                style="@style/Body2"
+                android:textColor="@color/gray_50"
                 android:layout_marginStart="40dp"
                 android:layout_marginEnd="40dp"
                 android:gravity="center"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="10dp"
+                android:layout_marginTop="6dp"
+                android:layout_marginBottom="16dp"
                 />
 
             <TextView
                 android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:text="@string/lets_go"
+                android:layout_height="38dp"
+                android:text="@string/read_more"
                 android:gravity="center"
-                android:layout_marginStart="@dimen/spacing_large"
-                android:layout_marginEnd="@dimen/spacing_large"
+                android:layout_marginStart="@dimen/spacing_medium"
+                android:layout_marginEnd="@dimen/spacing_medium"
+                android:layout_marginBottom="@dimen/spacing_medium"
                 android:background="@drawable/support_info_lower_bg"
                 android:textColor="@color/white"
-                android:textAllCaps="true"
+                android:textAllCaps="false"
                 android:textStyle="bold"
                 android:textSize="12sp"
                 />
@@ -76,33 +76,33 @@
                 android:text="@string/bugs_fixes"
                 android:layout_marginStart="@dimen/spacing_large"
                 android:layout_marginEnd="@dimen/spacing_large"
-                android:textSize="16sp"
-                android:textStyle="bold"
-                android:textColor="@color/brand_300"
+                style="@style/Subheader2"
+                android:textColor="@color/black"
                 />
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/bugs_fixes_description"
-                android:textSize="12sp"
-                android:textColor="@color/gray_300"
+                style="@style/Body2"
+                android:textColor="@color/gray_50"
                 android:layout_marginStart="40dp"
                 android:layout_marginEnd="40dp"
                 android:gravity="center"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="10dp"
+                android:layout_marginTop="6dp"
+                android:layout_marginBottom="16dp"
                 />
 
             <TextView
                 android:layout_width="match_parent"
-                android:layout_height="40dp"
+                android:layout_height="38dp"
                 android:text="@string/get_help"
                 android:gravity="center"
-                android:layout_marginStart="@dimen/spacing_large"
-                android:layout_marginEnd="@dimen/spacing_large"
+                android:layout_marginStart="@dimen/spacing_medium"
+                android:layout_marginEnd="@dimen/spacing_medium"
+                android:layout_marginBottom="@dimen/spacing_medium"
                 android:background="@drawable/support_info_lower_bg"
                 android:textColor="@color/white"
-                android:textAllCaps="true"
+                android:textAllCaps="false"
                 android:textStyle="bold"
                 android:textSize="12sp"
                 />
@@ -124,34 +124,34 @@
                 android:text="@string/suggestions_feedback"
                 android:layout_marginStart="@dimen/spacing_large"
                 android:layout_marginEnd="@dimen/spacing_large"
-                android:textSize="16sp"
-                android:textStyle="bold"
-                android:textColor="@color/brand_300"
+                style="@style/Subheader2"
+                android:textColor="@color/black"
                 />
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/suggestions_feedback_description"
-                android:textSize="12sp"
-                android:textColor="@color/gray_300"
+                style="@style/Body2"
+                android:textColor="@color/gray_50"
                 android:layout_marginStart="40dp"
                 android:layout_marginEnd="40dp"
                 android:gravity="center"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="10dp"
+                android:layout_marginTop="6dp"
+                android:layout_marginBottom="16dp"
                 />
 
             <TextView
                 android:layout_width="match_parent"
-                android:layout_height="40dp"
+                android:layout_height="38dp"
                 android:text="@string/contact_us"
                 android:gravity="center"
-                android:layout_marginStart="@dimen/spacing_large"
-                android:layout_marginEnd="@dimen/spacing_large"
+                android:layout_marginStart="@dimen/spacing_medium"
+                android:layout_marginEnd="@dimen/spacing_medium"
+                android:layout_marginBottom="@dimen/spacing_medium"
                 android:background="@drawable/support_info_lower_bg"
                 android:textColor="@color/white"
                 android:textStyle="bold"
-                android:textAllCaps="true"
+                android:textAllCaps="false"
                 android:textSize="12sp"
                 />
         </LinearLayout>
@@ -164,7 +164,8 @@
         android:id="@+id/reset_tutorial_button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="@style/HabiticaButton.Blue"
+        style="@style/HabiticaButton.Gray.600"
+        android:textColor="@color/gray_50"
         android:text="@string/reset_walkthrough"
         android:layout_margin="@dimen/spacing_large"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/support_collapsible_section.xml b/Habitica/res/layout/support_collapsible_section.xml
index d2a0216aa..db70187a9 100644
--- a/Habitica/res/layout/support_collapsible_section.xml
+++ b/Habitica/res/layout/support_collapsible_section.xml
@@ -26,15 +26,14 @@
                 android:id="@+id/title_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="14sp"
-                android:textStyle="bold"
+                style="@style/Body1"
                 tools:text="Title"/>
             <TextView
                 android:id="@+id/subtitle_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/gray_200"
-                android:textSize="14sp"
+                style="@style/Body2"
                 tools:text="Subtitle" />
         </LinearLayout>
         <Space
diff --git a/Habitica/res/navigation/navigation.xml b/Habitica/res/navigation/navigation.xml
index 2ffe26ba0..3235fa47d 100644
--- a/Habitica/res/navigation/navigation.xml
+++ b/Habitica/res/navigation/navigation.xml
@@ -208,6 +208,17 @@
         android:name="com.habitrpg.android.habitica.ui.fragments.support.FAQOverviewFragment"
         android:label="@string/habitica_questions">
         <deepLink app:uri="habitica.com/static/faq" />
+        <action
+            android:id="@+id/openFAQDetail"
+            app:destination="@id/FAQDetailFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/FAQDetailFragment"
+        android:name="com.habitrpg.android.habitica.ui.fragments.support.FAQDetailFragment"
+        android:label="@string/sidebar_help" >
+        <argument
+            android:name="position"
+            app:argType="integer" />
     </fragment>
     <fragment
         android:id="@+id/aboutFragment"
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index fc6d791a1..027203d58 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -1004,4 +1004,5 @@
     <string name="avatar_headband">Headband</string>
     <string name="avatar_accent">Accent</string>
     <string name="buy_all">Buy All</string>
+    <string name="read_more">Read More</string>
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
index 125a3a599..92774ceee 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
@@ -93,6 +93,7 @@ import com.habitrpg.android.habitica.ui.fragments.social.party.PartyDetailFragme
 import com.habitrpg.android.habitica.ui.fragments.social.party.PartyFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.party.PartyInviteFragment;
 import com.habitrpg.android.habitica.ui.fragments.support.BugFixFragment;
+import com.habitrpg.android.habitica.ui.fragments.support.FAQDetailFragment;
 import com.habitrpg.android.habitica.ui.fragments.support.FAQOverviewFragment;
 import com.habitrpg.android.habitica.ui.fragments.support.SupportMainFragment;
 import com.habitrpg.android.habitica.ui.fragments.tasks.TaskRecyclerViewFragment;
@@ -337,4 +338,6 @@ public interface UserComponent {
     void inject(@NotNull BugFixFragment bugFixFragment);
 
     void inject(@NotNull AvatarEquipmentFragment avatarEquipmentFragment);
+
+    void inject(@NotNull FAQDetailFragment faqDetailFragment);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQDetailFragment.kt
new file mode 100644
index 000000000..e73f034d9
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQDetailFragment.kt
@@ -0,0 +1,53 @@
+package com.habitrpg.android.habitica.ui.fragments.support
+
+import android.os.Bundle
+import android.text.method.LinkMovementMethod
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.components.UserComponent
+import com.habitrpg.android.habitica.data.FAQRepository
+import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
+import com.habitrpg.android.habitica.ui.helpers.bindOptionalView
+import com.habitrpg.android.habitica.ui.helpers.resetViews
+import io.reactivex.functions.Consumer
+import javax.inject.Inject
+
+class FAQDetailFragment : BaseMainFragment() {
+    @Inject
+    lateinit var faqRepository: FAQRepository
+
+    private val questionTextView: TextView? by bindOptionalView(R.id.questionTextView)
+    private val answerTextView: TextView? by bindOptionalView(R.id.answerTextView)
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        hidesToolbar = true
+        super.onCreateView(inflater, container, savedInstanceState)
+        return container?.inflate(R.layout.fragment_faq_detail)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        resetViews()
+
+        arguments?.let {
+            val args = FAQDetailFragmentArgs.fromBundle(it)
+            compositeSubscription.add(faqRepository.getArticle(args.position).subscribe(Consumer { faq ->
+                this.questionTextView?.text = faq.question
+                this.answerTextView?.text = MarkdownParser.parseMarkdown(faq.answer)
+            }, RxErrorHandler.handleEmptyError()))
+        }
+
+        this.answerTextView?.movementMethod = LinkMovementMethod.getInstance()
+    }
+
+    override fun injectFragment(component: UserComponent) {
+        component.inject(this)
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt
index d2e9171e1..cdfa5d49b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt
@@ -12,14 +12,12 @@ import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.FAQRepository
 import com.habitrpg.android.habitica.databinding.FragmentFaqOverviewBinding
 import com.habitrpg.android.habitica.databinding.SupportFaqItemBinding
-import com.habitrpg.android.habitica.extensions.addCloseButton
 import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.helpers.setMarkdown
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import io.reactivex.functions.Consumer
 import javax.inject.Inject
 
@@ -71,11 +69,7 @@ class FAQOverviewFragment : BaseMainFragment() {
                 val binding = SupportFaqItemBinding.inflate(context.layoutInflater, binding.faqLinearLayout, true)
                 binding.textView.text = article.question
                 binding.root.setOnClickListener {
-                    val dialog = HabiticaAlertDialog(binding.root.context)
-                    dialog.setTitle(article.question)
-                    dialog.setMessage(article.answer)
-                    dialog.addCloseButton()
-                    dialog.show()
+                    MainNavigationController.navigate(FAQOverviewFragmentDirections.openFAQDetail(article.position ?: 0))
                 }
             }
         }, RxErrorHandler.handleEmptyError()))

From 675c8cfbb80eb8e3b9bb0854dc676eb7456696c8 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Fri, 3 Apr 2020 16:58:09 +0200
Subject: [PATCH 54/62] add support for animated images in more places

---
 Habitica/res/layout/item_image_row.xml        |  2 +-
 .../android/habitica/ui/AvatarView.kt         | 57 +------------
 .../habitica/ui/helpers/DataBindingUtils.kt   | 81 +++++++++++++++++--
 3 files changed, 77 insertions(+), 63 deletions(-)

diff --git a/Habitica/res/layout/item_image_row.xml b/Habitica/res/layout/item_image_row.xml
index 7e8fd90d3..7c1a85b17 100644
--- a/Habitica/res/layout/item_image_row.xml
+++ b/Habitica/res/layout/item_image_row.xml
@@ -13,7 +13,7 @@
         android:layout_width="@dimen/gear_image_size"
         android:layout_height="@dimen/gear_image_size"
         actualImageScaleType="fitCenter"
-        android:layout_marginRight="@dimen/row_padding"/>
+        android:layout_marginEnd="@dimen/row_padding"/>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt
index 7d017fd07..396edfe86 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.kt
@@ -18,6 +18,7 @@ import com.facebook.imagepipeline.image.ImageInfo
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.models.Avatar
+import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import io.reactivex.functions.Consumer
 import java.util.*
 import java.util.concurrent.atomic.AtomicInteger
@@ -121,7 +122,7 @@ class AvatarView : View {
             multiDraweeHolder.add(draweeHolder)
 
             val controller = Fresco.newDraweeControllerBuilder()
-                    .setUri(IMAGE_URI_ROOT + getFileName(layerName))
+                    .setUri(IMAGE_URI_ROOT + DataBindingUtils.getFullFilename(layerName, null))
                     .setControllerListener(object : BaseControllerListener<ImageInfo>() {
                         override fun onFinalImageSet(
                                 id: String?,
@@ -382,18 +383,7 @@ class AvatarView : View {
         return bounds
     }
 
-    private fun getFileName(imageName: String): String {
-        val name = when {
-            FILENAME_MAP.containsKey(imageName) -> FILENAME_MAP[imageName]
-            imageName.startsWith("handleless") -> "chair_$imageName"
-            else -> imageName
-        }
-        return name + if (FILEFORMAT_MAP.containsKey(imageName)) {
-            "." + FILEFORMAT_MAP[imageName]
-        } else {
-            ".png"
-        }
-    }
+
 
     private fun onLayerComplete() {
         if (numberLayersInProcess.decrementAndGet() == 0) {
@@ -528,50 +518,9 @@ class AvatarView : View {
     companion object {
         const val IMAGE_URI_ROOT = "https://habitica-assets.s3.amazonaws.com/mobileApp/images/"
         private const val TAG = "AvatarView"
-        val FILEFORMAT_MAP: Map<String, String>
-        val FILENAME_MAP: Map<String, String>
         private val FULL_HERO_RECT = Rect(0, 0, 140, 147)
         private val COMPACT_HERO_RECT = Rect(0, 0, 114, 114)
         private val HERO_ONLY_RECT = Rect(0, 0, 90, 90)
 
-        init {
-            val tempMap = HashMap<String, String>()
-            tempMap["head_special_1"] = "gif"
-            tempMap["broad_armor_special_1"] = "gif"
-            tempMap["slim_armor_special_1"] = "gif"
-            tempMap["head_special_0"] = "gif"
-            tempMap["slim_armor_special_0"] = "gif"
-            tempMap["broad_armor_special_0"] = "gif"
-            tempMap["weapon_special_critical"] = "gif"
-            tempMap["weapon_special_0"] = "gif"
-            tempMap["shield_special_0"] = "gif"
-            tempMap["Pet-Wolf-Cerberus"] = "gif"
-            tempMap["armor_special_ks2019"] = "gif"
-            tempMap["slim_armor_special_ks2019"] = "gif"
-            tempMap["broad_armor_special_ks2019"] = "gif"
-            tempMap["eyewear_special_ks2019"] = "gif"
-            tempMap["head_special_ks2019"] = "gif"
-            tempMap["shield_special_ks2019"] = "gif"
-            tempMap["weapon_special_ks2019"] = "gif"
-            tempMap["Pet-Gryphon-Gryphatrice"] = "gif"
-            tempMap["Mount_Head_Gryphon-Gryphatrice"] = "gif"
-            tempMap["Mount_Body_Gryphon-Gryphatrice"] = "gif"
-            tempMap["background_clocktower"] = "gif"
-            tempMap["background_airship"] = "gif"
-            tempMap["background_steamworks"] = "gif"
-            FILEFORMAT_MAP = Collections.unmodifiableMap(tempMap)
-
-
-            val tempNameMap = HashMap<String, String>()
-            tempNameMap["head_special_1"] = "ContributorOnly-Equip-CrystalHelmet"
-            tempNameMap["armor_special_1"] = "ContributorOnly-Equip-CrystalArmor"
-            tempNameMap["head_special_0"] = "BackerOnly-Equip-ShadeHelmet"
-            tempNameMap["armor_special_0"] = "BackerOnly-Equip-ShadeArmor"
-            tempNameMap["shield_special_0"] = "BackerOnly-Shield-TormentedSkull"
-            tempNameMap["weapon_special_0"] = "BackerOnly-Weapon-DarkSoulsBlade"
-            tempNameMap["weapon_special_critical"] = "weapon_special_critical"
-            tempNameMap["Pet-Wolf-Cerberus"] = "Pet-Wolf-Cerberus"
-            FILENAME_MAP = Collections.unmodifiableMap(tempNameMap)
-        }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt
index 44998cad1..641b8fb89 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt
@@ -14,41 +14,48 @@ import com.facebook.common.executors.CallerThreadExecutor
 import com.facebook.common.references.CloseableReference
 import com.facebook.datasource.DataSource
 import com.facebook.drawee.backends.pipeline.Fresco
+import com.facebook.drawee.interfaces.DraweeController
 import com.facebook.drawee.view.SimpleDraweeView
 import com.facebook.imagepipeline.datasource.BaseBitmapDataSubscriber
 import com.facebook.imagepipeline.image.CloseableImage
 import com.facebook.imagepipeline.request.ImageRequestBuilder
 import com.habitrpg.android.habitica.R
+import java.util.*
 
 
-fun SimpleDraweeView.loadImage(imageName: String, imageFormat: String = "png") {
+fun SimpleDraweeView.loadImage(imageName: String, imageFormat: String? = null) {
     DataBindingUtils.loadImage(this, imageName, imageFormat)
 }
 
 object DataBindingUtils {
 
     fun loadImage(view: SimpleDraweeView?, imageName: String) {
-        loadImage(view, imageName, "png")
+        loadImage(view, imageName, null)
     }
 
-    fun loadImage(view: SimpleDraweeView?, imageName: String?, imageFormat: String = "png") {
+    fun loadImage(view: SimpleDraweeView?, imageName: String?, imageFormat: String? = null) {
         if (view != null && imageName != null && view.visibility == View.VISIBLE) {
-            val fullname = "$imageName.$imageFormat"
+            val fullname = getFullFilename(imageName, imageFormat)
             if (view.tag == fullname) {
                 return
             }
             view.tag = fullname
-            view.setImageURI("https://habitica-assets.s3.amazonaws.com/mobileApp/images/$fullname")
+            val controller: DraweeController = Fresco.newDraweeControllerBuilder()
+                    .setUri("https://habitica-assets.s3.amazonaws.com/mobileApp/images/$fullname")
+                    .setAutoPlayAnimations(true)
+                    .setOldController(view.controller)
+                    .build()
+            view.controller = controller
         }
     }
 
     fun loadImage(imageName: String, imageResult: (Bitmap) -> Unit) {
-        loadImage(imageName, "png", imageResult)
+        loadImage(imageName, null, imageResult)
     }
 
-    fun loadImage(imageName: String, imageFormat: String = "png", imageResult: (Bitmap) -> Unit) {
+    fun loadImage(imageName: String, imageFormat: String?, imageResult: (Bitmap) -> Unit) {
         val imageRequest = ImageRequestBuilder
-                .newBuilderWithSource("https://habitica-assets.s3.amazonaws.com/mobileApp/images/$imageName.$imageFormat".toUri())
+                .newBuilderWithSource("https://habitica-assets.s3.amazonaws.com/mobileApp/images/${getFullFilename(imageName, imageFormat)}".toUri())
                 .build()
 
         val imagePipeline = Fresco.getImagePipeline()
@@ -68,6 +75,19 @@ object DataBindingUtils {
         }, CallerThreadExecutor.getInstance())
     }
 
+    fun getFullFilename(imageName: String, imageFormat: String?): String {
+        val name = when {
+            FILENAME_MAP.containsKey(imageName) -> FILENAME_MAP[imageName]
+            imageName.startsWith("handleless") -> "chair_$imageName"
+            else -> imageName
+        }
+        return name + if (imageFormat == null && FILEFORMAT_MAP.containsKey(imageName)) {
+            "." + FILEFORMAT_MAP[imageName]
+        } else {
+            ".${imageFormat ?: "png"}"
+        }
+    }
+
     fun setForegroundTintColor(view: TextView, color: Int) {
         var thisColor = color
         if (thisColor > 0) {
@@ -105,4 +125,49 @@ object DataBindingUtils {
 
         override fun willChangeBounds(): Boolean = true
     }
+
+    private val FILEFORMAT_MAP: Map<String, String>
+    private val FILENAME_MAP: Map<String, String>
+
+    init {
+        val tempMap = HashMap<String, String>()
+        tempMap["head_special_1"] = "gif"
+        tempMap["broad_armor_special_1"] = "gif"
+        tempMap["slim_armor_special_1"] = "gif"
+        tempMap["head_special_0"] = "gif"
+        tempMap["slim_armor_special_0"] = "gif"
+        tempMap["broad_armor_special_0"] = "gif"
+        tempMap["weapon_special_critical"] = "gif"
+        tempMap["weapon_special_0"] = "gif"
+        tempMap["shield_special_0"] = "gif"
+        tempMap["Pet-Wolf-Cerberus"] = "gif"
+        tempMap["armor_special_ks2019"] = "gif"
+        tempMap["slim_armor_special_ks2019"] = "gif"
+        tempMap["broad_armor_special_ks2019"] = "gif"
+        tempMap["eyewear_special_ks2019"] = "gif"
+        tempMap["head_special_ks2019"] = "gif"
+        tempMap["shield_special_ks2019"] = "gif"
+        tempMap["weapon_special_ks2019"] = "gif"
+        tempMap["Pet-Gryphon-Gryphatrice"] = "gif"
+        tempMap["Mount_Head_Gryphon-Gryphatrice"] = "gif"
+        tempMap["Mount_Body_Gryphon-Gryphatrice"] = "gif"
+        tempMap["background_clocktower"] = "gif"
+        tempMap["background_airship"] = "gif"
+        tempMap["Pet_HatchingPotion_Veggie"] = "gif"
+        tempMap["Pet_HatchingPotion_Dessert"] = "gif"
+        tempMap["Pet-HatchingPotion-Dessert"] = "gif"
+        FILEFORMAT_MAP = Collections.unmodifiableMap(tempMap)
+
+
+        val tempNameMap = HashMap<String, String>()
+        tempNameMap["head_special_1"] = "ContributorOnly-Equip-CrystalHelmet"
+        tempNameMap["armor_special_1"] = "ContributorOnly-Equip-CrystalArmor"
+        tempNameMap["head_special_0"] = "BackerOnly-Equip-ShadeHelmet"
+        tempNameMap["armor_special_0"] = "BackerOnly-Equip-ShadeArmor"
+        tempNameMap["shield_special_0"] = "BackerOnly-Shield-TormentedSkull"
+        tempNameMap["weapon_special_0"] = "BackerOnly-Weapon-DarkSoulsBlade"
+        tempNameMap["weapon_special_critical"] = "weapon_special_critical"
+        tempNameMap["Pet-Wolf-Cerberus"] = "Pet-Wolf-Cerberus"
+        FILENAME_MAP = Collections.unmodifiableMap(tempNameMap)
+    }
 }

From 68cd8829ba09be8807e5e0a94879ed144cbe7aa8 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Fri, 3 Apr 2020 17:45:19 +0200
Subject: [PATCH 55/62] Fix background display

---
 .../layout/dialog_purchase_customization.xml  |   7 +-
 .../data/implementation/UserRepositoryImpl.kt |   2 +-
 .../models/inventory/Customization.java       | 200 ------------------
 .../models/inventory/Customization.kt         |  89 ++++++++
 .../CustomizationRecyclerViewAdapter.kt       |  21 +-
 .../AvatarCustomizationFragment.kt            |   2 +-
 .../utils/CustomizationDeserializer.kt        |   2 +-
 7 files changed, 111 insertions(+), 212 deletions(-)
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.kt

diff --git a/Habitica/res/layout/dialog_purchase_customization.xml b/Habitica/res/layout/dialog_purchase_customization.xml
index 5697da968..4389a1d9a 100644
--- a/Habitica/res/layout/dialog_purchase_customization.xml
+++ b/Habitica/res/layout/dialog_purchase_customization.xml
@@ -4,10 +4,11 @@
     android:layout_height="wrap_content">
 
     <com.facebook.drawee.view.SimpleDraweeView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/avatar_width"
+        android:layout_height="@dimen/avatar_height"
         android:id="@+id/imageView"
-        android:layout_gravity="center_horizontal" />
+        android:layout_gravity="center_horizontal"
+        android:scaleType="center"/>
 
     <LinearLayout
         android:orientation="horizontal"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
index 75ffbd7d7..165e52073 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
@@ -141,7 +141,7 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
                     copiedUser.preferences = unlockResponse.preferences
                     copiedUser.purchased = unlockResponse.purchased
                     copiedUser.items = unlockResponse.items
-                    copiedUser.balance = copiedUser.balance - customization.price / 4.0
+                    copiedUser.balance = copiedUser.balance - (customization.price ?: 0) / 4.0
                     localRepository.saveUser(copiedUser)
                 }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.java
deleted file mode 100644
index d8dad2205..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.java
+++ /dev/null
@@ -1,200 +0,0 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-import androidx.annotation.Nullable;
-
-import java.util.Date;
-
-import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
-
-public class Customization extends RealmObject {
-
-    @PrimaryKey
-    private String id;
-    private String identifier, category, type, notes, customizationSet, customizationSetName, text;
-    private boolean purchased, isBuyable;
-    private Integer price, setPrice;
-    private Date availableFrom, availableUntil;
-
-    private void updateID() {
-        this.id = this.identifier + "_" + this.type + "_" + this.category;
-    }
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    @Nullable
-    public String getIdentifier() {
-        return this.identifier;
-    }
-
-    public void setIdentifier(String identifier) {
-        this.identifier = identifier;
-        this.updateID();
-    }
-
-    @Nullable
-    public String getCategory() {
-        return this.category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-        this.updateID();
-    }
-
-    @Nullable
-    public String getType() {
-        return this.type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-        this.updateID();
-    }
-
-    public String getNotes() {
-        return this.notes;
-    }
-
-    public void setNotes(String notes) {
-        this.notes = notes;
-    }
-
-    public String getCustomizationSet() {
-        return this.customizationSet;
-    }
-
-    public void setCustomizationSet(String customizationSet) {
-        this.customizationSet = customizationSet;
-    }
-
-    public String getCustomizationSetName() {
-        return this.customizationSetName;
-    }
-
-    public void setCustomizationSetName(@Nullable String customizationSetName) {
-        this.customizationSetName = customizationSetName;
-    }
-
-    public String getText() {
-        return this.text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    @SuppressWarnings("RedundantIfStatement")
-    public boolean getPurchasable() {
-        Date today = new Date();
-        if (this.availableFrom != null && !this.availableFrom.before(today)) {
-            //Not released yet
-            return false;
-        }
-
-        if (this.availableUntil != null && !this.availableUntil.after(today)) {
-            //Discontinued
-            return false;
-        }
-
-        return true;
-    }
-
-    public boolean getPurchased() {
-        return this.purchased;
-    }
-
-    public void setPurchased(boolean purchased) {
-        this.purchased = purchased;
-    }
-
-    public Integer getPrice() {
-        return this.price;
-    }
-
-    public void setPrice(Integer price) {
-        this.price = price;
-    }
-
-    public Integer getSetPrice() {
-        return this.setPrice;
-    }
-
-    public void setSetPrice(Integer setPrice) {
-        this.setPrice = setPrice;
-    }
-
-    public Date getAvailableFrom() {
-        return this.availableFrom;
-    }
-
-    public void setAvailableFrom(Date availableFrom) {
-        this.availableFrom = availableFrom;
-    }
-
-    public Date getAvailableUntil() {
-        return this.availableUntil;
-    }
-
-    public void setAvailableUntil(Date availableUntil) {
-        this.availableUntil = availableUntil;
-    }
-
-    public String getImageName(String userSize, String hairColor) {
-        switch (this.type) {
-            case "skin":
-                return "skin_" + this.identifier;
-            case "shirt":
-                return userSize + "_shirt_" + this.identifier;
-            case "hair":
-                if (this.identifier.equals("0")) {
-                    return "head_0";
-                }
-
-                switch (this.category) {
-                    case "color":
-                        return "hair_bangs_1_" + this.identifier;
-                    case "flower":
-                        return "hair_flower_" + this.identifier;
-                    default:
-                        return "hair_" + this.category + "_" + this.identifier + "_" + hairColor;
-                }
-            case "background":
-                return "background_" + this.identifier;
-            case "chair":
-                return "chair_" + identifier;
-        }
-        return "";
-    }
-
-    public boolean isUsable() {
-        return this.price == null || this.price == 0 || this.purchased;
-    }
-
-    public String getPath() {
-        String path = this.type;
-
-        if (this.category != null) {
-            path = path + "." + this.category;
-        }
-
-        path = path + "." + this.identifier;
-
-        return path;
-
-    }
-
-    public boolean getIsBuyable() {
-        return isBuyable;
-    }
-
-    public void setIsBuyable(boolean buyable) {
-        isBuyable = buyable;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.kt
new file mode 100644
index 000000000..66f81185c
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.kt
@@ -0,0 +1,89 @@
+package com.habitrpg.android.habitica.models.inventory
+
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+import java.util.*
+
+open class Customization : RealmObject() {
+    @PrimaryKey
+    var id: String? = null
+    var identifier: String? = null
+    set(value) {
+        field = value
+        updateID()
+    }
+    var category: String? = null
+        set(value) {
+            field = value
+            updateID()
+        }
+    var type: String? = null
+        set(value) {
+            field = value
+            updateID()
+        }
+    var notes: String? = null
+    var customizationSet: String? = null
+    var customizationSetName: String? = null
+    var text: String? = null
+    var purchased = false
+    var isBuyable = false
+    var price: Int? = null
+    var setPrice: Int? = null
+    var availableFrom: Date? = null
+    var availableUntil: Date? = null
+    private fun updateID() {
+        id = identifier + "_" + type + "_" + this.category
+    }
+
+    //Not released yet
+    val purchasable: Boolean
+        get() {
+            val today = Date()
+            if (availableFrom != null && !availableFrom!!.before(today)) { //Not released yet
+                return false
+            }
+            return !(availableUntil != null && !availableUntil!!.after(today))
+        }
+
+    fun getIconName(userSize: String?, hairColor: String?): String {
+        return if (type == "background") {
+            "background_$identifier"
+        } else {
+            getImageName(userSize, hairColor)
+        }
+    }
+
+    fun getImageName(userSize: String?, hairColor: String?): String {
+        when (type) {
+            "skin" -> return "skin_$identifier"
+            "shirt" -> return userSize + "_shirt_" + identifier
+            "hair" -> {
+                return if (identifier == "0") {
+                    "head_0"
+                } else when (this.category) {
+                    "color" -> "hair_bangs_1_$identifier"
+                    "flower" -> "hair_flower_$identifier"
+                    else -> "hair_" + this.category + "_" + identifier + "_" + hairColor
+                }
+            }
+            "background" -> return "background_$identifier"
+            "chair" -> return "chair_$identifier"
+        }
+        return ""
+    }
+
+    val isUsable: Boolean
+        get() = price == null || price == 0 || purchased
+
+    val path: String
+        get() {
+            var path = type
+            if (this.category != null) {
+                path = path + "." + this.category
+            }
+            path = path + "." + identifier
+            return path
+        }
+
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
index d1603b19e..39ff6351d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
@@ -1,6 +1,7 @@
 package com.habitrpg.android.habitica.ui.adapter
 
 import android.content.Context
+import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -138,17 +139,25 @@ class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerVi
         fun bind(customization: Customization) {
             this.customization = customization
 
-            if (customization.customizationSet?.contains("timeTravel") == true) {
-                DataBindingUtils.loadImage(binding.imageView, customization.getImageName(userSize, hairColor), imageFormat = "gif")
-            } else {
-                DataBindingUtils.loadImage(binding.imageView, customization.getImageName(userSize, hairColor))
+            DataBindingUtils.loadImage(binding.imageView, customization.getIconName(userSize, hairColor))
+
+            if (customization.type == "background") {
+                val params = (binding.imageView.layoutParams as? LinearLayout.LayoutParams)?.apply {
+                    gravity = Gravity.CENTER
+                }
+                binding.imageView.layoutParams = params
             }
+
             if (customization.isUsable) {
                 binding.buyButton.visibility = View.GONE
             } else {
                 binding.buyButton.visibility = View.VISIBLE
-                binding.priceLabel.currency = "gems"
-                binding.priceLabel.value = customization.price.toDouble()
+                if (customization.customizationSet?.contains("timeTravel") == true) {
+                    binding.priceLabel.currency = "hourglasses"
+                } else {
+                    binding.priceLabel.currency = "gems"
+                }
+                binding.priceLabel.value = customization.price?.toDouble() ?: 0.0
             }
 
             if (activeCustomization == customization.identifier) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
index 8814a81db..c4f079126 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
@@ -138,7 +138,7 @@ class AvatarCustomizationFragment : BaseMainFragment() {
         this.updateActiveCustomization(user)
         if (adapter.customizationList.size != 0) {
             val ownedCustomizations = ArrayList<String>()
-            user.purchased?.customizations?.filter { it.type == this.type }?.mapTo(ownedCustomizations) { it.id }
+            user.purchased?.customizations?.filter { it.type == this.type }?.mapTo(ownedCustomizations) { it.id ?: "" }
             adapter.updateOwnership(ownedCustomizations)
         } else {
             this.loadCustomizations()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.kt
index d1416bc31..d0177b3ae 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.kt
@@ -54,7 +54,7 @@ class CustomizationDeserializer : JsonDeserializer<List<Customization>> {
                 if (jsonObject.has(customization.customizationSet)) {
                     val nestedObject = jsonObject.get(customization.customizationSet).asJsonObject
                     if (nestedObject.has(customization.identifier)) {
-                        customizations.add(this.parseBackground(customization, customization.customizationSet, customization.identifier, nestedObject.get(customization.identifier).asJsonObject))
+                        customizations.add(this.parseBackground(customization, customization.customizationSet ?: "", customization.identifier, nestedObject.get(customization.identifier).asJsonObject))
                         nestedObject.remove(customization.identifier)
                     }
                 }

From 76358a0f825997e0087bcf4f22d3976bbb1ac9c2 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Mon, 6 Apr 2020 17:57:08 +0200
Subject: [PATCH 56/62] update owned count when user receives a drop. Fixes
 #1271

---
 Habitica/build.gradle                          |  2 +-
 .../data/implementation/TaskRepositoryImpl.kt  | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index cedf0c625..d8d549294 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -155,7 +155,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 2392
+        versionCode 2394
         versionName "2.5"
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
index cd7f125d6..948383be6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
@@ -10,6 +10,7 @@ import com.habitrpg.android.habitica.models.responses.TaskDirection
 import com.habitrpg.android.habitica.models.responses.TaskDirectionData
 import com.habitrpg.android.habitica.models.responses.TaskScoringResult
 import com.habitrpg.android.habitica.models.tasks.*
+import com.habitrpg.android.habitica.models.user.OwnedItem
 import com.habitrpg.android.habitica.models.user.User
 import io.reactivex.Flowable
 import io.reactivex.Maybe
@@ -137,6 +138,23 @@ class TaskRepositoryImpl(localRepository: TaskLocalRepository, apiClient: ApiCli
                     }
                 }
             }
+            res._tmp?.drop?.key?.let { key ->
+                val type = when(res._tmp?.drop?.type?.toLowerCase(Locale.US)) {
+                    "hatchingPotion" -> "hatchingPotions"
+                    "egg" -> "eggs"
+                    else -> res._tmp?.drop?.type?.toLowerCase(Locale.US)
+                }
+                var item = it.where(OwnedItem::class.java).equalTo("itemType", type).equalTo("key", key).findFirst()
+                if (item == null) {
+                    item = OwnedItem()
+                    item.key = key
+                    item.itemType = type
+                    item.userID = user.id
+                }
+                item.numberOwned += 1
+                it.insertOrUpdate(item)
+            }
+
             val stats = bgUser.stats
             stats?.hp = res.hp
             stats?.exp = res.exp

From a77c9dbea75134a7c1501a9eab8dab69d0c47d01 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 7 Apr 2020 11:07:46 +0200
Subject: [PATCH 57/62] Fix adding new tag. Fixes #1281

---
 .../android/habitica/ui/fragments/tasks/TasksFragment.kt  | 8 ++++++++
 .../android/habitica/ui/views/tasks/TaskFilterDialog.kt   | 1 +
 2 files changed, 9 insertions(+)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
index 9fa6bc7c7..997a00be3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
@@ -21,6 +21,7 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.activities.TaskFormActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.views.tasks.TaskFilterDialog
+import io.reactivex.disposables.Disposable
 import io.reactivex.functions.Consumer
 import java.util.*
 import javax.inject.Inject
@@ -158,9 +159,11 @@ class TasksFragment : BaseMainFragment(), SearchView.OnQueryTextListener {
 
     private fun showFilterDialog() {
         context?.let {
+            var disposable: Disposable? = null
             val dialog = TaskFilterDialog(it, HabiticaBaseApplication.userComponent)
             if (user != null) {
                 dialog.setTags(user?.tags?.createSnapshot() ?: emptyList())
+                disposable = tagRepository.getTags(user?.id ?: "").subscribe(Consumer {tagsList -> dialog.setTags(tagsList)}, RxErrorHandler.handleEmptyError())
             }
             dialog.setActiveTags(taskFilterHelper.tags)
             if (activeFragment != null) {
@@ -182,6 +185,11 @@ class TasksFragment : BaseMainFragment(), SearchView.OnQueryTextListener {
                     updateFilterIcon()
                 }
             })
+            dialog.setOnDismissListener {
+                if (disposable?.isDisposed == false) {
+                    disposable?.dispose()
+                }
+            }
             dialog.show()
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
index 8fe8aa7b7..0ede16d8d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
@@ -112,6 +112,7 @@ class TaskFilterDialog(context: Context, component: UserComponent?) : AlertDialo
     }
 
     private fun createTagViews() {
+        tagsList.removeAllViews()
         val colorStateList = ColorStateList(
                 arrayOf(intArrayOf(-android.R.attr.state_checked), //disabled
                         intArrayOf(android.R.attr.state_checked) //enabled

From f6a8590515f691f109d180c97f91cb422a658575 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 7 Apr 2020 14:36:46 +0200
Subject: [PATCH 58/62] fix checking off checklist items in RYA. Fixes #1234

---
 .../views/yesterdailies/YesterdailyDialog.kt  | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt
index 46bf1431f..c957b8ece 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt
@@ -95,12 +95,7 @@ class YesterdailyDialog private constructor(context: Context, private val userRe
                 val checklistContainer = taskView.findViewById<ViewGroup>(R.id.checklistView)
                 for (item in task.checklist ?: emptyList<ChecklistItem>()) {
                     val checklistView = inflater.inflate(R.layout.checklist_item_row, yesterdailiesList, false)
-                    configureChecklistView(checklistView, item)
-                    checklistView.setOnClickListener {
-                        item.completed = !item.completed
-                        taskRepository.scoreChecklistItem(task.id ?: "", item.id ?: "").subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
-                        configureChecklistView(checklistView, item)
-                    }
+                    configureChecklistView(checklistView, task, item)
                     checklistContainer.addView(checklistView)
                 }
             }
@@ -111,9 +106,19 @@ class YesterdailyDialog private constructor(context: Context, private val userRe
         }
     }
 
-    private fun configureChecklistView(checklistView: View, item: ChecklistItem) {
+    private fun configureChecklistView(checklistView: View, task: Task, item: ChecklistItem) {
         val checkbox = checklistView.findViewById(R.id.checkBox) as? CheckBox
         checkbox?.isChecked = item.completed
+        checkbox?.setOnCheckedChangeListener { _, isChecked ->
+            item.completed = isChecked
+            taskRepository.scoreChecklistItem(task.id ?: "", item.id ?: "").subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+            configureChecklistView(checklistView, task, item)
+        }
+        checklistView.setOnClickListener {
+            item.completed = !item.completed
+            taskRepository.scoreChecklistItem(task.id ?: "", item.id ?: "").subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+            configureChecklistView(checklistView, task, item)
+        }
         val checkboxHolder = checklistView.findViewById<View>(R.id.checkBoxHolder)
         checkboxHolder.setBackgroundResource(R.color.gray_700)
         val textView = checklistView.findViewById(R.id.checkedTextView) as? TextView

From 01f0ac5a4a7bddd4dd77ad883690365655f7e429 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 7 Apr 2020 15:46:37 +0200
Subject: [PATCH 59/62] improve sprite substitution handling. Fixes #1284

---
 .../android/habitica/ui/helpers/DataBindingUtils.kt | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt
index 641b8fb89..5dcdc99ab 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt
@@ -20,7 +20,9 @@ import com.facebook.imagepipeline.datasource.BaseBitmapDataSubscriber
 import com.facebook.imagepipeline.image.CloseableImage
 import com.facebook.imagepipeline.request.ImageRequestBuilder
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.helpers.AppConfigManager
 import java.util.*
+import kotlin.collections.HashMap
 
 
 fun SimpleDraweeView.loadImage(imageName: String, imageFormat: String? = null) {
@@ -77,6 +79,7 @@ object DataBindingUtils {
 
     fun getFullFilename(imageName: String, imageFormat: String?): String {
         val name = when {
+            spriteSubstitutions.containsKey(imageName) -> spriteSubstitutions[imageName]
             FILENAME_MAP.containsKey(imageName) -> FILENAME_MAP[imageName]
             imageName.startsWith("handleless") -> "chair_$imageName"
             else -> imageName
@@ -129,6 +132,16 @@ object DataBindingUtils {
     private val FILEFORMAT_MAP: Map<String, String>
     private val FILENAME_MAP: Map<String, String>
 
+    private var spriteSubstitutions: Map<String, String> = HashMap()
+    get() {
+        if (Date().time - (lastSubstitutionCheck?.time ?: 0) > 180000) {
+            field = AppConfigManager().spriteSubstitutions().get("generic") ?: HashMap()
+            lastSubstitutionCheck = Date()
+        }
+        return field
+    }
+    private var lastSubstitutionCheck: Date? = null
+
     init {
         val tempMap = HashMap<String, String>()
         tempMap["head_special_1"] = "gif"

From 8eff8c6a5a6236da7631091a95ab1a0d962d71b7 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 8 Apr 2020 17:59:46 +0200
Subject: [PATCH 60/62] customization improvements

---
 Habitica/build.gradle                         |  2 +-
 .../res/layout/fragment_avatar_overview.xml   |  2 +
 .../data/implementation/TaskRepositoryImpl.kt |  2 +-
 .../RealmCustomizationLocalRepository.kt      |  4 +-
 .../models/inventory/Customization.kt         | 11 ++--
 .../models/user/OwnedCustomization.kt         | 28 ++++++++++
 .../habitica/models/user/Purchases.java       |  8 ++-
 .../CustomizationRecyclerViewAdapter.kt       | 25 ++++-----
 .../AvatarCustomizationFragment.kt            |  2 +-
 .../habitica/ui/helpers/DataBindingUtils.kt   |  1 +
 .../utils/CustomizationDeserializer.kt        | 35 +++++++------
 .../habitica/utils/PurchasedDeserializer.java | 52 ++++---------------
 12 files changed, 81 insertions(+), 91 deletions(-)
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedCustomization.kt

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index d8d549294..240d47b2f 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -155,7 +155,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 2394
+        versionCode 2396
         versionName "2.5"
     }
 
diff --git a/Habitica/res/layout/fragment_avatar_overview.xml b/Habitica/res/layout/fragment_avatar_overview.xml
index 3df829751..e6e440e8c 100644
--- a/Habitica/res/layout/fragment_avatar_overview.xml
+++ b/Habitica/res/layout/fragment_avatar_overview.xml
@@ -104,11 +104,13 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:id="@+id/avatar_animal_ears_view"
+                    android:visibility="gone"
                     app:equipmentTitle="@string/animal_ears"/>
                 <com.habitrpg.android.habitica.ui.views.EquipmentItemRow
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:id="@+id/avatar_animal_tail_view"
+                    android:visibility="gone"
                     app:equipmentTitle="@string/animal_tail"/>
                 <com.habitrpg.android.habitica.ui.views.EquipmentItemRow
                     android:layout_width="match_parent"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
index 948383be6..c8cc35aa8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
@@ -140,7 +140,7 @@ class TaskRepositoryImpl(localRepository: TaskLocalRepository, apiClient: ApiCli
             }
             res._tmp?.drop?.key?.let { key ->
                 val type = when(res._tmp?.drop?.type?.toLowerCase(Locale.US)) {
-                    "hatchingPotion" -> "hatchingPotions"
+                    "hatchingpotion" -> "hatchingPotions"
                     "egg" -> "eggs"
                     else -> res._tmp?.drop?.type?.toLowerCase(Locale.US)
                 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmCustomizationLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmCustomizationLocalRepository.kt
index 70da32eea..786ff3480 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmCustomizationLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmCustomizationLocalRepository.kt
@@ -27,12 +27,10 @@ class RealmCustomizationLocalRepository(realm: Realm) : RealmContentLocalReposit
                     .isNull("availableFrom")
                     .isNull("availableUntil")
                     .endGroup()
-                    .or()
-                    .equalTo("purchased", true)
                     .endGroup()
         }
         return query
-                .sort("customizationSet")
+                .sort("customizationSetName")
                 .findAll()
                 .asFlowable()
                 .filter { it.isLoaded }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.kt
index 66f81185c..93d5d0c61 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.kt
@@ -26,7 +26,6 @@ open class Customization : RealmObject() {
     var customizationSet: String? = null
     var customizationSetName: String? = null
     var text: String? = null
-    var purchased = false
     var isBuyable = false
     var price: Int? = null
     var setPrice: Int? = null
@@ -48,7 +47,7 @@ open class Customization : RealmObject() {
 
     fun getIconName(userSize: String?, hairColor: String?): String {
         return if (type == "background") {
-            "background_$identifier"
+            "icon_background_$identifier"
         } else {
             getImageName(userSize, hairColor)
         }
@@ -73,8 +72,9 @@ open class Customization : RealmObject() {
         return ""
     }
 
-    val isUsable: Boolean
-        get() = price == null || price == 0 || purchased
+    fun isUsable(purchased: Boolean): Boolean {
+        return price == null || price == 0 || purchased
+    }
 
     val path: String
         get() {
@@ -82,8 +82,7 @@ open class Customization : RealmObject() {
             if (this.category != null) {
                 path = path + "." + this.category
             }
-            path = path + "." + identifier
+            path = "$path.$identifier"
             return path
         }
-
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedCustomization.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedCustomization.kt
new file mode 100644
index 000000000..1d793e136
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/OwnedCustomization.kt
@@ -0,0 +1,28 @@
+package com.habitrpg.android.habitica.models.user
+
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class OwnedCustomization : RealmObject(), OwnedObject {
+
+    @PrimaryKey
+    override var combinedKey: String? = null
+    override var userID: String? = null
+        set(value) {
+            field = value
+            combinedKey = field + type + key
+        }
+    override var key: String? = null
+        set(value) {
+            field = value
+            combinedKey = userID + type + field
+        }
+
+    var type: String? = null
+        set(value) {
+            field = value
+            combinedKey = userID + field + key
+        }
+    var category: String? = null
+    var purchased = false
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.java
index f1df16051..89f35152e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.java
@@ -1,7 +1,5 @@
 package com.habitrpg.android.habitica.models.user;
 
-import com.habitrpg.android.habitica.models.inventory.Customization;
-
 import java.util.List;
 
 import io.realm.RealmList;
@@ -13,15 +11,15 @@ public class Purchases extends RealmObject {
     @PrimaryKey
     private String userId;
 
-    public RealmList<Customization> customizations;
+    public RealmList<OwnedCustomization> customizations;
     User user;
     private SubscriptionPlan plan;
 
-    public List<Customization> getCustomizations() {
+    public List<OwnedCustomization> getCustomizations() {
         return customizations;
     }
 
-    public void setCustomizations(RealmList<Customization> customizations) {
+    public void setCustomizations(RealmList<OwnedCustomization> customizations) {
         this.customizations = customizations;
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
index 39ff6351d..cbf9704f0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
@@ -42,20 +42,15 @@ class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerVi
         this.notifyDataSetChanged()
     }
 
+    var ownedCustomiztations: List<String> = listOf()
+
     private val selectCustomizationEvents = PublishSubject.create<Customization>()
     private val unlockCustomizationEvents = PublishSubject.create<Customization>()
     private val unlockSetEvents = PublishSubject.create<CustomizationSet>()
 
     fun updateOwnership(ownedCustomizations: List<String>) {
-        for ((position, obj) in customizationList.withIndex()) {
-            if (obj.javaClass == Customization::class.java) {
-                val customization = obj as? Customization ?: return
-                if (customization.purchased != ownedCustomizations.contains(customization.id)) {
-                    customization.purchased = ownedCustomizations.contains(customization.id)
-                    notifyItemChanged(position)
-                }
-            }
-        }
+        this.ownedCustomiztations = ownedCustomizations
+        notifyDataSetChanged()
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder {
@@ -103,12 +98,12 @@ class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerVi
                 set.identifier = customization.customizationSet
                 set.text = customization.customizationSetName
                 set.price = customization.setPrice
-                set.hasPurchasable = !customization.isUsable
+                set.hasPurchasable = !customization.isUsable(ownedCustomiztations.contains(customization.identifier))
                 lastSet = set
                 customizationList.add(set)
             }
             customizationList.add(customization)
-            if (!customization.isUsable && !lastSet.hasPurchasable) {
+            if (!customization.isUsable(ownedCustomiztations.contains(customization.identifier)) && !lastSet.hasPurchasable) {
                 lastSet.hasPurchasable = true
             }
         }
@@ -148,7 +143,7 @@ class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerVi
                 binding.imageView.layoutParams = params
             }
 
-            if (customization.isUsable) {
+            if (customization.isUsable(ownedCustomiztations.contains(customization.identifier))) {
                 binding.buyButton.visibility = View.GONE
             } else {
                 binding.buyButton.visibility = View.VISIBLE
@@ -168,7 +163,7 @@ class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerVi
         }
 
         override fun onClick(v: View) {
-            if (customization?.isUsable == false) {
+            if (customization?.isUsable(ownedCustomiztations.contains(customization?.identifier)) == false) {
                 if (customization?.customizationSet?.contains("timeTravel") == true) {
                     val dialog = HabiticaAlertDialog(itemView.context)
                     dialog.setMessage(R.string.purchase_from_timetravel_shop)
@@ -256,11 +251,11 @@ class CustomizationRecyclerViewAdapter : androidx.recyclerview.widget.RecyclerVi
                         customizationList
                                 .filter { Customization::class.java.isAssignableFrom(it.javaClass) }
                                 .map { it as Customization }
-                                .filter { !it.isUsable && it.customizationSet != null && it.customizationSet == set?.identifier }
+                                .filter { !it.isUsable(ownedCustomiztations.contains(it.identifier)) && it.customizationSet != null && it.customizationSet == set?.identifier }
                                 .forEach { set?.customizations?.add(it) }
                         if (additionalSetItems.isNotEmpty()) {
                             additionalSetItems
-                                    .filter { !it.isUsable && it.customizationSet != null && it.customizationSet == set?.identifier }
+                                    .filter { !it.isUsable(ownedCustomiztations.contains(it.identifier)) && it.customizationSet != null && it.customizationSet == set?.identifier }
                                     .forEach { set?.customizations?.add(it) }
                         }
                         set?.let {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
index c4f079126..0df324546 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
@@ -138,7 +138,7 @@ class AvatarCustomizationFragment : BaseMainFragment() {
         this.updateActiveCustomization(user)
         if (adapter.customizationList.size != 0) {
             val ownedCustomizations = ArrayList<String>()
-            user.purchased?.customizations?.filter { it.type == this.type }?.mapTo(ownedCustomizations) { it.id ?: "" }
+            user.purchased?.customizations?.filter { it.type == this.type && it.purchased }?.mapTo(ownedCustomizations) { it.key ?: "" }
             adapter.updateOwnership(ownedCustomizations)
         } else {
             this.loadCustomizations()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt
index 5dcdc99ab..ee1c80e90 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt
@@ -166,6 +166,7 @@ object DataBindingUtils {
         tempMap["Mount_Body_Gryphon-Gryphatrice"] = "gif"
         tempMap["background_clocktower"] = "gif"
         tempMap["background_airship"] = "gif"
+        tempMap["background_steamwork"] = "gif"
         tempMap["Pet_HatchingPotion_Veggie"] = "gif"
         tempMap["Pet_HatchingPotion_Dessert"] = "gif"
         tempMap["Pet-HatchingPotion-Dessert"] = "gif"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.kt
index d0177b3ae..035e2622c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.kt
@@ -16,9 +16,8 @@ class CustomizationDeserializer : JsonDeserializer<List<Customization>> {
         val customizations = RealmList<Customization>()
         val realm = Realm.getDefaultInstance()
 
+        val existingCustomizations = realm.copyFromRealm(realm.where(Customization::class.java).findAll())
         if (jsonObject.has("shirt")) {
-            val existingCustomizations = realm.copyFromRealm(realm.where(Customization::class.java).findAll())
-
             for (customization in existingCustomizations) {
                 if (jsonObject.has(customization.type)) {
                     var nestedObject = jsonObject.get(customization.type).asJsonObject
@@ -48,8 +47,6 @@ class CustomizationDeserializer : JsonDeserializer<List<Customization>> {
                 }
             }
         } else {
-            val existingCustomizations = realm.copyFromRealm(realm.where(Customization::class.java).findAll())
-
             for (customization in existingCustomizations) {
                 if (jsonObject.has(customization.customizationSet)) {
                     val nestedObject = jsonObject.get(customization.customizationSet).asJsonObject
@@ -123,19 +120,23 @@ class CustomizationDeserializer : JsonDeserializer<List<Customization>> {
             customization.type = "background"
             customization.identifier = key
         }
-        if ("incentiveBackgrounds" == setName) {
-            customization.customizationSetName = "Login Incentive"
-            customization.price = 0
-            customization.setPrice = 0
-            customization.isBuyable = false
-        } else if ("timeTravelBackgrounds" == setName) {
-            customization.customizationSetName = "Time Travel Backgrounds"
-            customization.price = 1
-            customization.setPrice = 0
-            customization.isBuyable = false
-        } else {
-            customization.price = 7
-            customization.setPrice = 15
+        when (setName) {
+            "incentiveBackgrounds" -> {
+                customization.customizationSetName = "Login Incentive"
+                customization.price = 0
+                customization.setPrice = 0
+                customization.isBuyable = false
+            }
+            "timeTravelBackgrounds" -> {
+                customization.customizationSetName = "Time Travel Backgrounds"
+                customization.price = 1
+                customization.setPrice = 0
+                customization.isBuyable = false
+            }
+            else -> {
+                customization.price = 7
+                customization.setPrice = 15
+            }
         }
 
         customization.text = entry.get("text").asString
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PurchasedDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PurchasedDeserializer.java
index c12cd6406..a7fe1cd5a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PurchasedDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PurchasedDeserializer.java
@@ -5,17 +5,14 @@ import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.habitrpg.android.habitica.models.inventory.Customization;
+import com.habitrpg.android.habitica.models.user.OwnedCustomization;
 import com.habitrpg.android.habitica.models.user.Purchases;
 import com.habitrpg.android.habitica.models.user.SubscriptionPlan;
 
 import java.lang.reflect.Type;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
 
-import io.realm.Realm;
 import io.realm.RealmList;
 
 public class PurchasedDeserializer implements JsonDeserializer<Purchases> {
@@ -23,47 +20,21 @@ public class PurchasedDeserializer implements JsonDeserializer<Purchases> {
     @Override
     public Purchases deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
         JsonObject object = json.getAsJsonObject();
-        RealmList<Customization> customizations = new RealmList<>();
+        RealmList<OwnedCustomization> customizations = new RealmList<>();
         Purchases purchases = new Purchases();
 
-        List<Customization> existingCustomizations;
-        try {
-            Realm realm = Realm.getDefaultInstance();
-            existingCustomizations = realm.copyFromRealm(realm.where(Customization.class).findAll());
-            realm.close();
-        } catch (RuntimeException e) {
-            //Tests don't have a database
-            existingCustomizations = new ArrayList<>();
-        }
-        for (Customization customization : existingCustomizations) {
-            if (object.has(customization.getType())) {
-                JsonObject nestedObject = object.get(customization.getType()).getAsJsonObject();
-                if (customization.getCategory() != null) {
-                    if (nestedObject.has(customization.getCategory())) {
-                        nestedObject = nestedObject.get(customization.getCategory()).getAsJsonObject();
-                    } else {
-                        continue;
-                    }
-                }
-                if (nestedObject.has(customization.getIdentifier())) {
-                    customizations.add(this.parseCustomization(customization, customization.getType(), customization.getCategory(), customization.getIdentifier(), nestedObject.get(customization.getIdentifier()).getAsBoolean()));
-                    nestedObject.remove(customization.getIdentifier());
-                }
-            }
-        }
-
         for (String type : Arrays.asList("background", "shirt", "skin")) {
             if (!object.has(type)) {
                 continue;
             }
             for (Map.Entry<String, JsonElement> entry : object.get(type).getAsJsonObject().entrySet()) {
-                customizations.add(this.parseCustomization(null, type, null, entry.getKey(), entry.getValue().getAsBoolean()));
+                customizations.add(this.parseCustomization(type, null, entry.getKey(), entry.getValue().getAsBoolean()));
             }
         }
         if (object.has("hair")) {
             for (Map.Entry<String, JsonElement> categoryEntry : object.get("hair").getAsJsonObject().entrySet()) {
                 for (Map.Entry<String, JsonElement> entry : categoryEntry.getValue().getAsJsonObject().entrySet()) {
-                    customizations.add(this.parseCustomization(null, "hair", categoryEntry.getKey(), entry.getKey(), entry.getValue().getAsBoolean()));
+                    customizations.add(this.parseCustomization("hair", categoryEntry.getKey(), entry.getKey(), entry.getValue().getAsBoolean()));
                 }
             }
         }
@@ -74,15 +45,12 @@ public class PurchasedDeserializer implements JsonDeserializer<Purchases> {
         return purchases;
     }
 
-    private Customization parseCustomization(Customization existingCustomizaion, String type, String category, String key, boolean wasPurchased) {
-        Customization customization = existingCustomizaion;
-        if (customization == null) {
-            customization = new Customization();
-            customization.setIdentifier(key);
-            customization.setType(type);
-            if (category != null) {
-                customization.setCategory(category);
-            }
+    private OwnedCustomization parseCustomization(String type, String category, String key, boolean wasPurchased) {
+        OwnedCustomization customization = new OwnedCustomization();
+        customization.setKey(key);
+        customization.setType(type);
+        if (category != null) {
+            customization.setCategory(category);
         }
         customization.setPurchased(wasPurchased);
 

From 7e76c78fc718b98d6292f9f5eaad35693520b2a9 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 9 Apr 2020 14:25:54 +0200
Subject: [PATCH 61/62] improve bulk gem purchasing handling

---
 Habitica/res/layout/dialog_purchase_content_gear.xml |  9 +++++++++
 Habitica/res/layout/dialog_purchase_content_item.xml |  9 +++++++++
 .../res/layout/dialog_purchase_content_quest.xml     |  9 +++++++++
 .../res/layout/dialog_purchase_customization.xml     |  9 +++++++++
 Habitica/res/layout/dialog_purchase_gems.xml         |  9 +++++++++
 Habitica/res/values/strings.xml                      |  1 +
 .../habitica/ui/views/shops/PurchaseDialog.kt        | 12 +++++++++++-
 .../ui/views/tasks/form/StepperValueFormView.kt      |  8 ++++----
 8 files changed, 61 insertions(+), 5 deletions(-)

diff --git a/Habitica/res/layout/dialog_purchase_content_gear.xml b/Habitica/res/layout/dialog_purchase_content_gear.xml
index eb5920031..466e0748d 100644
--- a/Habitica/res/layout/dialog_purchase_content_gear.xml
+++ b/Habitica/res/layout/dialog_purchase_content_gear.xml
@@ -100,4 +100,13 @@
                 android:textColor="@color/green_50"/>
         </TableRow>
     </TableLayout>
+    <TextView
+        android:id="@+id/amount_error_label"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:text="@string/purchase_amount_error"
+        android:textSize="12sp"
+        android:textColor="@color/gray_200"
+        android:layout_marginTop="@dimen/spacing_medium"
+        android:gravity="center_horizontal"/>
 </merge>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_purchase_content_item.xml b/Habitica/res/layout/dialog_purchase_content_item.xml
index 0235fb975..c61f9b15c 100644
--- a/Habitica/res/layout/dialog_purchase_content_item.xml
+++ b/Habitica/res/layout/dialog_purchase_content_item.xml
@@ -31,4 +31,13 @@
         android:textColor="@color/black_50_alpha"
         tools:text="These are the notes"
         android:gravity="center"/>
+    <TextView
+        android:id="@+id/amount_error_label"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:text="@string/purchase_amount_error"
+        android:textSize="12sp"
+        android:textColor="@color/gray_200"
+        android:layout_marginTop="@dimen/spacing_medium"
+        android:gravity="center_horizontal"/>
 </merge>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_purchase_content_quest.xml b/Habitica/res/layout/dialog_purchase_content_quest.xml
index 540e03a6f..be54a9fd5 100644
--- a/Habitica/res/layout/dialog_purchase_content_quest.xml
+++ b/Habitica/res/layout/dialog_purchase_content_quest.xml
@@ -179,4 +179,13 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"/>
+    <TextView
+        android:id="@+id/amount_error_label"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:text="@string/purchase_amount_error"
+        android:textSize="12sp"
+        android:textColor="@color/gray_200"
+        android:layout_marginTop="@dimen/spacing_medium"
+        android:gravity="center_horizontal"/>
 </merge>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_purchase_customization.xml b/Habitica/res/layout/dialog_purchase_customization.xml
index 4389a1d9a..b83be398b 100644
--- a/Habitica/res/layout/dialog_purchase_customization.xml
+++ b/Habitica/res/layout/dialog_purchase_customization.xml
@@ -30,5 +30,14 @@
             android:id="@+id/gem_icon"
             android:layout_gravity="center"/>
     </LinearLayout>
+    <TextView
+        android:id="@+id/amount_error_label"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:text="@string/purchase_amount_error"
+        android:textSize="12sp"
+        android:textColor="@color/gray_200"
+        android:layout_marginTop="@dimen/spacing_medium"
+        android:gravity="center_horizontal"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_purchase_gems.xml b/Habitica/res/layout/dialog_purchase_gems.xml
index 8bc9e122e..abb83f39d 100644
--- a/Habitica/res/layout/dialog_purchase_gems.xml
+++ b/Habitica/res/layout/dialog_purchase_gems.xml
@@ -42,4 +42,13 @@
         app:defaultValue="1"
         app:minValue="1"
         />
+    <TextView
+        android:id="@+id/amount_error_label"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:text="@string/purchase_amount_error"
+        android:textSize="12sp"
+        android:textColor="@color/gray_200"
+        android:layout_marginTop="@dimen/spacing_medium"
+        android:gravity="center_horizontal"/>
 </merge>
\ No newline at end of file
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 027203d58..b7c4cbc85 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -1005,4 +1005,5 @@
     <string name="avatar_accent">Accent</string>
     <string name="buy_all">Buy All</string>
     <string name="read_more">Read More</string>
+    <string name="purchase_amount_error">You are unable to buy that amount.</string>
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
index 5be4dfaf3..39708bf6a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
@@ -58,6 +58,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
     private val buyButton: View
     private val priceLabel: CurrencyView
     private val buyLabel: TextView
+    private var amountErrorLabel: TextView? = null
     private val pinButton: Button by bindView(customHeader, R.id.pin_button)
 
     private var purchaseQuantity = 1
@@ -112,6 +113,9 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
                 }
                 else -> contentView = PurchaseDialogBaseContent(context)
             }
+
+            amountErrorLabel = contentView.findViewById(R.id.amount_error_label)
+
             contentView.setItem(shopItem)
             setAdditionalContentView(contentView)
         }
@@ -119,7 +123,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
     fun updatePurchaseTotal() {
         priceLabel.value = shopItem.value.toDouble() * purchaseQuantity
 
-        if (shopItem.canAfford(user, purchaseQuantity) && !shopItem.locked) {
+        if (shopItem.canAfford(user, purchaseQuantity) && !shopItem.locked && purchaseQuantity >= 1) {
             buyButton.background = context.getDrawable(R.drawable.button_background_primary)
             priceLabel.setTextColor(ContextCompat.getColor(context, R.color.white))
             buyLabel.setTextColor(ContextCompat.getColor(context, R.color.white))
@@ -128,6 +132,12 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
             priceLabel.setTextColor(ContextCompat.getColor(context, R.color.gray_100))
             buyLabel.setTextColor(ContextCompat.getColor(context, R.color.gray_100))
         }
+
+        if (purchaseQuantity < 1 || (shopItem.limitedNumberLeft != null && (shopItem.limitedNumberLeft ?: 0) < purchaseQuantity)) {
+            amountErrorLabel?.visibility = View.VISIBLE
+        } else {
+            amountErrorLabel?.visibility = View.GONE
+        }
     }
 
     private fun checkGearClass() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/StepperValueFormView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/StepperValueFormView.kt
index 80a78eae0..b973f7bc6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/StepperValueFormView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/StepperValueFormView.kt
@@ -28,16 +28,16 @@ class StepperValueFormView @JvmOverloads constructor(
     private var editTextIsFocused = false
 
     var value = 0.0
-    set(value) {
-        var newValue = if (value >= minValue) value else minValue
+    set(new) {
+        var newValue = if (new >= minValue) new else minValue
         maxValue?.let {
-            if (newValue > it) {
+            if (newValue > it && it > 0) {
                 newValue = it
             }
         }
         val oldValue = field
         field = newValue
-        if (oldValue != newValue) {
+        if (oldValue != new) {
             valueString = decimalFormat.format(newValue)
         }
         downButton.isEnabled = field > minValue

From 21ba31c446da636f639a22c314ec6f83753179c9 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 9 Apr 2020 15:15:42 +0200
Subject: [PATCH 62/62] improve task list display

---
 .../com/habitrpg/android/habitica/models/tasks/Task.kt   | 1 +
 .../habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt  | 9 +++++++--
 .../android/habitica/ui/views/shops/PurchaseDialog.kt    | 2 +-
 .../android/habitica/utils/TaskListDeserializer.kt       | 3 +++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
index 9175fdbba..166ba9578 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
@@ -32,6 +32,7 @@ open class Task : RealmObject, Parcelable {
     var notes: String? = null
     @TaskTypes
     var type: String = ""
+    var challengeID: String? = null
     var attribute: String? = Stats.STRENGTH
     var value: Double = 0.0
     var tags: RealmList<Tag>? = RealmList()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt
index 24ba2e679..0913d78ec 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt
@@ -83,6 +83,9 @@ abstract class BaseTaskViewHolder constructor(itemView: View, var scoreTaskFunc:
         notesTextView?.addEllipsesListener(object : EllipsisTextView.EllipsisListener {
             override fun ellipsisStateChanged(ellipses: Boolean) {
                 GlobalScope.launch(Dispatchers.Main.immediate) {
+                    if (ellipses) {
+                        notesTextView?.maxLines = 3
+                    }
                     expandNotesButton?.visibility = if (ellipses || notesExpanded) View.VISIBLE else View.GONE
                 }
             }
@@ -96,7 +99,7 @@ abstract class BaseTaskViewHolder constructor(itemView: View, var scoreTaskFunc:
             notesTextView?.maxLines = 100
             expandNotesButton?.text = context.getString(R.string.collapse_notes)
         } else {
-            notesTextView?.maxLines = 3
+            notesTextView?.maxLines = 5
             expandNotesButton?.text = context.getString(R.string.expand_notes)
         }
     }
@@ -106,6 +109,8 @@ abstract class BaseTaskViewHolder constructor(itemView: View, var scoreTaskFunc:
         itemView.setBackgroundResource(R.color.white)
 
         expandNotesButton?.visibility = View.GONE
+        notesExpanded = false
+        notesTextView?.maxLines = 5
         if (data.notes?.isNotEmpty() == true) {
             notesTextView?.visibility = View.VISIBLE
             //expandNotesButton.visibility = if (notesTextView.hadEllipses() || notesExpanded) View.VISIBLE else View.GONE
@@ -158,7 +163,7 @@ abstract class BaseTaskViewHolder constructor(itemView: View, var scoreTaskFunc:
         iconViewReminder?.visibility = if (data.reminders?.size ?: 0 > 0) View.VISIBLE else View.GONE
         iconViewTag?.visibility = if (data.tags?.size ?: 0 > 0) View.VISIBLE else View.GONE
 
-        iconViewChallenge?.visibility = View.GONE
+        iconViewChallenge?.visibility = if (task?.challengeID != null) View.VISIBLE else View.GONE
 
         configureSpecialTaskTextView(data)
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
index 39708bf6a..4cf8704e4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
@@ -120,7 +120,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
             setAdditionalContentView(contentView)
         }
 
-    fun updatePurchaseTotal() {
+    private fun updatePurchaseTotal() {
         priceLabel.value = shopItem.value.toDouble() * purchaseQuantity
 
         if (shopItem.canAfford(user, purchaseQuantity) && !shopItem.locked && purchaseQuantity >= 1) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.kt
index 7ce98ab5f..08276f405 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.kt
@@ -71,6 +71,9 @@ class TaskListDeserializer : JsonDeserializer<TaskList> {
                     task.up = obj.get("up")?.asBoolean ?: false
                     task.down = obj.get("down")?.asBoolean ?: false
                     task.streak = obj.get("streak")?.asInt
+                    if (obj.getAsJsonObject("challenge").has("id")) {
+                        task.challengeID = obj.getAsJsonObject("challenge").get("id").asString
+                    }
                     try {
                         task.counterUp = obj.get("counterUp")?.asInt
                         task.counterDown = obj.get("counterDown")?.asInt