From 1ac2c5a795ea97d308c6e10b96428dc3b800ad47 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 29 Sep 2020 12:48:20 +0200
Subject: [PATCH] Fix various minor issues

---
 Habitica/AndroidManifest.xml                  |  2 ++
 Habitica/AndroidManifestTesting.xml           |  1 -
 Habitica/build.gradle                         |  4 ++--
 Habitica/res/drawable/checklist_unchecked.xml |  2 +-
 .../drawable/round_checklist_unchecked.xml    |  2 +-
 Habitica/res/layout/activity_full_profile.xml |  2 +-
 Habitica/res/layout/activity_gem_purchase.xml |  2 +-
 Habitica/res/layout/activity_guidelines.xml   |  2 +-
 Habitica/res/layout/activity_login.xml        | 13 +++++++++++
 .../res/layout/activity_notifications.xml     |  2 +-
 .../res/layout/activity_skill_members.xml     |  2 +-
 Habitica/res/layout/activity_skill_tasks.xml  |  2 +-
 Habitica/res/layout/dialog_task_filter.xml    |  2 +-
 Habitica/res/layout/edit_tag_item.xml         |  6 +++--
 .../res/layout/fragment_gift_gem_balance.xml  |  3 +--
 .../res/layout/fragment_gift_gem_purchase.xml |  6 +++--
 Habitica/res/layout/fragment_subscription.xml |  2 +-
 Habitica/res/layout/party_member.xml          |  7 ++++++
 Habitica/res/layout/subscription_details.xml  |  2 +-
 Habitica/res/layout/task_main_content.xml     |  4 ++--
 .../res/layout/view_collapsible_section.xml   |  6 ++---
 Habitica/res/layout/view_invitation.xml       | 23 ++++++++++---------
 Habitica/res/values-es/strings.xml            |  2 +-
 Habitica/res/values-ja/strings.xml            |  2 +-
 Habitica/res/values/dimens.xml                |  2 +-
 Habitica/res/values/strings.xml               |  3 +++
 Habitica/res/values/styles.xml                | 17 ++++++++++++--
 .../android/habitica/models/tasks/Task.kt     | 13 +++++++++++
 .../habitica/ui/activities/BaseActivity.kt    |  1 +
 .../ui/activities/ChallengeFormActivity.kt    | 15 ++++++++----
 .../activities/FixCharacterValuesActivity.kt  |  1 -
 .../ui/activities/GiftGemsActivity.kt         |  2 +-
 .../ui/activities/GroupInviteActivity.kt      |  2 +-
 .../habitica/ui/activities/LoginActivity.kt   |  2 ++
 .../habitica/ui/activities/SetupActivity.kt   |  2 +-
 .../ui/activities/TaskFormActivity.kt         |  6 ++---
 .../habitica/ui/fragments/BaseFragment.kt     |  5 ----
 .../inventory/items/ItemsFragment.kt          |  2 +-
 .../inventory/stable/StableFragment.kt        |  2 +-
 .../ui/fragments/setup/AvatarSetupFragment.kt |  6 +----
 .../ui/fragments/setup/TaskSetupFragment.kt   |  6 ++---
 .../ui/fragments/social/ChatFragment.kt       | 20 +++++++++-------
 .../social/NoPartyFragmentFragment.kt         |  2 +-
 .../challenges/ChallengeListFragment.kt       |  2 +-
 .../tasks/TaskRecyclerViewFragment.kt         |  2 ++
 .../habitica/ui/helpers/ToolbarColorHelper.kt |  7 ++++--
 .../ui/viewHolders/MemberViewHolder.kt        |  2 ++
 .../tasks/ChecklistedViewHolder.kt            |  9 ++++++--
 .../habitica/ui/viewmodels/GroupViewModel.kt  |  7 ++++--
 .../ui/views/CollapsibleSectionView.kt        | 14 ++++++-----
 .../ui/views/dialogs/HabiticaAlertDialog.kt   |  2 +-
 .../ui/views/tasks/TaskFilterDialog.kt        |  3 +++
 52 files changed, 168 insertions(+), 90 deletions(-)

diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index bf458dd69e..8aa9880610 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -12,6 +12,7 @@
 
     <uses-permission android:name="android.permission.RECORD_AUDIO" tools:node="remove" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" tools:node="remove" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" tools:node="remove" />
 
 
     <application
@@ -132,6 +133,7 @@
             android:name=".ui.activities.TaskFormActivity"
             android:parentActivityName=".ui.activities.MainActivity"
             tools:ignore="UnusedAttribute"
+            android:configChanges="orientation|screenSize"
             android:windowSoftInputMode="stateVisible|adjustResize">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
diff --git a/Habitica/AndroidManifestTesting.xml b/Habitica/AndroidManifestTesting.xml
index b198315e3b..b2a3cbd1a8 100644
--- a/Habitica/AndroidManifestTesting.xml
+++ b/Habitica/AndroidManifestTesting.xml
@@ -11,7 +11,6 @@
         android:minSdkVersion="15"
         android:targetSdkVersion="24" />
 
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index c9d9d81872..d20bd92248 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -156,8 +156,8 @@ 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 2561
-        versionName "3.0"
+        versionCode 2571
+        versionName "3.0.1"
     }
 
     viewBinding {
diff --git a/Habitica/res/drawable/checklist_unchecked.xml b/Habitica/res/drawable/checklist_unchecked.xml
index d754d2671f..bb27279ad6 100644
--- a/Habitica/res/drawable/checklist_unchecked.xml
+++ b/Habitica/res/drawable/checklist_unchecked.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <corners android:radius="@dimen/daily_checkbox_corner_radius"/>
-    <solid android:color="@color/checkbox_fill" />
+    <solid android:color="@color/white" />
     <size android:height="20dp" android:width="20dp" />
     <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/drawable/round_checklist_unchecked.xml b/Habitica/res/drawable/round_checklist_unchecked.xml
index 07a4ebfaab..779bc97dd0 100644
--- a/Habitica/res/drawable/round_checklist_unchecked.xml
+++ b/Habitica/res/drawable/round_checklist_unchecked.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/checkbox_fill" />
+    <solid android:color="@color/white" />
     <size android:height="20dp" android:width="20dp" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_full_profile.xml b/Habitica/res/layout/activity_full_profile.xml
index ee5642f809..8028c71a21 100644
--- a/Habitica/res/layout/activity_full_profile.xml
+++ b/Habitica/res/layout/activity_full_profile.xml
@@ -19,7 +19,7 @@
             android:minHeight="?attr/actionBarSize"
             android:theme="@style/Toolbar.Modern"
             app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/Theme.AppCompat.Light"/>
+            app:popupTheme="@style/PopupTheme"/>
 
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView
diff --git a/Habitica/res/layout/activity_gem_purchase.xml b/Habitica/res/layout/activity_gem_purchase.xml
index 1dea4dc049..ad55e0dc38 100644
--- a/Habitica/res/layout/activity_gem_purchase.xml
+++ b/Habitica/res/layout/activity_gem_purchase.xml
@@ -37,7 +37,7 @@
                     android:minHeight="?attr/actionBarSize"
                     android:background="?attr/colorContentBackground"
                     app:layout_collapseMode="pin"
-                    app:popupTheme="@style/Theme.AppCompat.Light" />
+                    app:popupTheme="@style/PopupTheme" />
             </com.google.android.material.appbar.AppBarLayout>
 
         </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/Habitica/res/layout/activity_guidelines.xml b/Habitica/res/layout/activity_guidelines.xml
index 87588e8eca..e144e34a60 100644
--- a/Habitica/res/layout/activity_guidelines.xml
+++ b/Habitica/res/layout/activity_guidelines.xml
@@ -19,7 +19,7 @@
             android:minHeight="?attr/actionBarSize"
             android:theme="@style/Toolbar.Modern"
             app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
+            app:popupTheme="@style/PopupTheme"/>
 
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView
diff --git a/Habitica/res/layout/activity_login.xml b/Habitica/res/layout/activity_login.xml
index f70f2f1770..e7f0eb1cb3 100644
--- a/Habitica/res/layout/activity_login.xml
+++ b/Habitica/res/layout/activity_login.xml
@@ -234,6 +234,19 @@
                         android:textColor="@color/white_75_alpha"
                         android:background="@color/transparent" />
 
+                    <TextView
+                        android:id="@+id/privacy_policy"
+                        android:layout_width="match_parent"
+                        android:layout_marginTop="@dimen/spacing_large"
+                        android:layout_marginBottom="@dimen/spacing_xlarge"
+                        android:gravity="center_horizontal"
+                        android:layout_height="wrap_content"
+                        android:text="@string/login_disclaimer"
+                        android:linksClickable="true"
+                        android:layout_gravity="center_horizontal"
+                        android:textColor="@color/white_75_alpha"
+                        android:background="@color/transparent" />
+
                 </LinearLayout>
 
             </ScrollView>
diff --git a/Habitica/res/layout/activity_notifications.xml b/Habitica/res/layout/activity_notifications.xml
index b5222c8333..70cd5d2fe8 100644
--- a/Habitica/res/layout/activity_notifications.xml
+++ b/Habitica/res/layout/activity_notifications.xml
@@ -19,7 +19,7 @@
             android:minHeight="?attr/actionBarSize"
             android:theme="@style/Toolbar.Modern"
             app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+            app:popupTheme="@style/PopupTheme" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/Habitica/res/layout/activity_skill_members.xml b/Habitica/res/layout/activity_skill_members.xml
index 840564aa47..22228fcd85 100644
--- a/Habitica/res/layout/activity_skill_members.xml
+++ b/Habitica/res/layout/activity_skill_members.xml
@@ -19,7 +19,7 @@
             android:minHeight="?attr/actionBarSize"
             android:theme="@style/Toolbar.Modern"
             app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
+            app:popupTheme="@style/PopupTheme"/>
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/Habitica/res/layout/activity_skill_tasks.xml b/Habitica/res/layout/activity_skill_tasks.xml
index dbcb1e0b8b..c00c542eb8 100644
--- a/Habitica/res/layout/activity_skill_tasks.xml
+++ b/Habitica/res/layout/activity_skill_tasks.xml
@@ -19,7 +19,7 @@
             android:minHeight="?attr/actionBarSize"
             android:theme="@style/Toolbar.Modern"
             app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
+            app:popupTheme="@style/PopupTheme"/>
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/Habitica/res/layout/dialog_task_filter.xml b/Habitica/res/layout/dialog_task_filter.xml
index 62be5a5c12..080d732a7d 100644
--- a/Habitica/res/layout/dialog_task_filter.xml
+++ b/Habitica/res/layout/dialog_task_filter.xml
@@ -74,7 +74,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
                     android:text="@string/edit_tag_btn_edit"
-                    android:textColor="@color/text_brand"
+                    android:textColor="?colorPrimary"
                     android:textSize="16sp"
                     android:gravity="end|center_vertical"
                     android:paddingEnd="0dp"/>
diff --git a/Habitica/res/layout/edit_tag_item.xml b/Habitica/res/layout/edit_tag_item.xml
index 3cf81763b1..0267fcd3b3 100644
--- a/Habitica/res/layout/edit_tag_item.xml
+++ b/Habitica/res/layout/edit_tag_item.xml
@@ -5,12 +5,14 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center_vertical">
-    <Button
+    <ImageButton
         android:id="@+id/delete_button"
         android:layout_width="45dp"
         android:layout_height="wrap_content"
         android:padding="0dp"
-        android:drawableStart="@drawable/ic_close_purple_300_36dp"
+        android:src="@drawable/ic_close_purple_300_36dp"
+        android:tint="?colorPrimary"
+        android:tintMode="src_atop"
         style="@style/Base.Widget.AppCompat.Button.Borderless"/>
     <EditText
         android:id="@+id/edit_text"
diff --git a/Habitica/res/layout/fragment_gift_gem_balance.xml b/Habitica/res/layout/fragment_gift_gem_balance.xml
index 1bc91a3c7c..1a88b80e08 100644
--- a/Habitica/res/layout/fragment_gift_gem_balance.xml
+++ b/Habitica/res/layout/fragment_gift_gem_balance.xml
@@ -55,8 +55,7 @@
                 android:id="@+id/gift_edit_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:inputType="number"
-                android:paddingTop="@dimen/spacing_small"/>
+                android:inputType="number"/>
         </com.google.android.material.textfield.TextInputLayout>
         <TextView
             android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_gift_gem_purchase.xml b/Habitica/res/layout/fragment_gift_gem_purchase.xml
index 3f2db96f01..213587941a 100644
--- a/Habitica/res/layout/fragment_gift_gem_purchase.xml
+++ b/Habitica/res/layout/fragment_gift_gem_purchase.xml
@@ -45,7 +45,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:layout_marginHorizontal="@dimen/spacing_large">
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -99,7 +100,8 @@
             android:gravity="center"
             android:layout_marginStart="@dimen/spacing_large"
             android:layout_marginEnd="@dimen/spacing_large"
-            android:layout_marginBottom="@dimen/spacing_large"
+            android:layout_marginTop="@dimen/spacing_large"
+            android:layout_marginBottom="@dimen/spacing_xlarge"
             style="@style/Caption2"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_subscription.xml b/Habitica/res/layout/fragment_subscription.xml
index 2a60c476b0..c3c0d25be4 100644
--- a/Habitica/res/layout/fragment_subscription.xml
+++ b/Habitica/res/layout/fragment_subscription.xml
@@ -324,7 +324,7 @@
                 <Button
                     android:text="@string/subscribe"
                     android:layout_width="match_parent"
-                    android:layout_height="36dp"
+                    android:layout_height="wrap_content"
                     android:id="@+id/subscribeButton"
                     style="@style/HabiticaButton.Purple.Small"
                     android:textAllCaps="false"
diff --git a/Habitica/res/layout/party_member.xml b/Habitica/res/layout/party_member.xml
index d97cd3f45d..a2115232a8 100644
--- a/Habitica/res/layout/party_member.xml
+++ b/Habitica/res/layout/party_member.xml
@@ -37,9 +37,16 @@
                 android:id="@+id/more_button"
                 android:src="@drawable/ic_more_horiz_black_18dp"
                 android:background="@color/transparent"
+                android:tint="?textColorPrimary"
                 android:layout_width="30dp"
                 android:layout_height="20dp"
                 android:layout_gravity="end"/>
+            <TextView
+                android:id="@+id/you_pill"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Pill"
+                android:text="@string/you"/>
         </LinearLayout>
         <TableLayout
             android:layout_width="match_parent"
diff --git a/Habitica/res/layout/subscription_details.xml b/Habitica/res/layout/subscription_details.xml
index e5ae0b24d9..a75136aa71 100644
--- a/Habitica/res/layout/subscription_details.xml
+++ b/Habitica/res/layout/subscription_details.xml
@@ -217,7 +217,7 @@
         <Button
             android:id="@+id/change_subscription_button"
             android:layout_width="match_parent"
-            android:layout_height="32dp"
+            android:layout_height="wrap_content"
             android:text="@string/visit_website"
             android:layout_gravity="center"
             style="@style/HabiticaButton.Purple"
diff --git a/Habitica/res/layout/task_main_content.xml b/Habitica/res/layout/task_main_content.xml
index 9f1e3b771d..4adcf93d69 100644
--- a/Habitica/res/layout/task_main_content.xml
+++ b/Habitica/res/layout/task_main_content.xml
@@ -18,7 +18,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:lineSpacingExtra="2sp"
-            android:textSize="14sp"
+            android:textSize="15sp"
             android:letterSpacing="0.025"
             tools:text="Habit Title" />
 
@@ -30,7 +30,7 @@
             android:textColor="@color/text_ternary"
             android:maxLines="3"
             android:ellipsize="end"
-            android:textSize="12sp"
+            android:textSize="13sp"
             tools:text="Notes"
             android:layout_marginBottom="7dp"/>
 
diff --git a/Habitica/res/layout/view_collapsible_section.xml b/Habitica/res/layout/view_collapsible_section.xml
index 3bf9effeca..0a62d984b9 100644
--- a/Habitica/res/layout/view_collapsible_section.xml
+++ b/Habitica/res/layout/view_collapsible_section.xml
@@ -11,10 +11,11 @@
         android:layout_height="1dp"
         android:background="@color/content_background_offset"/>
     <LinearLayout
-        android:id="@+id/title_view"
+        android:id="@+id/section_title_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="@dimen/spacing_large"
+        android:paddingEnd="32dp"
         android:gravity="center_vertical">
         <TextView
             android:id="@+id/titleTextView"
@@ -41,7 +42,6 @@
             android:id="@+id/caretView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:scaleType="center"
-            android:paddingEnd="32dp" />
+            android:scaleType="center" />
     </LinearLayout>
 </merge>
\ No newline at end of file
diff --git a/Habitica/res/layout/view_invitation.xml b/Habitica/res/layout/view_invitation.xml
index f550a67de7..be782544dd 100644
--- a/Habitica/res/layout/view_invitation.xml
+++ b/Habitica/res/layout/view_invitation.xml
@@ -13,8 +13,7 @@
             android:orientation="horizontal"
             android:layout_gravity="center_vertical"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            style="@style/CardContent">
+            android:layout_height="match_parent">
 
             <com.habitrpg.android.habitica.ui.RoundedFrameLayout
                 android:layout_width="@dimen/party_invite_avatar"
@@ -38,7 +37,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginStart="@dimen/party_invite_separator"
-                android:text="@string/invitation_title" />
+                android:text="@string/invitation_title_no_leader" />
 
             <Space
                 android:layout_width="0dp"
@@ -52,19 +51,21 @@
                 android:layout_marginEnd="@dimen/party_invite_separator"
                 android:layout_gravity="end|center_vertical|fill_horizontal">
 
-                <Button
+                <ImageButton
                     android:id="@+id/accept_button"
-                    android:layout_width="@dimen/party_invite_button"
-                    android:layout_height="@dimen/party_invite_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:layout_marginEnd="@dimen/party_accept_button_start_margin"
-                    android:background="@drawable/party_invite_accept" />
+                    android:src="@drawable/party_invite_accept"
+                    android:background="@color/transparent" />
 
-                <Button
+                <ImageButton
                     android:id="@+id/reject_button"
-                    android:layout_width="@dimen/party_invite_button"
-                    android:layout_height="@dimen/party_invite_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/party_accept_button_start_margin"
-                    android:background="@drawable/party_invite_reject" />
+                    android:src="@drawable/party_invite_reject"
+                    android:background="@color/transparent" />
             </LinearLayout>
         </LinearLayout>
     </FrameLayout>
diff --git a/Habitica/res/values-es/strings.xml b/Habitica/res/values-es/strings.xml
index 0bdd38a649..da91cba32f 100644
--- a/Habitica/res/values-es/strings.xml
+++ b/Habitica/res/values-es/strings.xml
@@ -830,7 +830,7 @@
     <string name="register_btn_google">Registrarse con Google</string>
     <string name="register_btn_fb">Registrarse con Facebook</string>
     <string name="login_btn_apple">Registrarse con Apple</string>
-    <string name="x_months">Meses</string>
+    <string name="x_months">%d Meses</string>
     <string name="inbox_messages_title_nosender">Recibiste %d mensajes</string>
     <string name="inbox_messages_title">Recibiste %d mensajes de %s</string>
     <string name="create_task">Crear %s</string>
diff --git a/Habitica/res/values-ja/strings.xml b/Habitica/res/values-ja/strings.xml
index fb608a331f..c3d5369342 100644
--- a/Habitica/res/values-ja/strings.xml
+++ b/Habitica/res/values-ja/strings.xml
@@ -900,7 +900,7 @@
     <string name="renew_subscription">寄付を再開する</string>
     <string name="thanks_for_subscribing">寄付に感謝します</string>
     <string name="subscribe_options_title">あなたのご都合にあった寄付の期間を選びましょう</string>
-    <string name="ending_on">%@に止める</string>
+    <string name="ending_on">%sに止める</string>
     <string name="not_recurring">くり返さない</string>
     <string name="cancelled">キャンセルしました</string>
     <string name="send_invites">招待状を送る</string>
diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml
index ac4c3694bf..3b44e1a668 100644
--- a/Habitica/res/values/dimens.xml
+++ b/Habitica/res/values/dimens.xml
@@ -13,7 +13,7 @@
     <dimen name="section_top_padding">16dp</dimen>
     <dimen name="card_margin">6dp</dimen>
 
-    <dimen name="party_invite_button">31dp</dimen>
+    <dimen name="party_invite_button">34dp</dimen>
     <dimen name="party_accept_button_start_margin">5dp</dimen>
     <dimen name="party_invite_avatar">46dp</dimen>  <!--50?-->
     <dimen name="party_invite_separator">4dp</dimen>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 5e06eab29f..05893f4d7e 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -1110,4 +1110,7 @@
     <string name="user_is_blocked">You blocked this user</string>
     <string name="user_is_blocked_explanation">A blocked user cannot send you Private Messages but you will still see their posts in Tavern or Guilds.</string>
     <string name="finish">Finish</string>
+    <string name="login_disclaimer">By signing up, you are indicating that you have read and agree to the <a href="https://habitica.com/static/terms">Terms of Service</a> and <a href="https://habitica.com/static/privacy">Privacy Policy.</a></string>
+    <string name="you">You</string>
+    <string name="invitation_title_no_leader">You were invited to join a party</string>
 </resources>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 413443cad6..da0eec478d 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -8,7 +8,7 @@
         <item name="elevation">0dp</item>
 
         <item name="android:windowContentOverlay">@null</item>
-        <item name="actionMenuTextColor">@color/white</item>
+        <item name="actionMenuTextColor">@color/text_primary</item>
 
         <!-- All customizations that are NOT specific to a particular API-level can go here. -->
 
@@ -50,7 +50,7 @@
         <item name="android:navigationBarColor">@color/system_bars</item>
 
         <item name="searchViewStyle">@style/SearchViewStyle</item>
-        <item name="toolbarContentColor">@color/white</item>
+        <item name="toolbarContentColor">@color/text_primary</item>
         <item name="colorPrimaryText">@color/brand_50</item>
         <item name="headerBackgroundColor">@color/content_background</item>
         <item name="headerOffsetColor">@color/window_background</item>
@@ -67,6 +67,12 @@
         <item name="textColorPrimaryDark">@color/gray_200</item>
     </style>
 
+    <style name="MainAppTheme.TaskForm">
+        <item name="toolbarContentColor">@color/white</item>
+        <item name="headerTextColor">@color/white</item>
+    </style>
+
+
     <style name="MainAppTheme.Red">
         <item name="colorPrimary">@color/red_10</item>
         <item name="colorPrimaryDark">@color/red_5</item>
@@ -90,6 +96,7 @@
         <item name="barColor">@color/gray_1</item>
         <item name="colorPrimaryOffset">@color/gray_10</item>
         <item name="textColorPrimaryDark">@color/gray_200</item>
+        <item name="toolbarContentColor">@color/red_100</item>
     </style>
 
     <style name="MainAppTheme.Maroon">
@@ -114,6 +121,7 @@
         <item name="barColor">@color/gray_1</item>
         <item name="colorPrimaryOffset">@color/gray_10</item>
         <item name="textColorPrimaryDark">@color/gray_200</item>
+        <item name="toolbarContentColor">@color/maroon_100</item>
     </style>
 
     <style name="MainAppTheme.Orange">
@@ -139,6 +147,7 @@
         <item name="barColor">@color/gray_1</item>
         <item name="colorPrimaryOffset">@color/gray_10</item>
         <item name="textColorPrimaryDark">@color/gray_200</item>
+        <item name="toolbarContentColor">@color/orange_100</item>
     </style>
 
     <style name="MainAppTheme.Yellow">
@@ -164,6 +173,7 @@
         <item name="barColor">@color/gray_1</item>
         <item name="colorPrimaryOffset">@color/gray_10</item>
         <item name="textColorPrimaryDark">@color/gray_200</item>
+        <item name="toolbarContentColor">@color/yellow_100</item>
     </style>
 
     <style name="MainAppTheme.Green">
@@ -189,6 +199,7 @@
         <item name="barColor">@color/gray_1</item>
         <item name="colorPrimaryOffset">@color/gray_10</item>
         <item name="textColorPrimaryDark">@color/gray_200</item>
+        <item name="toolbarContentColor">@color/green_100</item>
     </style>
 
     <style name="MainAppTheme.Teal">
@@ -214,6 +225,7 @@
         <item name="barColor">@color/gray_1</item>
         <item name="colorPrimaryOffset">@color/gray_10</item>
         <item name="textColorPrimaryDark">@color/gray_200</item>
+        <item name="toolbarContentColor">@color/teal_100</item>
     </style>
 
     <style name="MainAppTheme.Blue">
@@ -239,6 +251,7 @@
         <item name="barColor">@color/gray_1</item>
         <item name="colorPrimaryOffset">@color/gray_10</item>
         <item name="textColorPrimaryDark">@color/gray_200</item>
+        <item name="toolbarContentColor">@color/blue_100</item>
     </style>
 
     <style name="BottomSheetTheme" parent="Theme.AppCompat.NoActionBar">
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 7cdf310a20..0e19665b40 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
@@ -142,6 +142,19 @@ open class Task : RealmObject, Parcelable {
             }
         }
 
+    val darkestTaskColor: Int
+        get() {
+            return when {
+                this.value < -20 -> return R.color.maroon_5
+                this.value < -10 -> return R.color.red_5
+                this.value < -1 -> return R.color.orange_5
+                this.value < 1 -> return R.color.yellow_5
+                this.value < 5 -> return R.color.green_5
+                this.value < 10 -> return R.color.teal_5
+                else -> R.color.blue_5
+            }
+        }
+
     val isDisplayedActive: Boolean
         get() = isDue == true && !completed
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
index 37e2083b67..3f5307571e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
@@ -125,6 +125,7 @@ abstract class BaseActivity : AppCompatActivity() {
                     "green" -> R.style.MainAppTheme_Green
                     "teal" -> R.style.MainAppTheme_Teal
                     "blue" -> R.style.MainAppTheme_Blue
+                    "taskform" -> R.style.MainAppTheme_TaskForm
                     else -> R.style.MainAppTheme
                 })
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
index 051b1eef6d..b74ac56bb7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
@@ -32,6 +32,7 @@ import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import io.reactivex.Flowable
 import io.reactivex.rxkotlin.zipWith
+import java.lang.NumberFormatException
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Named
@@ -89,9 +90,11 @@ class ChallengeFormActivity : BaseActivity() {
             if (groupID != null) {
                 c.groupId = groupID
             } else {
-                val locationGroup = locationAdapter.getItem(locationPos)
-                if (locationGroup != null) {
-                    c.groupId = locationGroup.id
+                if (locationAdapter.count > locationPos) {
+                    val locationGroup = locationAdapter.getItem(locationPos)
+                    if (locationGroup != null) {
+                        c.groupId = locationGroup.id
+                    }
                 }
             }
             c.name = binding.createChallengeTitle.text.toString()
@@ -277,7 +280,11 @@ class ChallengeFormActivity : BaseActivity() {
             inputValue = "0"
         }
 
-        val currentVal = Integer.parseInt(inputValue)
+        val currentVal = try {
+            Integer.parseInt(inputValue)
+        } catch (_: NumberFormatException) {
+            0
+        }
 
         // 0 is Tavern
         val selectedLocation = binding.challengeLocationSpinner.selectedItemPosition
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 f1fd7df445..c68049ab8c 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
@@ -61,7 +61,6 @@ class FixCharacterValuesActivity: BaseActivity() {
         binding.experienceIconView.setImageBitmap(HabiticaIconsHelper.imageOfExperience())
         binding.manaIconView.setImageBitmap(HabiticaIconsHelper.imageOfMagic())
         binding.goldIconView.setImageBitmap(HabiticaIconsHelper.imageOfGold())
-        binding.levelIconView.setImageBitmap(HabiticaIconsHelper.imageOfRogueLightBg())
         binding.streakIconView.setImageResource(R.drawable.achievement_thermometer)
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt
index d6b180ef7a..2b865a1811 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt
@@ -110,7 +110,7 @@ class GiftGemsActivity : BaseActivity() {
     private fun setViewPagerAdapter() {
         val fragmentManager = supportFragmentManager
 
-        binding.viewPager.adapter = object : FragmentPagerAdapter(fragmentManager) {
+        binding.viewPager.adapter = object : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
             override fun getItem(position: Int): Fragment {
                 return if (position == 0) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupInviteActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupInviteActivity.kt
index 47f7462d00..2b59fc38eb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupInviteActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupInviteActivity.kt
@@ -103,7 +103,7 @@ class GroupInviteActivity : BaseActivity() {
     private fun setViewPagerAdapter() {
         val fragmentManager = supportFragmentManager
 
-        binding.viewPager.adapter = object : FragmentPagerAdapter(fragmentManager) {
+        binding.viewPager.adapter = object : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
             override fun getItem(position: Int): Fragment {
                 val fragment = PartyInviteFragment()
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 28ca98026f..7632b47ed5 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
@@ -10,6 +10,7 @@ import android.os.Build
 import android.os.Bundle
 import android.text.InputType
 import android.text.SpannableString
+import android.text.method.LinkMovementMethod
 import android.text.style.UnderlineSpan
 import android.view.MenuItem
 import android.view.View
@@ -144,6 +145,7 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
         val content = SpannableString(binding.forgotPassword.text)
         content.setSpan(UnderlineSpan(), 0, content.length, 0)
         binding.forgotPassword.text = content
+        binding.privacyPolicy.movementMethod = LinkMovementMethod.getInstance()
 
         this.isRegistering = true
 
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 5f23f36a7b..dad1953871 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
@@ -232,7 +232,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
                 .subscribe({  }, RxErrorHandler.handleEmptyError()))
     }
 
-    private inner class ViewPageAdapter(fm: FragmentManager) : FragmentPagerAdapter(fm), IconPagerAdapter {
+    private inner class ViewPageAdapter(fm: FragmentManager) : FragmentPagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT), IconPagerAdapter {
 
         override fun getItem(position: Int): Fragment {
             return when (position) {
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 8f54041387..599cb6b045 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
@@ -115,14 +115,14 @@ class TaskFormActivity : BaseActivity() {
                 else -> "blue"
             }
         } else {
-            "purple"
+            "taskform"
         }
         super.onCreate(savedInstanceState)
 
         if (forcedTheme == "yellow") {
             binding.taskDifficultyButtons.textTintColor = ContextCompat.getColor(this, R.color.text_yellow)
             binding.habitScoringButtons.textTintColor = ContextCompat.getColor(this, R.color.text_yellow)
-        } else if (forcedTheme == "purple") {
+        } else if (forcedTheme == "taskform") {
             binding.taskDifficultyButtons.textTintColor = ContextCompat.getColor(this, R.color.text_brand_neon)
             binding.habitScoringButtons.textTintColor = ContextCompat.getColor(this, R.color.text_brand_neon)
         }
@@ -185,7 +185,7 @@ class TaskFormActivity : BaseActivity() {
                     task = it
                     //tintColor = ContextCompat.getColor(this, it.mediumTaskColor)
                     fillForm(it)
-                    task?.challengeID?.let { challengeID ->
+                    it.challengeID?.let { challengeID ->
                         compositeSubscription.add(challengeRepository.retrieveChallenge(challengeID)
                                 .subscribe({ challenge ->
                             this.challenge = challenge
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt
index 93770ce1ae..23da66f3b6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt
@@ -38,11 +38,6 @@ abstract class BaseFragment<VB: ViewBinding> : DialogFragment() {
     open val displayedClassName: String?
         get() = this.javaClass.simpleName
 
-    override fun setUserVisibleHint(isVisibleToUser: Boolean) {
-        super.setUserVisibleHint(isVisibleToUser)
-        showTutorialIfNeeded()
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         HabiticaBaseApplication.userComponent?.let {
             injectFragment(it)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.kt
index aa09f1ecfa..048a39c4ba 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.kt
@@ -51,7 +51,7 @@ class ItemsFragment : BaseMainFragment<FragmentViewpagerBinding>() {
     private fun setViewPagerAdapter() {
         val fragmentManager = childFragmentManager
 
-        binding?.viewPager?.adapter = object : FragmentPagerAdapter(fragmentManager) {
+        binding?.viewPager?.adapter = object : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
             override fun getItem(position: Int): androidx.fragment.app.Fragment {
                 val fragment = ItemRecyclerFragment()
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 53fb37799c..cc109e0488 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
@@ -39,7 +39,7 @@ class StableFragment : BaseMainFragment<FragmentViewpagerBinding>() {
     private fun setViewPagerAdapter() {
         val fragmentManager = childFragmentManager
 
-        binding?.viewPager?.adapter = object : FragmentPagerAdapter(fragmentManager) {
+        binding?.viewPager?.adapter = object : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
             override fun getItem(position: Int): androidx.fragment.app.Fragment {
 
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 280ec90fee..abae64b643 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
@@ -99,11 +99,7 @@ class AvatarSetupFragment : BaseFragment<FragmentSetupAvatarBinding>() {
             this.updateAvatar()
         }
         this.selectedBodyCategory()
-    }
-
-    override fun setUserVisibleHint(isVisibleToUser: Boolean) {
-        super.setUserVisibleHint(isVisibleToUser)
-        if (isVisibleToUser && context != null) {
+        if (context != null) {
             binding?.speechBubble?.animateText(context?.getString(R.string.avatar_setup_description) ?: "")
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.kt
index e61fd6f109..b3a1a1bdf2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.kt
@@ -51,9 +51,9 @@ class TaskSetupFragment : BaseFragment<FragmentSetupTasksBinding>() {
         binding?.heartIcon?.setImageDrawable(BitmapDrawable(HabiticaIconsHelper.imageOfHeartLightBg()))
     }
 
-    override fun setUserVisibleHint(isVisibleToUser: Boolean) {
-        super.setUserVisibleHint(isVisibleToUser)
-        if (isVisibleToUser && context != null) {
+    override fun onResume() {
+        super.onResume()
+        if (context != null) {
             binding?.speechBubble?.animateText(context?.getString(R.string.task_setup_description) ?: "")
         }
     }
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 c02ab603c3..239f03094c 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
@@ -48,6 +48,7 @@ class ChatFragment : BaseFragment<FragmentChatBinding>() {
     private var chatAdapter: ChatRecyclerViewAdapter? = null
     private var navigatedOnceToFragment = false
     private var isScrolledToBottom = true
+    private var isFirstRefresh = true
     private var refreshDisposable: Disposable? = null
     var autocompleteContext: String = ""
 
@@ -108,13 +109,14 @@ class ChatFragment : BaseFragment<FragmentChatBinding>() {
         stopAutoRefreshing()
     }
 
-    override fun setUserVisibleHint(isVisibleToUser: Boolean) {
-        super.setUserVisibleHint(isVisibleToUser)
-        if (isVisibleToUser) {
-            startAutoRefreshing()
-        } else {
-            stopAutoRefreshing()
-        }
+    override fun onResume() {
+        super.onResume()
+        startAutoRefreshing()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        stopAutoRefreshing()
     }
 
     private fun startAutoRefreshing() {
@@ -126,6 +128,7 @@ class ChatFragment : BaseFragment<FragmentChatBinding>() {
                 .subscribe({
             refresh()
         }, RxErrorHandler.handleEmptyError())
+        refresh()
     }
 
     private fun stopAutoRefreshing() {
@@ -145,9 +148,10 @@ class ChatFragment : BaseFragment<FragmentChatBinding>() {
 
     private fun refresh() {
         viewModel?.retrieveGroupChat {
-            if (isScrolledToBottom) {
+            if (isScrolledToBottom || isFirstRefresh) {
                 binding?.recyclerView?.scrollToPosition(0)
             }
+            isFirstRefresh = false
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt
index 0cc5a9369f..75b5a79409 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/NoPartyFragmentFragment.kt
@@ -73,7 +73,7 @@ class NoPartyFragmentFragment : BaseMainFragment<FragmentNoPartyBinding>() {
                     socialRepository.getMember(leader)
                             .subscribe({
                                 binding?.root?.findViewById<AvatarView>(R.id.groupleader_avatar_view)?.setAvatar(it)
-                                binding?.root?.findViewById<TextView>(R.id.groupleader_avatar_view)?.text = getString(R.string.invitation_title,it.displayName, binding?.invitationsView?.groupName)
+                                binding?.root?.findViewById<TextView>(R.id.groupleader_text_view)?.text = getString(R.string.invitation_title,it.displayName, binding?.invitationsView?.groupName)
                             }, RxErrorHandler.handleEmptyError())
             )
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
index 9d909a1aea..613c3688e8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
@@ -137,7 +137,7 @@ class ChallengeListFragment : BaseFragment<FragmentChallengeslistBinding>(), and
     }
 
     internal fun retrieveChallengesPage(forced: Boolean = false) {
-        if ((!forced && binding?.refreshLayout?.isRefreshing == true) || loadedAllData) {
+        if ((!forced && binding?.refreshLayout?.isRefreshing == true) || loadedAllData || !this::challengeRepository.isInitialized) {
             return
         }
         setRefreshing(true)
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 a5700d1c78..a53a892c38 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
@@ -298,9 +298,11 @@ open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBi
                 dialog.setTitle(R.string.broken_challenge)
                 dialog.setMessage(it.getString(R.string.broken_challenge_description, taskCount))
                 dialog.addButton(it.getString(R.string.keep_x_tasks, taskCount), true) { _, _ ->
+                    if (!task.isValid) return@addButton
                     taskRepository.unlinkAllTasks(task.challengeID, "keep-all").subscribe({}, RxErrorHandler.handleEmptyError())
                 }
                 dialog.addButton(it.getString(R.string.delete_x_tasks, taskCount), false, true) { _, _ ->
+                    if (!task.isValid) return@addButton
                     taskRepository.unlinkAllTasks(task.challengeID, "remove-all").subscribe({}, RxErrorHandler.handleEmptyError())
                 }
                 dialog.setExtraCloseButtonVisibility(View.VISIBLE)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ToolbarColorHelper.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ToolbarColorHelper.kt
index abf9f91170..91d625dafa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ToolbarColorHelper.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ToolbarColorHelper.kt
@@ -16,12 +16,14 @@ limitations under the License.
 package com.habitrpg.android.habitica.ui.helpers
 
 import android.app.Activity
+import android.graphics.Color
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
 import android.os.Build
 import android.view.View
 import android.view.ViewTreeObserver.OnGlobalLayoutListener
 import android.widget.ImageButton
+import android.widget.TextView
 import androidx.appcompat.view.menu.ActionMenuItemView
 import androidx.appcompat.widget.ActionMenuView
 import androidx.appcompat.widget.Toolbar
@@ -59,8 +61,7 @@ object ToolbarColorHelper {
             if (v is ImageButton) {
                 //Action Bar back button
                 v.drawable.colorFilter = colorFilter
-            }
-            if (v is ActionMenuView) {
+            } else if (v is ActionMenuView) {
                 for (j in 0 until v.childCount) {
 
                     //Step 2: Changing the color of any ActionMenuViews - icons that are not back button, nor text, nor overflow menu icon.
@@ -77,6 +78,8 @@ object ToolbarColorHelper {
                         }
                     }
                 }
+            } else if (v is TextView) {
+                v.setTextColor(toolbarIconsColor)
             }
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MemberViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MemberViewHolder.kt
index 7dd977cb03..107f17e0fb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MemberViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MemberViewHolder.kt
@@ -53,8 +53,10 @@ class GroupMemberViewHolder(itemView: View) : androidx.recyclerview.widget.Recyc
         this.currentUserID = userID
 
         if (user.id == userID) {
+            binding.youPill.visibility = View.VISIBLE
             binding.moreButton.visibility = View.GONE
         } else {
+            binding.youPill.visibility = View.GONE
             binding.moreButton.visibility = View.VISIBLE
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt
index 1ee371452c..3e928bc25a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt
@@ -39,7 +39,9 @@ abstract class ChecklistedViewHolder(itemView: View, scoreTaskFunc: ((Task, Task
         checklistIndicatorWrapper.isClickable = true
         checklistIndicatorWrapper.setOnClickListener { onChecklistIndicatorClicked() }
         checkboxHolder.setOnClickListener {
-            onCheckedChanged(!(task?.completed ?: false))
+            if (task?.isValid == true) {
+                onCheckedChanged(!(task?.completed ?: false))
+            }
         }
     }
 
@@ -92,9 +94,11 @@ abstract class ChecklistedViewHolder(itemView: View, scoreTaskFunc: ((Task, Task
                     if (task?.type == Task.TYPE_TODO) {
                         checkboxBackground?.setBackgroundResource(R.drawable.round_checklist_unchecked)
                     }
+                    checkboxBackground?.backgroundTintList = ContextCompat.getColorStateList(context, (if (context.isUsingNightModeResources()) task?.lightTaskColor else R.color.checkbox_fill) ?: R.color.checkbox_fill)
                     val textView = itemView?.findViewById<HabiticaEmojiTextView>(R.id.checkedTextView)
                     // Populate the data into the template view using the data object
                     textView?.text = item.text
+                    textView?.setTextColor(ContextCompat.getColor(context, if (item.completed) R.color.text_dimmed else R.color.text_secondary))
                     if (item.text != null) {
                         Observable.just(item.text)
                                 .map { MarkdownParser.parseMarkdown(it) }
@@ -113,7 +117,8 @@ abstract class ChecklistedViewHolder(itemView: View, scoreTaskFunc: ((Task, Task
                         checkmark?.drawable?.setTint(ContextCompat.getColor(context, R.color.text_dimmed))
                         R.color.offset_background
                     } else {
-                        checkmark?.drawable?.setTint(ContextCompat.getColor(context, task?.darkTaskColor ?: R.color.text_dimmed))
+                        val color = if (context.isUsingNightModeResources()) task?.darkestTaskColor else task?.darkTaskColor
+                        checkmark?.drawable?.setTint(ContextCompat.getColor(context, color ?: R.color.text_dimmed))
                         task?.extraLightTaskColor ?: R.color.offset_background
                     })
                     color.let { checkboxHolder?.setBackgroundColor(it) }
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 edf710df57..2fc1ea93d0 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
@@ -20,7 +20,7 @@ import io.reactivex.Flowable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.subjects.BehaviorSubject
 import io.realm.RealmResults
-import java.util.*
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 enum class GroupViewType(internal val order: String) {
@@ -216,7 +216,10 @@ open class GroupViewModel : BaseViewModel() {
             onComplete()
             return
         }
-        disposable.add(socialRepository.retrieveGroupChat(groupID).subscribe({
+        disposable.add(socialRepository.retrieveGroupChat(groupID)
+                .delay(500, TimeUnit.MILLISECONDS)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe({
             onComplete()
         }, RxErrorHandler.handleEmptyError()))
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt
index ea2d9cbfd2..a9098c66c9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt
@@ -59,9 +59,9 @@ class CollapsibleSectionView(context: Context, attrs: AttributeSet?) : LinearLay
     private fun showViews() {
         updatePreferences()
         setCaretImage()
-        (2 until childCount)
-                .filter { getChildAt(it) != binding.titleView }
-                .forEach { getChildAt(it).visibility = View.VISIBLE }
+        (0 until childCount)
+                .map { getChildAt(it) }
+                .forEach { it.visibility = View.VISIBLE }
     }
 
     private fun hideViews() {
@@ -69,6 +69,7 @@ class CollapsibleSectionView(context: Context, attrs: AttributeSet?) : LinearLay
         setCaretImage()
         (2 until childCount)
                 .map { getChildAt(it) }
+                .filter { it != binding.sectionTitleView }
                 .forEach {
                     it.visibility = View.GONE
                 }
@@ -88,6 +89,7 @@ class CollapsibleSectionView(context: Context, attrs: AttributeSet?) : LinearLay
     private fun setChildMargins() {
         (2 until childCount)
                 .map { getChildAt(it) }
+                .filter { it != binding.sectionTitleView }
                 .forEach {
                     val lp = it.layoutParams as? LayoutParams
                     lp?.setMargins(padding, 0, padding, bottomPadding)
@@ -104,8 +106,8 @@ class CollapsibleSectionView(context: Context, attrs: AttributeSet?) : LinearLay
         var height = 0
         measureChildWithMargins(binding.separator, widthMeasureSpec, 0, heightMeasureSpec, height)
         height += binding.separator.measuredHeight
-        measureChildWithMargins(binding.titleTextView, widthMeasureSpec, 0, heightMeasureSpec, height)
-        height += binding.titleTextView.measuredHeight
+        measureChildWithMargins(binding.sectionTitleView, widthMeasureSpec, 0, heightMeasureSpec, height)
+        height += binding.sectionTitleView.measuredHeight
         (2 until childCount)
                 .map { getChildAt(it) }
                 .forEach {
@@ -123,7 +125,7 @@ class CollapsibleSectionView(context: Context, attrs: AttributeSet?) : LinearLay
     init {
         caretColor = ContextCompat.getColor(context, R.color.black_50_alpha)
         orientation = VERTICAL
-        binding.titleTextView.setOnClickListener {
+        binding.sectionTitleView.setOnClickListener {
             isCollapsed = !isCollapsed
         }
         val attributes = context.theme?.obtainStyledAttributes(
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 1864082d73..061bf62059 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
@@ -269,7 +269,7 @@ open class HabiticaAlertDialog(context: Context) : AlertDialog(context, R.style.
                 dialogQueue.removeAt(0)
             }
             if (dialogQueue.size > 0) {
-                if ((dialogQueue[0].context as? Activity) == null || (dialogQueue[0].context as? Activity)?.isFinishing == false) {
+                if ((dialogQueue[0].context as? Activity)?.isFinishing == false) {
                     dialogQueue[0].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 c708e5c259..91b4bf8a25 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
@@ -147,6 +147,9 @@ class TaskFilterDialog(context: Context, component: UserComponent?) : HabiticaAl
         button.setText(R.string.add_tag)
         button.setOnClickListener { createTag() }
         button.setCompoundDrawablesWithIntrinsicBounds(addIcon, null, null, null)
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+            button.compoundDrawableTintList = ColorStateList.valueOf(context.getThemeColor(R.attr.colorPrimary))
+        }
         button.setBackgroundResource(R.drawable.layout_rounded_bg_lighter_gray)
         button.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
         tagsList.addView(button)