From 9a7e4924ee047f931ba4532fb03c1c562198886c Mon Sep 17 00:00:00 2001
From: Hafiz <hafizbhamidi@gmail.com>
Date: Fri, 1 Jul 2022 03:11:51 -0400
Subject: [PATCH 01/39] remove hide task rewards setting

---
 .../wearos/habitica/ui/activities/SettingsActivity.kt | 11 -----------
 wearos/src/main/res/layout/activity_login.xml         |  2 --
 2 files changed, 13 deletions(-)

diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt
index a3c471005..39400b40f 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt
@@ -58,17 +58,6 @@ class SettingsActivity: BaseActivity<ActivitySettingsBinding, SettingsViewModel>
             ) {
                 viewModel.resyncData()
             },
-            SettingsItem(
-                "hide_results",
-                getString(R.string.hide_task_rewards),
-                SettingsItem.Types.TOGGLE,
-                viewModel.isTaskResultHidden()
-            ) {
-                viewModel.setHideTaskResults(!viewModel.isTaskResultHidden())
-                val index = adapter.data.indexOfFirst { it.identifier == "hide_results" }
-                adapter.data[index].value = viewModel.isTaskResultHidden()
-                adapter.notifyItemChanged(index)
-            },
             SettingsItem(
                 "logout",
                 getString(R.string.logout),
diff --git a/wearos/src/main/res/layout/activity_login.xml b/wearos/src/main/res/layout/activity_login.xml
index 23328c2e1..800b417ac 100644
--- a/wearos/src/main/res/layout/activity_login.xml
+++ b/wearos/src/main/res/layout/activity_login.xml
@@ -78,7 +78,6 @@
                 android:id="@+id/username_edit_text"
                 android:layout_width="match_parent"
                 android:layout_height="52dp"
-                android:textColorHint="@color/gray_200"
                 android:inputType="textEmailAddress"
                 android:hint="@string/email_username"
                 android:paddingHorizontal="16dp"
@@ -90,7 +89,6 @@
             <EditText
                 android:id="@+id/password_edit_text"
                 android:layout_width="match_parent"
-                android:textColorHint="@color/gray_200"
                 android:layout_height="52dp"
                 android:hint="@string/password"
                 android:background="@drawable/row_background_outline"

From 3a8043e7865e3884b4175696e161abbce1d81f14 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 30 Jun 2022 12:14:31 +0200
Subject: [PATCH 02/39] Fix a bunch of warnings

---
 .../res/layout/activity_adventure_guide.xml   |  2 +-
 .../res/layout/activity_class_selection.xml   |  2 +-
 Habitica/res/layout/activity_full_profile.xml |  6 +-
 .../res/layout/armoire_drop_rate_dialog.xml   |  6 +-
 .../res/layout/dialog_insufficient_gems.xml   |  2 +-
 Habitica/res/layout/dialog_levelup_10.xml     |  2 +-
 .../dialog_purchase_shopitem_button.xml       |  4 +-
 Habitica/res/layout/dialog_task_filter.xml    |  2 +-
 Habitica/res/layout/fragment_inbox.xml        |  2 +-
 Habitica/res/layout/fragment_promo_info.xml   |  4 +-
 Habitica/res/layout/fragment_subscription.xml |  6 +-
 Habitica/res/layout/fragment_support_main.xml |  6 +-
 Habitica/res/layout/item_public_guild.xml     |  2 +-
 Habitica/res/layout/item_user_guild.xml       |  2 +-
 Habitica/res/layout/menu_bottom_sheet.xml     |  2 +-
 Habitica/res/layout/purchase_gem_view.xml     |  2 +-
 Habitica/res/layout/skill_list_item.xml       |  2 +-
 Habitica/res/layout/speechbubble.xml          |  2 +-
 Habitica/res/values/styles.habitica.xml       |  2 +-
 common/src/main/res/values/colors.xml         |  4 +-
 .../wearos/habitica/data/ApiClient.kt         | 12 +--
 .../habitica/models/tasks/ChecklistItem.kt    |  6 --
 .../habitica/models/tasks/RemindersItem.kt    | 47 ----------
 .../wearos/habitica/models/tasks/Task.kt      | 87 ++++++-------------
 .../wearos/habitica/modules/AppModule.kt      |  8 +-
 .../habitica/ui/activities/BaseActivity.kt    |  3 +-
 .../ui/activities/HabitDirectionActivity.kt   |  6 +-
 .../habitica/ui/activities/MainActivity.kt    |  6 +-
 .../habitica/ui/activities/StatsActivity.kt   |  7 +-
 .../ui/activities/TaskListActivity.kt         |  4 +-
 .../habitica/ui/adapters/TaskListAdapter.kt   |  2 +-
 .../tasks/CheckedTaskViewHolder.kt            |  2 +-
 .../ui/viewHolders/tasks/RewardViewHolder.kt  |  6 --
 .../ui/viewHolders/tasks/ToDoViewHolder.kt    |  1 -
 ...iewModel.kt => HabitDirectionViewModel.kt} | 13 +--
 .../habitica/ui/viewmodels/LoginViewModel.kt  | 23 +----
 .../habitica/ui/views/CircularProgressView.kt | 16 ++--
 .../ui/views/HabitDirectionPickerButton.kt    |  2 +-
 .../wearos/habitica/ui/views/StatValue.kt     |  3 -
 .../wearos/habitica/ui/views/TaskTextView.kt  |  3 +-
 .../wearos/habitica/util/DateJSONAdapter.kt   |  2 +-
 .../util/HabiticaScrollingLayoutCallback.kt   |  2 +-
 wearos/src/main/res/layout/activity_faint.xml |  5 +-
 .../res/layout/activity_habit_direction.xml   |  2 +-
 wearos/src/main/res/layout/activity_login.xml |  9 +-
 wearos/src/main/res/layout/activity_rya.xml   |  4 +-
 .../src/main/res/layout/activity_settings.xml |  2 +-
 wearos/src/main/res/layout/activity_stats.xml |  1 +
 .../main/res/layout/activity_task_detail.xml  |  4 +-
 .../main/res/layout/activity_task_form.xml    | 10 +--
 .../src/main/res/layout/button_add_task.xml   |  1 +
 wearos/src/main/res/layout/logout_layout.xml  |  2 +-
 wearos/src/main/res/layout/row_daily.xml      |  2 +-
 wearos/src/main/res/layout/row_footer.xml     |  1 +
 wearos/src/main/res/layout/row_habit.xml      |  2 +-
 wearos/src/main/res/layout/row_header.xml     |  2 +-
 wearos/src/main/res/layout/row_hub.xml        |  4 +-
 wearos/src/main/res/layout/row_reward.xml     |  2 +-
 wearos/src/main/res/layout/row_settings.xml   |  3 +-
 wearos/src/main/res/layout/row_todo.xml       |  2 +-
 .../src/main/res/layout/stat_value_layout.xml |  8 +-
 .../src/main/res/layout/task_reward_chip.xml  |  3 +-
 .../src/main/res/layout/task_reward_drop.xml  |  4 +-
 wearos/src/main/res/values/styles.xml         | 12 +--
 64 files changed, 143 insertions(+), 265 deletions(-)
 rename wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/{HabitDrectionViewModel.kt => HabitDirectionViewModel.kt} (62%)

diff --git a/Habitica/res/layout/activity_adventure_guide.xml b/Habitica/res/layout/activity_adventure_guide.xml
index c0bb45254..c3bc9ccbc 100644
--- a/Habitica/res/layout/activity_adventure_guide.xml
+++ b/Habitica/res/layout/activity_adventure_guide.xml
@@ -41,7 +41,7 @@
                 android:src="@drawable/adventure_guide_art" />
 
             <TextView
-                style="@style/Subheader1"
+                style="@style/SubHeader1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="30dp"
diff --git a/Habitica/res/layout/activity_class_selection.xml b/Habitica/res/layout/activity_class_selection.xml
index c9e70c404..9ec3980a7 100644
--- a/Habitica/res/layout/activity_class_selection.xml
+++ b/Habitica/res/layout/activity_class_selection.xml
@@ -180,7 +180,7 @@
                 android:layout_height="43dp"
                 android:textColor="@color/white"
                 android:gravity="center"
-                style="@style/Subheader1"
+                style="@style/SubHeader1"
                 android:background="@drawable/layout_rounded_bg_yellow_10"
                 tools:text="Becoma a Healer"/>
         </LinearLayout>
diff --git a/Habitica/res/layout/activity_full_profile.xml b/Habitica/res/layout/activity_full_profile.xml
index 7e14d606a..fe543b7aa 100644
--- a/Habitica/res/layout/activity_full_profile.xml
+++ b/Habitica/res/layout/activity_full_profile.xml
@@ -103,7 +103,7 @@
                             android:layout_weight="1"
                             android:layout_height="wrap_content"
                             android:text="@string/joined"
-                            style="@style/Subheader1"/>
+                            style="@style/SubHeader1"/>
                         <TextView
                             android:id="@+id/joined_view"
                             android:layout_width="wrap_content"
@@ -120,7 +120,7 @@
                             android:layout_weight="1"
                             android:layout_height="wrap_content"
                             android:text="@string/last_login"
-                            style="@style/Subheader1"/>
+                            style="@style/SubHeader1"/>
                         <TextView
                             android:id="@+id/last_login_view"
                             android:layout_width="wrap_content"
@@ -136,7 +136,7 @@
                             android:layout_weight="1"
                             android:layout_height="wrap_content"
                             android:text="@string/total_checkins"
-                            style="@style/Subheader1"/>
+                            style="@style/SubHeader1"/>
                         <TextView
                             android:id="@+id/total_checkins_view"
                             android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/armoire_drop_rate_dialog.xml b/Habitica/res/layout/armoire_drop_rate_dialog.xml
index 9c6fc6b01..2410573f8 100644
--- a/Habitica/res/layout/armoire_drop_rate_dialog.xml
+++ b/Habitica/res/layout/armoire_drop_rate_dialog.xml
@@ -19,7 +19,7 @@
         android:layout_height="wrap_content"
         android:textColor="@color/text_primary"
         android:text="@string/armoire_rate_equipment_title"
-        style="@style/Subheader1" />
+        style="@style/SubHeader1" />
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -34,7 +34,7 @@
         android:layout_height="wrap_content"
         android:textColor="@color/text_primary"
         android:text="@string/armoire_rate_food_title"
-        style="@style/Subheader1" />
+        style="@style/SubHeader1" />
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -49,7 +49,7 @@
         android:layout_height="wrap_content"
         android:textColor="@color/text_primary"
         android:text="@string/armoire_rate_experience_title"
-        style="@style/Subheader1" />
+        style="@style/SubHeader1" />
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/dialog_insufficient_gems.xml b/Habitica/res/layout/dialog_insufficient_gems.xml
index 5d9029955..5672879bc 100644
--- a/Habitica/res/layout/dialog_insufficient_gems.xml
+++ b/Habitica/res/layout/dialog_insufficient_gems.xml
@@ -33,7 +33,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            style="@style/Subheader1"
+            style="@style/SubHeader1"
             tools:text="4 Gems"
             android:gravity="center"/>
         <Button
diff --git a/Habitica/res/layout/dialog_levelup_10.xml b/Habitica/res/layout/dialog_levelup_10.xml
index c5d7cfcb1..bdf132710 100644
--- a/Habitica/res/layout/dialog_levelup_10.xml
+++ b/Habitica/res/layout/dialog_levelup_10.xml
@@ -35,7 +35,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/levelup_title_10"
-        style="@style/Subheader1"
+        style="@style/SubHeader1"
         android:gravity="center_horizontal"
         android:textColor="@color/text_primary"
         android:layout_marginBottom="@dimen/spacing_medium"/>
diff --git a/Habitica/res/layout/dialog_purchase_shopitem_button.xml b/Habitica/res/layout/dialog_purchase_shopitem_button.xml
index 9fc92094e..71e560cf7 100644
--- a/Habitica/res/layout/dialog_purchase_shopitem_button.xml
+++ b/Habitica/res/layout/dialog_purchase_shopitem_button.xml
@@ -14,13 +14,13 @@
         android:layout_height="wrap_content"
         android:text="@string/reward_dialog_buy"
         android:textColor="@color/brand_300"
-        style="@style/Subheader1" />
+        style="@style/SubHeader1" />
     <com.habitrpg.common.habitica.views.CurrencyView
         android:id="@+id/priceLabel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         tools:text="10"
         tools:textColor="@color/green_10"
-        style="@style/Subheader1"
+        style="@style/SubHeader1"
         android:layout_marginStart="12dp"/>
 </LinearLayout>
diff --git a/Habitica/res/layout/dialog_task_filter.xml b/Habitica/res/layout/dialog_task_filter.xml
index 01cf4a1a3..5d0e84f52 100644
--- a/Habitica/res/layout/dialog_task_filter.xml
+++ b/Habitica/res/layout/dialog_task_filter.xml
@@ -14,7 +14,7 @@
         android:layout_marginBottom="@dimen/spacing_large">
 
         <TextView
-            style="@style/Subheader1"
+            style="@style/SubHeader1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/filters"
diff --git a/Habitica/res/layout/fragment_inbox.xml b/Habitica/res/layout/fragment_inbox.xml
index dbe77b4dc..128c2222b 100644
--- a/Habitica/res/layout/fragment_inbox.xml
+++ b/Habitica/res/layout/fragment_inbox.xml
@@ -25,7 +25,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/pms_disabled"
                 android:gravity="center"
-                style="@style/Subheader1"
+                style="@style/SubHeader1"
                 android:textColor="@color/text_primary"
                 android:layout_marginBottom="4dp"/>
             <TextView
diff --git a/Habitica/res/layout/fragment_promo_info.xml b/Habitica/res/layout/fragment_promo_info.xml
index 8914867f2..f24c4c7dd 100644
--- a/Habitica/res/layout/fragment_promo_info.xml
+++ b/Habitica/res/layout/fragment_promo_info.xml
@@ -65,7 +65,7 @@
                     android:id="@+id/promo_banner_duration_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    style="@style/Subheader1"/>
+                    style="@style/SubHeader1"/>
             </LinearLayout>
             <TextView
                 android:layout_width="wrap_content"
@@ -91,7 +91,7 @@
             android:id="@+id/prompt_button"
             android:layout_width="match_parent"
             android:layout_height="38dp"
-            style="@style/Subheader1"
+            style="@style/SubHeader1"
             android:gravity="center" />
 
         <TextView
diff --git a/Habitica/res/layout/fragment_subscription.xml b/Habitica/res/layout/fragment_subscription.xml
index e2850cc9a..52e85cc1e 100644
--- a/Habitica/res/layout/fragment_subscription.xml
+++ b/Habitica/res/layout/fragment_subscription.xml
@@ -62,7 +62,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:visibility="gone"
-                    style="@style/Subheader1"
+                    style="@style/SubHeader1"
                     android:textColor="@color/white"
                     android:layout_marginStart="84dp"
                     android:layout_marginEnd="84dp"
@@ -111,7 +111,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/subscribe_prompt"
                 android:gravity="center"
-                style="@style/Subheader1"
+                style="@style/SubHeader1"
                 app:dayTextColor="@color/text_brand"
                 app:nightTextColor="@color/gray_400"
                 android:lineSpacingExtra="4dp"
@@ -316,7 +316,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:gravity="center_horizontal"
-                    style="@style/Subheader1"
+                    style="@style/SubHeader1"
                     android:textColor="@color/text_brand"
                     android:text="@string/subscribe_options_title"
                     android:layout_marginBottom="20dp"/>
diff --git a/Habitica/res/layout/fragment_support_main.xml b/Habitica/res/layout/fragment_support_main.xml
index d01225e80..808b91cca 100644
--- a/Habitica/res/layout/fragment_support_main.xml
+++ b/Habitica/res/layout/fragment_support_main.xml
@@ -60,7 +60,7 @@
                 android:textColor="@color/white"
                 android:elevation="4dp"
                 android:textAllCaps="false"
-                style="@style/Subheader1"
+                style="@style/SubHeader1"
                 />
         </LinearLayout>
         <LinearLayout
@@ -110,7 +110,7 @@
                 android:textColor="@color/white"
                 android:elevation="4dp"
                 android:textAllCaps="false"
-                style="@style/Subheader1"
+                style="@style/SubHeader1"
                 />
         </LinearLayout>
         <LinearLayout
@@ -159,7 +159,7 @@
                 android:background="@drawable/support_info_lower_bg"
                 android:elevation="4dp"
                 android:textColor="@color/white"
-                style="@style/Subheader1"
+                style="@style/SubHeader1"
                 />
         </LinearLayout>
     </LinearLayout>
diff --git a/Habitica/res/layout/item_public_guild.xml b/Habitica/res/layout/item_public_guild.xml
index a0de039e1..51e26d2e2 100644
--- a/Habitica/res/layout/item_public_guild.xml
+++ b/Habitica/res/layout/item_public_guild.xml
@@ -12,7 +12,7 @@
 
     <TextView
         android:id="@+id/nameTextView"
-        style="@style/Subheader1"
+        style="@style/SubHeader1"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
diff --git a/Habitica/res/layout/item_user_guild.xml b/Habitica/res/layout/item_user_guild.xml
index 06422362f..c585be467 100644
--- a/Habitica/res/layout/item_user_guild.xml
+++ b/Habitica/res/layout/item_user_guild.xml
@@ -19,5 +19,5 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        style="@style/Subheader1"/>
+        style="@style/SubHeader1"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/menu_bottom_sheet.xml b/Habitica/res/layout/menu_bottom_sheet.xml
index 2f1b1fcb8..4ecf5e1b0 100644
--- a/Habitica/res/layout/menu_bottom_sheet.xml
+++ b/Habitica/res/layout/menu_bottom_sheet.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         tools:text="Title"
         android:gravity="center"
-        style="@style/Subheader1"/>
+        style="@style/SubHeader1"/>
     <com.habitrpg.common.habitica.views.PixelArtView
         android:id="@+id/icon_view"
         android:layout_width="@dimen/shopitem_image_size"
diff --git a/Habitica/res/layout/purchase_gem_view.xml b/Habitica/res/layout/purchase_gem_view.xml
index 8635a9a37..6d64ad279 100644
--- a/Habitica/res/layout/purchase_gem_view.xml
+++ b/Habitica/res/layout/purchase_gem_view.xml
@@ -60,7 +60,7 @@
         android:background="@drawable/purchase_button_background"
         android:textColor="@color/brand_400"
         android:gravity="center"
-        style="@style/Subheader1"
+        style="@style/SubHeader1"
         android:letterSpacing="0.02"
         android:layout_marginStart="@dimen/spacing_medium"
         android:layout_marginEnd="@dimen/spacing_medium"
diff --git a/Habitica/res/layout/skill_list_item.xml b/Habitica/res/layout/skill_list_item.xml
index 3a67f3eb7..353ceb064 100644
--- a/Habitica/res/layout/skill_list_item.xml
+++ b/Habitica/res/layout/skill_list_item.xml
@@ -40,7 +40,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 tools:text="Spell Name"
-                style="@style/Subheader1"/>
+                style="@style/SubHeader1"/>
 
             <TextView
                 android:id="@+id/skill_notes"
diff --git a/Habitica/res/layout/speechbubble.xml b/Habitica/res/layout/speechbubble.xml
index 51401e330..b67208d87 100644
--- a/Habitica/res/layout/speechbubble.xml
+++ b/Habitica/res/layout/speechbubble.xml
@@ -27,7 +27,7 @@
 
         <com.habitrpg.android.habitica.ui.views.Typewriter
             android:id="@+id/textView"
-            style="@style/Subheader1"
+            style="@style/SubHeader1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:text="@string/welcome_text" />
diff --git a/Habitica/res/values/styles.habitica.xml b/Habitica/res/values/styles.habitica.xml
index ae7dd070d..e6cdeeb0f 100644
--- a/Habitica/res/values/styles.habitica.xml
+++ b/Habitica/res/values/styles.habitica.xml
@@ -35,7 +35,7 @@
     </style>
 
     <!-- Subheader -->
-    <style name="Subheader1">
+    <style name="SubHeader1">
         <item name="android:fontFamily">@string/font_family_medium</item>
         <item name="android:textSize">16sp</item>
         <item name="android:textColor">?textColorSecondary</item>
diff --git a/common/src/main/res/values/colors.xml b/common/src/main/res/values/colors.xml
index e8f140bca..c4523e3ea 100644
--- a/common/src/main/res/values/colors.xml
+++ b/common/src/main/res/values/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="white">#ffffff</color>
-    <color name="black">#000000</color>
+    <color name="watch_white">#ffffff</color>
+    <color name="watch_black">#000000</color>
 
     <color name="brand_50">#36205D</color>
     <color name="brand_100">#432874</color>
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt
index 0299fa4ac..c6778bbe3 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt
@@ -80,21 +80,21 @@ class ApiClient @Inject constructor(
                 if (request.header("Cache-Control")?.isNotBlank() == true) {
                     return@addInterceptor chain.proceed(request)
                 }
-                var cacheContol = CacheControl.Builder()
-                cacheContol = if (request.method == "GET") {
+                var cacheControl = CacheControl.Builder()
+                cacheControl = if (request.method == "GET") {
                     if (hasNetwork(context)) {
-                        cacheContol.maxAge(5, TimeUnit.MINUTES)
+                        cacheControl.maxAge(5, TimeUnit.MINUTES)
                     } else {
-                        cacheContol.maxAge(1, TimeUnit.DAYS)
+                        cacheControl.maxAge(1, TimeUnit.DAYS)
                             .onlyIfCached()
                     }
                 } else {
-                    cacheContol.noCache()
+                    cacheControl.noCache()
                         .noStore()
                 }
                 chain.proceed(request.newBuilder().header(
                     "Cache-Control",
-                    cacheContol.build().toString()
+                    cacheControl.build().toString()
                     ).build())
             }
             .addNetworkInterceptor { chain ->
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/ChecklistItem.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/ChecklistItem.kt
index 4633bd7c2..77013df77 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/ChecklistItem.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/ChecklistItem.kt
@@ -14,12 +14,6 @@ open class ChecklistItem constructor(
 
     var position: Int = 0
 
-    constructor(item: ChecklistItem) : this() {
-        this.text = item.text
-        this.id = item.id
-        this.completed = item.completed
-    }
-
     override fun describeContents(): Int {
         return 0
     }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/RemindersItem.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/RemindersItem.kt
index 0f8ac2e4f..b8501b3b6 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/RemindersItem.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/RemindersItem.kt
@@ -3,13 +3,6 @@ package com.habitrpg.wearos.habitica.models.tasks
 import android.os.Parcel
 import android.os.Parcelable
 import com.squareup.moshi.JsonClass
-import java.time.Instant
-import java.time.LocalDateTime
-import java.time.ZoneId
-import java.time.ZonedDateTime
-import java.time.format.DateTimeFormatter
-import java.time.format.DateTimeFormatterBuilder
-import java.time.temporal.TemporalAccessor
 
 @JsonClass(generateAdapter = true)
 open class RemindersItem constructor() : Parcelable {
@@ -51,44 +44,4 @@ open class RemindersItem constructor() : Parcelable {
     override fun hashCode(): Int {
         return id?.hashCode() ?: 0
     }
-
-    fun getZonedDateTime(): ZonedDateTime? {
-        val formatter: DateTimeFormatter =
-            DateTimeFormatterBuilder().append(DateTimeFormatter.ISO_LOCAL_DATE)
-                .appendPattern("['T'][' ']")
-                .append(DateTimeFormatter.ISO_LOCAL_TIME)
-                .appendPattern("[XX]")
-                .toFormatter()
-
-        val parsed: TemporalAccessor = formatter.parseBest(
-            time,
-            ZonedDateTime::from, LocalDateTime::from
-        )
-        return if (parsed is ZonedDateTime) {
-            parsed
-        } else {
-            val defaultZone: ZoneId = ZoneId.of("UTC")
-            (parsed as LocalDateTime).atZone(defaultZone)
-        }
-    }
-
-    fun getLocalZonedDateTimeInstant(): Instant? {
-        val formatter: DateTimeFormatter =
-            DateTimeFormatterBuilder().append(DateTimeFormatter.ISO_LOCAL_DATE)
-                .appendPattern("['T'][' ']")
-                .append(DateTimeFormatter.ISO_LOCAL_TIME)
-                .appendPattern("[XX]")
-                .toFormatter()
-
-        val parsed: TemporalAccessor = formatter.parseBest(
-            time,
-            ZonedDateTime::from, LocalDateTime::from
-        )
-        return if (parsed is ZonedDateTime) {
-            parsed.withZoneSameLocal(ZoneId.systemDefault())?.toInstant()
-        } else {
-            val defaultZone: ZoneId = ZoneId.of("UTC")
-            (parsed as LocalDateTime).atZone(defaultZone).withZoneSameLocal(ZoneId.systemDefault())?.toInstant()
-        }
-    }
 }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/Task.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/Task.kt
index 5b948b20c..580d3cc04 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/Task.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/Task.kt
@@ -4,7 +4,6 @@ import android.os.Parcel
 import android.os.Parcelable
 import android.text.Spanned
 import com.habitrpg.android.habitica.R
-import com.habitrpg.common.habitica.helpers.MarkdownParser
 import com.habitrpg.common.habitica.models.tasks.Attribute
 import com.habitrpg.common.habitica.models.tasks.Frequency
 import com.habitrpg.common.habitica.models.tasks.TaskType
@@ -149,9 +148,6 @@ open class Task constructor(): Parcelable {
     val isDisplayedActive: Boolean
         get() = ((isDue == true && type == TaskType.DAILY) || type == TaskType.TODO) && !completed
 
-    val isChecklistDisplayActive: Boolean
-        get() = this.checklist?.size != this.completedChecklistCount
-
     fun getNextReminderOccurence(oldTime: String?): ZonedDateTime? {
         if (oldTime == null) {
             return null
@@ -191,39 +187,6 @@ open class Task constructor(): Parcelable {
             (parsed as LocalDateTime).atZone(defaultZone)
         }
     }
-
-    fun parseMarkdown() {
-        parsedText = MarkdownParser.parseMarkdown(text)
-        parsedNotes = MarkdownParser.parseMarkdown(notes)
-    }
-
-    fun markdownText(callback: (CharSequence) -> Unit): CharSequence {
-        if (this.parsedText != null) {
-            return this.parsedText ?: ""
-        }
-
-        MarkdownParser.parseMarkdownAsync(this.text) { parsedText ->
-            this.parsedText = parsedText
-            callback(parsedText)
-        }
-
-        return this.text
-    }
-
-    fun markdownNotes(callback: (CharSequence) -> Unit): CharSequence? {
-        if (parsedNotes != null) {
-            return parsedNotes
-        }
-
-        if (notes?.isNotEmpty() == true) {
-            MarkdownParser.parseMarkdownAsync(notes) { parsedText ->
-                parsedNotes = parsedText
-                callback(parsedText)
-            }
-        }
-        return notes
-    }
-
     override fun equals(other: Any?): Boolean {
         if (other == null) {
             return false
@@ -245,30 +208,36 @@ open class Task constructor(): Parcelable {
             priority != task.priority -> return true
             attribute != task.attribute && attribute != null -> return true
         }
-        if (type == TaskType.HABIT) {
-            return when {
-                up != task.up -> true
-                down != task.down -> true
-                frequency != task.frequency -> true
-                counterUp != task.counterUp -> true
-                counterDown != task.counterDown -> true
-                else -> false
+        when (type) {
+            TaskType.HABIT -> {
+                return when {
+                    up != task.up -> true
+                    down != task.down -> true
+                    frequency != task.frequency -> true
+                    counterUp != task.counterUp -> true
+                    counterDown != task.counterDown -> true
+                    else -> false
+                }
             }
-        } else if (type == TaskType.DAILY) {
-            return when {
-                startDate != task.startDate -> true
-                everyX != task.everyX -> true
-                frequency != task.frequency -> true
-                repeat != task.repeat -> true
-                streak != task.streak -> true
-                else -> false
+            TaskType.DAILY -> {
+                return when {
+                    startDate != task.startDate -> true
+                    everyX != task.everyX -> true
+                    frequency != task.frequency -> true
+                    repeat != task.repeat -> true
+                    streak != task.streak -> true
+                    else -> false
+                }
+            }
+            TaskType.TODO -> {
+                return dueDate != task.dueDate
+            }
+            TaskType.REWARD -> {
+                return value != task.value
+            }
+            else -> {
+                return false
             }
-        } else if (type == TaskType.TODO) {
-            return dueDate != task.dueDate
-        } else if (type == TaskType.REWARD) {
-            return value != task.value
-        } else {
-            return false
         }
     }
 
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/modules/AppModule.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/modules/AppModule.kt
index e2c2673c5..1a0e21233 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/modules/AppModule.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/modules/AppModule.kt
@@ -9,10 +9,10 @@ import com.habitrpg.common.habitica.helpers.AppTestingLevel
 import com.habitrpg.common.habitica.helpers.KeyHelper
 import com.habitrpg.shared.habitica.HLogger
 import com.habitrpg.wearos.habitica.data.ApiClient
-import com.habitrpg.wearos.habitica.data.AttributeAdapter
-import com.habitrpg.wearos.habitica.data.FrequencyAdapter
-import com.habitrpg.wearos.habitica.data.TaskTypeAdapter
-import com.habitrpg.wearos.habitica.data.customDateAdapter
+import com.habitrpg.wearos.habitica.util.AttributeAdapter
+import com.habitrpg.wearos.habitica.util.FrequencyAdapter
+import com.habitrpg.wearos.habitica.util.TaskTypeAdapter
+import com.habitrpg.wearos.habitica.util.customDateAdapter
 import com.habitrpg.wearos.habitica.models.tasks.WrappedTasklistAdapter
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt
index 22c8b880c..918503ef3 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt
@@ -26,7 +26,7 @@ abstract class BaseActivity<B: ViewBinding, VM: BaseViewModel> : ComponentActivi
     lateinit var loadingManager: LoadingManager
 
     val messageClient: MessageClient by lazy { Wearable.getMessageClient(this) }
-    val capabilityClient: CapabilityClient by lazy { Wearable.getCapabilityClient(this) }
+    private val capabilityClient: CapabilityClient by lazy { Wearable.getCapabilityClient(this) }
     companion object {
         var currentActivityClassName: String? = null
     }
@@ -76,6 +76,7 @@ abstract class BaseActivity<B: ViewBinding, VM: BaseViewModel> : ComponentActivi
 
     fun stopAnimatingProgress() {
         if (progressView != null) {
+            progressView?.stopAnimation()
             wrapperBinding.root.removeView(progressView)
             progressView = null
         } else {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/HabitDirectionActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/HabitDirectionActivity.kt
index 57c601ffc..865a9dff2 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/HabitDirectionActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/HabitDirectionActivity.kt
@@ -7,12 +7,12 @@ import androidx.activity.viewModels
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.databinding.ActivityHabitDirectionBinding
 import com.habitrpg.common.habitica.models.responses.TaskDirection
-import com.habitrpg.wearos.habitica.ui.viewmodels.HabitDrectionViewModel
+import com.habitrpg.wearos.habitica.ui.viewmodels.HabitDirectionViewModel
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
-class HabitDirectionActivity: BaseActivity<ActivityHabitDirectionBinding, HabitDrectionViewModel>() {
-        override val viewModel: HabitDrectionViewModel by viewModels()
+class HabitDirectionActivity: BaseActivity<ActivityHabitDirectionBinding, HabitDirectionViewModel>() {
+        override val viewModel: HabitDirectionViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         binding = ActivityHabitDirectionBinding.inflate(layoutInflater)
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt
index fef8bb62b..746aa6de7 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt
@@ -114,11 +114,11 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
                 openSettingsActivity()
             }
         )
-        viewModel.user.observe(this) {
-            adapter.title = it.profile?.name ?: ""
+        viewModel.user.observe(this) { user ->
+            adapter.title = user.profile?.name ?: ""
             adapter.notifyItemChanged(0)
             val index = adapter.data.indexOfFirst { it.identifier == "stats" }
-            adapter.data[index].detailText = getString(R.string.user_level, it.stats?.lvl ?: 0)
+            adapter.data[index].detailText = getString(R.string.user_level, user.stats?.lvl ?: 0)
             adapter.notifyItemChanged(index+1)
         }
         viewModel.taskCounts.observe(this) {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/StatsActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/StatsActivity.kt
index 0f39814d6..3332b620d 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/StatsActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/StatsActivity.kt
@@ -1,8 +1,9 @@
 package com.habitrpg.wearos.habitica.ui.activities
 
-import android.animation.ValueAnimator
 import android.os.Bundle
-import android.view.View.*
+import android.view.View.GONE
+import android.view.View.INVISIBLE
+import android.view.View.VISIBLE
 import androidx.activity.viewModels
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
@@ -11,10 +12,8 @@ import com.habitrpg.common.habitica.views.HabiticaIconsHelper
 import com.habitrpg.wearos.habitica.models.user.Stats
 import com.habitrpg.wearos.habitica.models.user.User
 import com.habitrpg.wearos.habitica.ui.viewmodels.StatsViewModel
-import com.habitrpg.wearos.habitica.ui.views.StatValue
 import dagger.hilt.android.AndroidEntryPoint
 
-
 @AndroidEntryPoint
 class StatsActivity : BaseActivity<ActivityStatsBinding, StatsViewModel>() {
     override val viewModel: StatsViewModel by viewModels()
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt
index 86b0c11ba..210aadf95 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt
@@ -89,8 +89,8 @@ class TaskListActivity : BaseActivity<ActivityTasklistBinding, TaskListViewModel
                     ?.let { TaskDirection.valueOf(it) }
                     ?: TaskDirection.UP
 
-                taskToScore?.let {
-                    viewModel.scoreTask(it, direction) {
+                taskToScore?.let { task ->
+                    viewModel.scoreTask(task, direction) {
                         if (it != null) {
                             showTaskScoringResult(it)
                         }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt
index 6b51560ec..23b21327f 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt
@@ -8,7 +8,7 @@ import com.habitrpg.wearos.habitica.models.tasks.Task
 import com.habitrpg.wearos.habitica.ui.viewHolders.HeaderSectionViewHolder
 import com.habitrpg.wearos.habitica.ui.viewHolders.tasks.TaskViewHolder
 
-open class TaskListAdapter(): RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+open class TaskListAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     var title: String = ""
     var onTaskScore: ((Task) -> Unit)? = null
     var onTaskTapped:((Task) -> Unit)? = null
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/CheckedTaskViewHolder.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/CheckedTaskViewHolder.kt
index 54eaadc31..863093323 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/CheckedTaskViewHolder.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/CheckedTaskViewHolder.kt
@@ -13,7 +13,7 @@ abstract class CheckedTaskViewHolder(itemView: View) : TaskViewHolder(itemView)
     abstract val checkboxWrapper: ViewGroup
 
     override fun bind(data: Task) {
-        checkboxWrapper.setOnClickListener { _ ->
+        checkboxWrapper.setOnClickListener {
             onTaskScore?.invoke()
         }
         super.bind(data)
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/RewardViewHolder.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/RewardViewHolder.kt
index aa081eaa3..2b965782c 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/RewardViewHolder.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/RewardViewHolder.kt
@@ -1,17 +1,11 @@
 package com.habitrpg.wearos.habitica.ui.viewHolders.tasks
 
 import android.view.View
-import android.widget.TextView
 import com.habitrpg.android.habitica.databinding.RowRewardBinding
-import com.habitrpg.wearos.habitica.models.tasks.Task
 import com.habitrpg.wearos.habitica.ui.views.TaskTextView
 
 class RewardViewHolder(itemView: View) : TaskViewHolder(itemView) {
     private val binding = RowRewardBinding.bind(itemView)
     override val titleView: TaskTextView
         get() = binding.title
-
-    override fun bind(data: Task) {
-        super.bind(data)
-    }
 }
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/ToDoViewHolder.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/ToDoViewHolder.kt
index 7ef4f8594..fded35c10 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/ToDoViewHolder.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/ToDoViewHolder.kt
@@ -3,7 +3,6 @@ package com.habitrpg.wearos.habitica.ui.viewHolders.tasks
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import android.widget.TextView
 import com.habitrpg.android.habitica.databinding.RowTodoBinding
 import com.habitrpg.wearos.habitica.ui.views.TaskTextView
 
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/HabitDrectionViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/HabitDirectionViewModel.kt
similarity index 62%
rename from wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/HabitDrectionViewModel.kt
rename to wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/HabitDirectionViewModel.kt
index f55fb7930..146db1009 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/HabitDrectionViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/HabitDirectionViewModel.kt
@@ -2,19 +2,15 @@ package com.habitrpg.wearos.habitica.ui.viewmodels
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.asLiveData
-import androidx.lifecycle.viewModelScope
-import com.habitrpg.common.habitica.models.responses.TaskDirection
-import com.habitrpg.common.habitica.models.responses.TaskScoringResult
 import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
 import com.habitrpg.wearos.habitica.data.repositories.UserRepository
 import com.habitrpg.wearos.habitica.managers.LoadingManager
 import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
-class HabitDrectionViewModel @Inject constructor(
+class HabitDirectionViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     userRepository: UserRepository,
     taskRepository: TaskRepository,
@@ -24,11 +20,4 @@ class HabitDrectionViewModel @Inject constructor(
     val task = taskRepository.getTask(taskID).asLiveData()
 
     val user = userRepository.getUser().asLiveData()
-
-    fun scoreTask(direction: TaskDirection, onResult: (TaskScoringResult?) -> Unit) {
-        viewModelScope.launch(exceptionBuilder.userFacing(this)) {
-            val result = task.value?.let { taskRepository.scoreTask(user.value, it, direction) }
-            onResult(result)
-        }
-    }
 }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt
index 957801b6a..fd7c77694 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt
@@ -12,7 +12,6 @@ import com.google.android.gms.auth.UserRecoverableAuthException
 import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions
-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.UserRecoverableException
@@ -66,10 +65,9 @@ class LoginViewModel @Inject constructor(userRepository: UserRepository,
         viewModelScope.launch(exceptionBuilder.userFacing(this)) {
             val account = async {
                 try {
-                    val account: GoogleSignInAccount = task.getResult(
+                    return@async task.getResult(
                         ApiException::class.java
                     )
-                    return@async account
                 } catch (e: IOException) {
                     return@async null
                 } catch (e: GoogleAuthException) {
@@ -116,23 +114,7 @@ class LoginViewModel @Inject constructor(userRepository: UserRepository,
         }
     }
 
-    private fun checkPlayServices(activity: Activity): Boolean {
-        val googleAPI = GoogleApiAvailability.getInstance()
-        val result = googleAPI.isGooglePlayServicesAvailable(activity)
-        if (result != ConnectionResult.SUCCESS) {
-            if (googleAPI.isUserResolvableError(result)) {
-                googleAPI.getErrorDialog(
-                    activity, result,
-                    PLAY_SERVICES_RESOLUTION_REQUEST
-                )?.show()
-            }
-            return false
-        }
-
-        return true
-    }
-
-    suspend fun handleAuthResponse(userAuthResponse: UserAuthResponse?) {
+    private suspend fun handleAuthResponse(userAuthResponse: UserAuthResponse?) {
         if (userAuthResponse == null) return
         try {
             saveTokens(userAuthResponse.apiToken, userAuthResponse.id)
@@ -174,6 +156,5 @@ class LoginViewModel @Inject constructor(userRepository: UserRepository,
 
     companion object {
         private const val REQUEST_CODE_RECOVER_FROM_PLAY_SERVICES_ERROR = 1001
-        private const val PLAY_SERVICES_RESOLUTION_REQUEST = 9000
     }
 }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/CircularProgressView.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/CircularProgressView.kt
index e8bb6bc15..4c32ccc0e 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/CircularProgressView.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/CircularProgressView.kt
@@ -20,9 +20,9 @@ class CircularProgressView(
     private val ovalSpace = RectF()
     private var ovalSize = (resources.displayMetrics.heightPixels / 2)
     private var currentPercentage = 55f
-    private var PERCENTAGE_DIVIDER = 180f
-    private val ARC_FULL_ROTATION_DEGREE = 360
-    val attributes = context?.theme?.obtainStyledAttributes(
+    private var percentageDivider = 180f
+    private val arcFullRotationDegree = 360
+    private val attributes = context?.theme?.obtainStyledAttributes(
         attrs,
         R.styleable.CircularProgressView,
         0, 0
@@ -86,13 +86,9 @@ class CircularProgressView(
         canvas.drawArc(ovalSpace, 270f, percentageToFill, false, fillArcPaint)
     }
 
-    fun setBarColor(barColor: Int) {
-        fillArcColor = context?.resources?.getColor(barColor, null) ?: backgroundArcColor
-    }
-
     fun setPercentageValues(currentValue: Float, maxValue: Float) {
         currentPercentage = currentValue
-        PERCENTAGE_DIVIDER = maxValue
+        percentageDivider = maxValue
     }
 
     fun animateProgress(startValue: Float = 0f, animationDuration: Long = 1000) {
@@ -100,7 +96,7 @@ class CircularProgressView(
         val valuesHolder = PropertyValuesHolder.ofFloat(
             PERCENTAGE_VALUE_HOLDER,
             startValue,
-            currentPercent.toFloat()
+            currentPercent
         )
 
         val animator = ValueAnimator().apply {
@@ -121,6 +117,6 @@ class CircularProgressView(
         const val PERCENTAGE_VALUE_HOLDER = "percentage"
     }
 
-    private fun getCurrentAngleToFill() = if(currentPercentage > 0) {(ARC_FULL_ROTATION_DEGREE.toFloat() * (currentPercentage / PERCENTAGE_DIVIDER))} else {1f}
+    private fun getCurrentAngleToFill() = if(currentPercentage > 0) {(arcFullRotationDegree.toFloat() * (currentPercentage / percentageDivider))} else {1f}
 }
 
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabitDirectionPickerButton.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabitDirectionPickerButton.kt
index a425ccc20..392a98231 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabitDirectionPickerButton.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabitDirectionPickerButton.kt
@@ -25,7 +25,7 @@ class HabitDirectionPickerButton @JvmOverloads constructor(
 
     var mainTaskColor: Int = ContextCompat.getColor(context, R.color.watch_gray_200)
     var darkerTaskColor: Int = ContextCompat.getColor(context, R.color.watch_gray_10)
-    var iconColor: Int = ContextCompat.getColor(context, R.color.white)
+    var iconColor: Int = ContextCompat.getColor(context, R.color.watch_white)
 
     private val radius = 15.dpToPx(context)
 
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/StatValue.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/StatValue.kt
index e78c6d991..09c03546a 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/StatValue.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/StatValue.kt
@@ -9,9 +9,6 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import com.habitrpg.android.habitica.databinding.StatValueLayoutBinding
 import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.common.habitica.helpers.NumberAbbreviator
-import kotlin.math.abs
-import kotlin.math.ln
-import kotlin.math.pow
 
 class StatValue @JvmOverloads constructor(
     context: Context,
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TaskTextView.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TaskTextView.kt
index a6a691751..41880828c 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TaskTextView.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TaskTextView.kt
@@ -70,5 +70,4 @@ open class EllipsizedTextView @JvmOverloads constructor(context: Context, attrs:
 
 class TaskTextView @JvmOverloads constructor(
     context: Context, attrs: AttributeSet? = null
-) : EllipsizedTextView(context, attrs) {
-}
\ No newline at end of file
+) : EllipsizedTextView(context, attrs)
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/util/DateJSONAdapter.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/util/DateJSONAdapter.kt
index 572f9590d..43e83b246 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/util/DateJSONAdapter.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/util/DateJSONAdapter.kt
@@ -1,4 +1,4 @@
-package com.habitrpg.wearos.habitica.data
+package com.habitrpg.wearos.habitica.util
 
 import android.os.Build
 import com.habitrpg.common.habitica.models.tasks.Attribute
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/util/HabiticaScrollingLayoutCallback.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/util/HabiticaScrollingLayoutCallback.kt
index 705a6014d..c0259a656 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/util/HabiticaScrollingLayoutCallback.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/util/HabiticaScrollingLayoutCallback.kt
@@ -27,7 +27,7 @@ class HabiticaScrollingLayoutCallback : WearableLinearLayoutManager.LayoutCallba
                 return
             }
             // Adjust to the maximum scale
-            progressToCenter = Math.min(progressToCenter * 1.5f, MAX_ICON_PROGRESS)
+            progressToCenter = (progressToCenter * 1.5f).coerceAtMost(MAX_ICON_PROGRESS)
             val scale = 1 - progressToCenter
 
             scaleX = scale
diff --git a/wearos/src/main/res/layout/activity_faint.xml b/wearos/src/main/res/layout/activity_faint.xml
index b92303049..eda15d562 100644
--- a/wearos/src/main/res/layout/activity_faint.xml
+++ b/wearos/src/main/res/layout/activity_faint.xml
@@ -21,14 +21,15 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/broken_heart"
+            android:importantForAccessibility="no"
             android:layout_marginBottom="@dimen/spacing_medium"/>
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/you_ran_out_of_hp"
             android:gravity="center"
-            android:textColor="@color/white"
-            style="@style/Text.Subheader1"/>
+            android:textColor="@color/watch_white"
+            style="@style/Text.SubHeader1"/>
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/wearos/src/main/res/layout/activity_habit_direction.xml b/wearos/src/main/res/layout/activity_habit_direction.xml
index 51a5f94f2..8b68214f1 100644
--- a/wearos/src/main/res/layout/activity_habit_direction.xml
+++ b/wearos/src/main/res/layout/activity_habit_direction.xml
@@ -31,7 +31,7 @@
         android:gravity="center"
         android:textSize="16sp"
         android:maxLines="2"
-        android:textColor="@color/white"/>
+        android:textColor="@color/watch_white"/>
     <Space
         android:layout_width="1dp"
         android:layout_height="0dp"
diff --git a/wearos/src/main/res/layout/activity_login.xml b/wearos/src/main/res/layout/activity_login.xml
index 800b417ac..f437ca18a 100644
--- a/wearos/src/main/res/layout/activity_login.xml
+++ b/wearos/src/main/res/layout/activity_login.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.habitrpg.wearos.habitica.ui.views.HabiticaScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -15,13 +14,14 @@
                 android:layout_width="16dp"
                 android:layout_height="16dp"
                 android:src="@drawable/ic_gryphon_white"
+                android:importantForAccessibility="no"
                 android:layout_marginBottom="@dimen/spacing_medium"/>
             <TextView
                 android:id="@+id/title_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                style="@style/Text.Subheader1"
-                android:textColor="@color/white"
+                style="@style/Text.SubHeader1"
+                android:textColor="@color/watch_white"
                 android:text="@string/sign_in"
                 android:layout_marginBottom="@dimen/spacing_large"/>
             <TextView
@@ -31,7 +31,7 @@
                 android:gravity="center"
                 android:text="@string/sign_in_description"
                 style="@style/Text.Body2"
-                android:textColor="@color/white"
+                android:textColor="@color/watch_white"
                 android:layout_marginBottom="18dp"/>
             <Button
                 android:id="@+id/sign_in_on_phone_button"
@@ -95,6 +95,7 @@
                 android:paddingHorizontal="16dp"
                 android:autofillHints="password"
                 android:textColorHint="@color/watch_gray_200"
+                android:inputType="textPassword"
                 android:textSize="14sp"
                 android:layout_marginBottom="@dimen/spacing_small"/>
             <Button
diff --git a/wearos/src/main/res/layout/activity_rya.xml b/wearos/src/main/res/layout/activity_rya.xml
index 9b608c1d1..d194aa98d 100644
--- a/wearos/src/main/res/layout/activity_rya.xml
+++ b/wearos/src/main/res/layout/activity_rya.xml
@@ -25,8 +25,8 @@
             android:layout_height="wrap_content"
             android:text="@string/rya_description"
             android:gravity="center"
-            android:textColor="@color/white"
-            style="@style/Text.Subheader1"
+            android:textColor="@color/watch_white"
+            style="@style/Text.SubHeader1"
             android:layout_marginBottom="@dimen/spacing_large"/>
         <Button
             android:id="@+id/rya_button"
diff --git a/wearos/src/main/res/layout/activity_settings.xml b/wearos/src/main/res/layout/activity_settings.xml
index e8fc6bed9..07afd292e 100644
--- a/wearos/src/main/res/layout/activity_settings.xml
+++ b/wearos/src/main/res/layout/activity_settings.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.activities.MainActivity"
+    tools:context="com.habitrpg.wearos.habitica.ui.activities.SettingsActivity"
     tools:deviceIds="wear">
 
 </com.habitrpg.wearos.habitica.ui.views.HabiticaRecyclerView>
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/activity_stats.xml b/wearos/src/main/res/layout/activity_stats.xml
index 6bfbcf571..faaf344b6 100644
--- a/wearos/src/main/res/layout/activity_stats.xml
+++ b/wearos/src/main/res/layout/activity_stats.xml
@@ -10,6 +10,7 @@
         android:layout_height="wrap_content"
         android:src="@drawable/icon_stats"
         android:layout_centerInParent="true"
+        android:importantForAccessibility="no"
         />
 
     <com.habitrpg.wearos.habitica.ui.views.CircularProgressView
diff --git a/wearos/src/main/res/layout/activity_task_detail.xml b/wearos/src/main/res/layout/activity_task_detail.xml
index f55d1cda2..3093f88f8 100644
--- a/wearos/src/main/res/layout/activity_task_detail.xml
+++ b/wearos/src/main/res/layout/activity_task_detail.xml
@@ -18,8 +18,8 @@
                 android:id="@+id/task_text_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                style="@style/Text.Subheader1"
-                android:textColor="@color/white"
+                style="@style/Text.SubHeader1"
+                android:textColor="@color/watch_white"
                 android:gravity="center"
                 android:layout_marginBottom="12dp"/>
             <TextView
diff --git a/wearos/src/main/res/layout/activity_task_form.xml b/wearos/src/main/res/layout/activity_task_form.xml
index 39d77a80e..2e6172b55 100644
--- a/wearos/src/main/res/layout/activity_task_form.xml
+++ b/wearos/src/main/res/layout/activity_task_form.xml
@@ -23,7 +23,7 @@
                     android:id="@+id/confirmation_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    style="@style/Text.Subheader1"
+                    style="@style/Text.SubHeader1"
                     android:textSize="14sp"
                     android:textColor="@color/gray_200"
                     />
@@ -33,7 +33,7 @@
                     android:layout_height="wrap_content"
                     style="@style/Text.Body1"
                     android:textSize="14sp"
-                    android:textColor="@color/white"
+                    android:textColor="@color/watch_white"
                     />
                 <Button
                     android:id="@+id/save_button"
@@ -95,7 +95,7 @@
                         style="@style/Chip.NoPadding"
                         android:gravity="start|center_vertical"
                         android:paddingHorizontal="20dp"
-                        android:textColor="@color/white"
+                        android:textColor="@color/watch_white"
                         android:fontFamily="sans-serif-medium"
                         android:textSize="14sp"
                         android:text="@string/todo" />
@@ -106,7 +106,7 @@
                         style="@style/Chip.NoPadding"
                         android:gravity="start|center_vertical"
                         android:paddingHorizontal="20dp"
-                        android:textColor="@color/white"
+                        android:textColor="@color/watch_white"
                         android:fontFamily="sans-serif-medium"
                         android:textSize="14sp"
                         android:text="@string/daily" />
@@ -117,7 +117,7 @@
                         style="@style/Chip.NoPadding"
                         android:gravity="start|center_vertical"
                         android:paddingHorizontal="20dp"
-                        android:textColor="@color/white"
+                        android:textColor="@color/watch_white"
                         android:fontFamily="sans-serif-medium"
                         android:textSize="14sp"
                         android:text="@string/habit" />
diff --git a/wearos/src/main/res/layout/button_add_task.xml b/wearos/src/main/res/layout/button_add_task.xml
index 246fd8c21..e498fa509 100644
--- a/wearos/src/main/res/layout/button_add_task.xml
+++ b/wearos/src/main/res/layout/button_add_task.xml
@@ -10,5 +10,6 @@
         android:layout_height="wrap_content"
         android:src="@drawable/icon_plus"
         android:layout_gravity="center"
+        android:importantForAccessibility="no"
         />
 </merge>
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/logout_layout.xml b/wearos/src/main/res/layout/logout_layout.xml
index fbd0a7f17..bc003b454 100644
--- a/wearos/src/main/res/layout/logout_layout.xml
+++ b/wearos/src/main/res/layout/logout_layout.xml
@@ -17,7 +17,7 @@
             android:textSize="18sp"
             android:text="@string/log_out_of_habitica"
             android:fontFamily="sans-serif-medium"
-            android:textColor="@color/white"
+            android:textColor="@color/watch_white"
             android:layout_marginBottom="18dp"/>
 
         <Button
diff --git a/wearos/src/main/res/layout/row_daily.xml b/wearos/src/main/res/layout/row_daily.xml
index ca97dc8c5..3eaced68a 100644
--- a/wearos/src/main/res/layout/row_daily.xml
+++ b/wearos/src/main/res/layout/row_daily.xml
@@ -34,7 +34,7 @@
             android:maxLines="2"
             android:ellipsize="end"
             tools:text="Task Title that is long and wraps and"
-            android:textColor="@color/white"
+            android:textColor="@color/watch_white"
             style="@style/Text.Body1"/>
         </LinearLayout>
     </LinearLayout>
diff --git a/wearos/src/main/res/layout/row_footer.xml b/wearos/src/main/res/layout/row_footer.xml
index 1c0e7523b..7ecfef330 100644
--- a/wearos/src/main/res/layout/row_footer.xml
+++ b/wearos/src/main/res/layout/row_footer.xml
@@ -10,6 +10,7 @@
         android:layout_above="@id/text_view"
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="2dp"
+        android:importantForAccessibility="no"
         android:src="@mipmap/ic_launcher" />
 
     <TextView
diff --git a/wearos/src/main/res/layout/row_habit.xml b/wearos/src/main/res/layout/row_habit.xml
index 391dce6ea..1b878f9af 100644
--- a/wearos/src/main/res/layout/row_habit.xml
+++ b/wearos/src/main/res/layout/row_habit.xml
@@ -32,7 +32,7 @@
                 android:maxLines="2"
                 android:ellipsize="end"
                 tools:text="Task Title"
-                android:textColor="@color/white"
+                android:textColor="@color/watch_white"
                 style="@style/Text.Body2"/>
         </LinearLayout>
     </LinearLayout>
diff --git a/wearos/src/main/res/layout/row_header.xml b/wearos/src/main/res/layout/row_header.xml
index a1490e8f6..edd234235 100644
--- a/wearos/src/main/res/layout/row_header.xml
+++ b/wearos/src/main/res/layout/row_header.xml
@@ -12,5 +12,5 @@
         android:layout_gravity="center"
         android:textColor="@color/watch_purple_200"
         tools:text="Header Text"
-        style="@style/Text.Subheader1"/>
+        style="@style/Text.SubHeader1"/>
 </FrameLayout>
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/row_hub.xml b/wearos/src/main/res/layout/row_hub.xml
index 34d6035ee..a36f68429 100644
--- a/wearos/src/main/res/layout/row_hub.xml
+++ b/wearos/src/main/res/layout/row_hub.xml
@@ -21,8 +21,8 @@
         android:layout_width="0dp"
         android:layout_weight="1"
         android:layout_height="wrap_content"
-        android:textColor="@color/white"
-        style="@style/Text.Subheader1"/>
+        android:textColor="@color/watch_white"
+        style="@style/Text.SubHeader1"/>
         <TextView
             android:id="@+id/detail_view"
             android:layout_width="wrap_content"
diff --git a/wearos/src/main/res/layout/row_reward.xml b/wearos/src/main/res/layout/row_reward.xml
index 2016d4f0c..6f602e0a6 100644
--- a/wearos/src/main/res/layout/row_reward.xml
+++ b/wearos/src/main/res/layout/row_reward.xml
@@ -14,7 +14,7 @@
             android:maxLines="2"
             android:ellipsize="end"
             tools:text="Task Title"
-            android:textColor="@color/white"
+            android:textColor="@color/watch_white"
             style="@style/Text.Body1"/>
     </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/row_settings.xml b/wearos/src/main/res/layout/row_settings.xml
index cbcad5dfb..ed906b849 100644
--- a/wearos/src/main/res/layout/row_settings.xml
+++ b/wearos/src/main/res/layout/row_settings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout 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"
     android:orientation="vertical"
     android:layout_width="match_parent"
@@ -17,7 +16,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             tools:text="Settings text"
-            android:textColor="@color/white"
+            android:textColor="@color/watch_white"
             style="@style/Text.Body1"/>
         <Space
             android:layout_width="0dp"
diff --git a/wearos/src/main/res/layout/row_todo.xml b/wearos/src/main/res/layout/row_todo.xml
index 7d87f2426..a5a9dc7ff 100644
--- a/wearos/src/main/res/layout/row_todo.xml
+++ b/wearos/src/main/res/layout/row_todo.xml
@@ -33,7 +33,7 @@
                 android:maxLines="2"
                 android:ellipsize="end"
                 tools:text="Task Title"
-                android:textColor="@color/white"
+                android:textColor="@color/watch_white"
                 style="@style/Text.Body2"/>
         </LinearLayout>
     </LinearLayout>
diff --git a/wearos/src/main/res/layout/stat_value_layout.xml b/wearos/src/main/res/layout/stat_value_layout.xml
index 1a592682a..d4d5e6839 100644
--- a/wearos/src/main/res/layout/stat_value_layout.xml
+++ b/wearos/src/main/res/layout/stat_value_layout.xml
@@ -5,6 +5,7 @@
     android:layout_width="wrap_content"
     android:layout_height="30dp"
     android:paddingStart="16dp"
+    android:paddingEnd="0dp"
     tools:parentTag="com.habitrpg.wearos.habitica.ui.views.StatValue">
 
     <View
@@ -24,6 +25,7 @@
         android:layout_height="17dp"
         android:layout_marginBottom="8dp"
         android:layout_marginEnd="6dp"
+        android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="@+id/current_value"
         app:layout_constraintEnd_toStartOf="@+id/current_value"
         app:layout_constraintTop_toTopOf="parent" />
@@ -38,7 +40,7 @@
         android:autoSizeStepGranularity="2sp"
         android:autoSizeTextType="uniform"
         android:fontFamily="@font/press_start_reg"
-        android:text="00"
+        tools:text="00"
         android:textSize="16sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@+id/view"
@@ -53,8 +55,8 @@
         android:autoSizeMinTextSize="4sp"
         android:autoSizeTextType="uniform"
         android:fontFamily="@font/press_start_reg"
-        android:text="/00"
-        android:textColor="@color/white"
+        tools:text="/00"
+        android:textColor="@color/watch_white"
         android:textSize="6sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/view"
diff --git a/wearos/src/main/res/layout/task_reward_chip.xml b/wearos/src/main/res/layout/task_reward_chip.xml
index c6cb51cf7..aaed9fa64 100644
--- a/wearos/src/main/res/layout/task_reward_chip.xml
+++ b/wearos/src/main/res/layout/task_reward_chip.xml
@@ -11,7 +11,7 @@
     android:layout_height="wrap_content"
     android:fontFamily="sans-serif-medium"
     android:textSize="16sp"
-    android:textColor="@color/black"/>
+    android:textColor="@color/watch_black"/>
     <ImageView
         android:id="@+id/icon_view"
         android:layout_width="wrap_content"
@@ -19,6 +19,7 @@
         android:scaleType="center"
         android:layout_marginStart="6dp"
         android:layout_marginEnd="0dp"
+        android:importantForAccessibility="no"
         android:layout_gravity="center"/>
 
 </merge>
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/task_reward_drop.xml b/wearos/src/main/res/layout/task_reward_drop.xml
index 25a5c9a1b..93be993e9 100644
--- a/wearos/src/main/res/layout/task_reward_drop.xml
+++ b/wearos/src/main/res/layout/task_reward_drop.xml
@@ -8,7 +8,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="12sp"
-        android:textColor="@color/white"
+        android:textColor="@color/watch_white"
         android:text="@string/you_found"/>
     <TextView
         android:id="@+id/text_view"
@@ -17,7 +17,7 @@
         android:fontFamily="sans-serif-medium"
         android:textSize="14sp"
         android:gravity="center"
-        android:textColor="@color/white"
+        android:textColor="@color/watch_white"
         />
     <com.habitrpg.common.habitica.views.PixelArtView
         android:id="@+id/image_view"
diff --git a/wearos/src/main/res/values/styles.xml b/wearos/src/main/res/values/styles.xml
index 50d8eacd2..fc67faee8 100644
--- a/wearos/src/main/res/values/styles.xml
+++ b/wearos/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="HabiticaAppTheme" parent="@android:style/Theme.DeviceDefault">
-        <item name="android:windowBackground">@color/black</item>
+        <item name="android:windowBackground">@color/watch_black</item>
     </style>
     <style name="Chip">
         <item name="android:layout_marginVertical">@dimen/row_spacing</item>
@@ -23,7 +23,7 @@
         <item name="android:paddingVertical">@dimen/row_padding_vertical</item>
         <item name="android:background">@drawable/row_background</item>
         <item name="android:textSize">14sp</item>
-        <item name="android:textColor">@color/white</item>
+        <item name="android:textColor">@color/watch_white</item>
         <item name="fontFamily">sans-serif-medium</item>
         <item name="android:gravity">start|center_vertical</item>
         <item name="android:minHeight">52dp</item>
@@ -40,22 +40,22 @@
 
     <style name="ChipButton.Purple" parent="ChipButton">
         <item name="android:backgroundTint">@color/watch_purple_100</item>
-        <item name="android:textColor">@color/black</item>
+        <item name="android:textColor">@color/watch_black</item>
     </style>
 
     <style name="ChipButton.Red" parent="ChipButton">
         <item name="android:backgroundTint">@color/watch_red_200</item>
-        <item name="android:textColor">@color/black</item>
+        <item name="android:textColor">@color/watch_black</item>
     </style>
 
     <style name="ChipButton.Small.Red" parent="ChipButton.Small">
         <item name="android:backgroundTint">@color/watch_red_200</item>
-        <item name="android:textColor">@color/black</item>
+        <item name="android:textColor">@color/watch_black</item>
     </style>
 
     <style name="Text" />
 
-    <style name="Text.Subheader1">
+    <style name="Text.SubHeader1">
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textSize">16sp</item>
     </style>

From 9be62f7851fb00f920e3b8651ac92b45e9e8a485 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 30 Jun 2022 12:53:54 +0200
Subject: [PATCH 03/39] Optimize icons and stuff

---
 Habitica/proguard-rules.pro                   |  15 ------------
 Habitica/res/layout/activity_armoire.xml      |   2 +-
 .../res/layout/activity_gift_subscription.xml |   2 +-
 Habitica/res/layout/ad_button.xml             |   2 +-
 Habitica/res/layout/autocomplete_username.xml |   2 +-
 Habitica/res/layout/chat_item.xml             |   2 +-
 .../customization_grid_background_item.xml    |   2 +-
 .../res/layout/customization_grid_item.xml    |   2 +-
 .../layout/customization_section_footer.xml   |   2 +-
 .../res/layout/dialog_hatch_pet_button.xml    |   2 +-
 .../dialog_purchase_shopitem_button.xml       |   2 +-
 .../res/layout/fragment_challenge_detail.xml  |   2 +-
 .../res/layout/fragment_gift_gem_balance.xml  |   2 +-
 .../res/layout/fragment_gift_gem_purchase.xml |   2 +-
 Habitica/res/layout/fragment_guild_detail.xml |   2 +-
 Habitica/res/layout/item_inbox_overview.xml   |   2 +-
 .../res/layout/menu_bottom_sheet_item.xml     |   2 +-
 Habitica/res/layout/party_member.xml          |   2 +-
 Habitica/res/layout/row_shopitem.xml          |   2 +-
 .../res/layout/tavern_chat_intro_item.xml     |   2 +-
 .../habitica/HabiticaBaseApplication.kt       |   2 +-
 .../habitica/interactors/LevelUpUseCase.kt    |   2 +-
 .../habitica/interactors/NotifyUserUseCase.kt |   2 +-
 .../habitica/ui/AvatarWithBarsViewModel.kt    |   2 +-
 .../android/habitica/ui/ItemDetailDialog.kt   |   2 +-
 .../ui/activities/ChallengeFormActivity.kt    |   3 +--
 .../ui/activities/ClassSelectionActivity.kt   |   2 +-
 .../habitica/ui/activities/DeathActivity.kt   |   2 +-
 .../activities/FixCharacterValuesActivity.kt  |   4 +--
 .../ui/activities/GiftGemsActivity.kt         |   2 +-
 .../ui/activities/VerifyUsernameActivity.kt   |   2 +-
 ...stomizationEquipmentRecyclerViewAdapter.kt |   5 ++--
 .../ui/adapter/SkillsRecyclerViewAdapter.kt   |   2 +-
 .../inventory/EquipmentRecyclerViewAdapter.kt |   2 +-
 .../inventory/HabiticaClassArrayAdapter.kt    |   2 +-
 .../social/ChallengesListViewAdapter.kt       |   2 +-
 .../ui/adapter/social/GuildListAdapter.kt     |   2 +-
 .../RealmBaseTasksRecyclerViewAdapter.kt      |   2 +-
 .../habitica/ui/fragments/StatsFragment.kt    |   2 +-
 .../ui/fragments/setup/TaskSetupFragment.kt   |   2 +-
 .../ui/fragments/setup/WelcomeFragment.kt     |   2 +-
 .../ui/fragments/skills/SkillsFragment.kt     |   2 +-
 .../fragments/social/InboxOverviewFragment.kt |   2 +-
 .../fragments/social/TavernDetailFragment.kt  |   2 +-
 .../challenges/ChallengeDetailFragment.kt     |   2 +-
 .../social/guilds/GuildDetailFragment.kt      |   4 +--
 .../fragments/support/FAQOverviewFragment.kt  |  23 ++++++++++++------
 .../tasks/TaskRecyclerViewFragment.kt         |   2 +-
 .../ui/helpers/AutocompleteAdapter.kt         |   2 +-
 .../ui/viewHolders/ChatRecyclerViewHolder.kt  |   2 +-
 .../ui/viewHolders/GroupMemberViewHolder.kt   |   2 +-
 .../ui/viewHolders/ShopItemViewHolder.kt      |   2 +-
 .../ui/viewHolders/tasks/RewardViewHolder.kt  |   2 +-
 .../ui/views/CollapsibleSectionView.kt        |   1 -
 .../habitica/ui}/views/CurrencyView.kt        |  10 ++++----
 .../habitica/ui/views/CurrencyViews.kt        |   1 -
 .../habitica/ui}/views/HabiticaIcons.java     |   2 +-
 .../ui}/views/HabiticaIconsHelper.java        |   4 +--
 .../habitica/ui}/views/UsernameLabel.kt       |   4 +--
 .../dialogs/QuestCompletedDialogContent.kt    |   2 +-
 .../views/equipment/EquipmentOverviewItem.kt  |   2 +-
 .../InsufficientHourglassesDialog.kt          |   2 +-
 .../habitica/ui/views/login/StarView.kt       |   2 +-
 .../habitica/ui/views/shops/PurchaseDialog.kt |   4 +--
 .../views/shops/PurchaseDialogGemsContent.kt  |   2 +-
 .../views/shops/PurchaseDialogQuestContent.kt |   2 +-
 .../ui/views/social/OldQuestProgressView.kt   |   4 +--
 .../habitica/ui/views/social/QuestMenuView.kt |   2 +-
 .../ui/views/social/QuestProgressView.kt      |   4 +--
 .../habitica/ui/views/stats/StatsView.kt      |   2 +-
 .../subscriptions/SubscriptionDetailsView.kt  |   2 +-
 .../tasks/form/HabitScoringButtonsView.kt     |   2 +-
 .../views/tasks/form/StepperValueFormView.kt  |   2 +-
 .../views/tasks/form/TaskDifficultyButtons.kt |   2 +-
 .../widget/AvatarStatsWidgetProvider.kt       |   2 +-
 .../wearos/habitica/MainApplication.kt        |   2 --
 .../habitica/ui/activities/StatsActivity.kt   |   9 ++++---
 .../ui/activities/TaskResultActivity.kt       |   9 +++----
 .../habitica/ui/viewmodels/StatsViewModel.kt  |   7 ++++++
 .../wearos/habitica/ui/views/StatValue.kt     |   5 ++--
 .../habitica/ui/views/TaskRewardChip.kt       |   4 +--
 .../src/main/res/drawable-hdpi/experience.png | Bin 390 -> 0 bytes
 .../main/res/drawable-hdpi/habit_diagonal.png | Bin 636 -> 0 bytes
 .../res/drawable-hdpi/habit_diagonal.webp     | Bin 0 -> 238 bytes
 .../main/res/drawable-hdpi/icon_avatar.png    | Bin 485 -> 0 bytes
 .../main/res/drawable-hdpi/icon_avatar.webp   | Bin 0 -> 366 bytes
 .../main/res/drawable-hdpi/icon_dailies.png   | Bin 345 -> 0 bytes
 .../main/res/drawable-hdpi/icon_dailies.webp  | Bin 0 -> 238 bytes
 .../main/res/drawable-hdpi/icon_habits.png    | Bin 448 -> 0 bytes
 .../main/res/drawable-hdpi/icon_habits.webp   | Bin 0 -> 346 bytes
 .../main/res/drawable-hdpi/icon_settings.png  | Bin 547 -> 0 bytes
 .../main/res/drawable-hdpi/icon_settings.webp | Bin 0 -> 438 bytes
 .../src/main/res/drawable-hdpi/icon_stats.png | Bin 527 -> 0 bytes
 .../main/res/drawable-hdpi/icon_stats.webp    | Bin 0 -> 440 bytes
 .../src/main/res/drawable-hdpi/icon_todos.png | Bin 551 -> 0 bytes
 .../main/res/drawable-hdpi/icon_todos.webp    | Bin 0 -> 456 bytes
 wearos/src/main/res/drawable-hdpi/magic.png   | Bin 422 -> 0 bytes
 .../drawable-hdpi/watch_habit_negative.png    | Bin 149 -> 0 bytes
 .../drawable-hdpi/watch_habit_negative.webp   | Bin 0 -> 58 bytes
 .../drawable-hdpi/watch_habit_positive.png    | Bin 167 -> 0 bytes
 .../drawable-hdpi/watch_habit_positive.webp   | Bin 0 -> 76 bytes
 .../res/drawable-hdpi/watch_habit_posneg.png  | Bin 1354 -> 0 bytes
 .../res/drawable-hdpi/watch_habit_posneg.webp | Bin 0 -> 96 bytes
 .../main/res/drawable-hdpi/watch_task_add.png | Bin 232 -> 0 bytes
 .../res/drawable-hdpi/watch_task_add.webp     | Bin 0 -> 132 bytes
 .../res/drawable-hdpi/watch_task_minus.png    | Bin 168 -> 0 bytes
 .../res/drawable-hdpi/watch_task_minus.webp   | Bin 0 -> 76 bytes
 .../main/res/drawable-mdpi/broken_heart.png   | Bin 2343 -> 0 bytes
 .../main/res/drawable-mdpi/broken_heart.webp  | Bin 0 -> 1290 bytes
 .../src/main/res/drawable-mdpi/checkmark.png  | Bin 330 -> 0 bytes
 .../src/main/res/drawable-mdpi/checkmark.webp | Bin 0 -> 152 bytes
 .../src/main/res/drawable-mdpi/experience.png | Bin 324 -> 0 bytes
 .../main/res/drawable-mdpi/experience.webp    | Bin 0 -> 254 bytes
 wearos/src/main/res/drawable-mdpi/gold.webp   | Bin 0 -> 426 bytes
 .../main/res/drawable-mdpi/habit_diagonal.png | Bin 636 -> 0 bytes
 .../res/drawable-mdpi/habit_diagonal.webp     | Bin 0 -> 238 bytes
 wearos/src/main/res/drawable-mdpi/handoff.png | Bin 321 -> 0 bytes
 wearos/src/main/res/drawable-mdpi/heart.webp  | Bin 0 -> 420 bytes
 .../main/res/drawable-mdpi/icon_avatar.png    | Bin 392 -> 0 bytes
 .../main/res/drawable-mdpi/icon_avatar.webp   | Bin 0 -> 266 bytes
 .../main/res/drawable-mdpi/icon_dailies.png   | Bin 216 -> 0 bytes
 .../main/res/drawable-mdpi/icon_dailies.webp  | Bin 0 -> 146 bytes
 .../main/res/drawable-mdpi/icon_habits.png    | Bin 338 -> 0 bytes
 .../main/res/drawable-mdpi/icon_habits.webp   | Bin 0 -> 254 bytes
 .../src/main/res/drawable-mdpi/icon_plus.png  | Bin 223 -> 0 bytes
 .../src/main/res/drawable-mdpi/icon_plus.webp | Bin 0 -> 100 bytes
 .../main/res/drawable-mdpi/icon_settings.png  | Bin 432 -> 0 bytes
 .../main/res/drawable-mdpi/icon_settings.webp | Bin 0 -> 336 bytes
 .../src/main/res/drawable-mdpi/icon_stats.png | Bin 422 -> 0 bytes
 .../main/res/drawable-mdpi/icon_stats.webp    | Bin 0 -> 338 bytes
 .../src/main/res/drawable-mdpi/icon_todos.png | Bin 431 -> 0 bytes
 .../main/res/drawable-mdpi/icon_todos.webp    | Bin 0 -> 342 bytes
 wearos/src/main/res/drawable-mdpi/magic.png   | Bin 365 -> 0 bytes
 wearos/src/main/res/drawable-mdpi/magic.webp  | Bin 0 -> 384 bytes
 .../drawable-mdpi/watch_habit_negative.png    | Bin 131 -> 0 bytes
 .../drawable-mdpi/watch_habit_negative.webp   | Bin 0 -> 42 bytes
 .../drawable-mdpi/watch_habit_positive.png    | Bin 146 -> 0 bytes
 .../drawable-mdpi/watch_habit_positive.webp   | Bin 0 -> 64 bytes
 .../res/drawable-mdpi/watch_habit_posneg.png  | Bin 1260 -> 0 bytes
 .../res/drawable-mdpi/watch_habit_posneg.webp | Bin 0 -> 74 bytes
 .../main/res/drawable-mdpi/watch_task_add.png | Bin 192 -> 0 bytes
 .../res/drawable-mdpi/watch_task_add.webp     | Bin 0 -> 100 bytes
 .../res/drawable-mdpi/watch_task_minus.png    | Bin 156 -> 0 bytes
 .../res/drawable-mdpi/watch_task_minus.webp   | Bin 0 -> 72 bytes
 .../main/res/drawable-xhdpi/broken_heart.png  | Bin 4357 -> 0 bytes
 .../main/res/drawable-xhdpi/broken_heart.webp | Bin 0 -> 2064 bytes
 .../src/main/res/drawable-xhdpi/checkmark.png | Bin 521 -> 0 bytes
 .../main/res/drawable-xhdpi/checkmark.webp    | Bin 0 -> 208 bytes
 .../main/res/drawable-xhdpi/experience.png    | Bin 469 -> 0 bytes
 .../main/res/drawable-xhdpi/experience.webp   | Bin 0 -> 386 bytes
 wearos/src/main/res/drawable-xhdpi/gold.webp  | Bin 0 -> 786 bytes
 .../res/drawable-xhdpi/habit_diagonal.png     | Bin 1101 -> 0 bytes
 .../res/drawable-xhdpi/habit_diagonal.webp    | Bin 0 -> 448 bytes
 .../src/main/res/drawable-xhdpi/handoff.png   | Bin 496 -> 0 bytes
 wearos/src/main/res/drawable-xhdpi/heart.webp | Bin 0 -> 806 bytes
 .../main/res/drawable-xhdpi/icon_avatar.png   | Bin 602 -> 0 bytes
 .../main/res/drawable-xhdpi/icon_avatar.webp  | Bin 0 -> 466 bytes
 .../main/res/drawable-xhdpi/icon_dailies.png  | Bin 271 -> 0 bytes
 .../main/res/drawable-xhdpi/icon_dailies.webp | Bin 0 -> 196 bytes
 .../main/res/drawable-xhdpi/icon_habits.png   | Bin 484 -> 0 bytes
 .../main/res/drawable-xhdpi/icon_habits.webp  | Bin 0 -> 400 bytes
 .../src/main/res/drawable-xhdpi/icon_plus.png | Bin 314 -> 0 bytes
 .../main/res/drawable-xhdpi/icon_plus.webp    | Bin 0 -> 124 bytes
 .../main/res/drawable-xhdpi/icon_settings.png | Bin 614 -> 0 bytes
 .../res/drawable-xhdpi/icon_settings.webp     | Bin 0 -> 516 bytes
 .../main/res/drawable-xhdpi/icon_stats.png    | Bin 675 -> 0 bytes
 .../main/res/drawable-xhdpi/icon_stats.webp   | Bin 0 -> 568 bytes
 .../main/res/drawable-xhdpi/icon_todos.png    | Bin 754 -> 0 bytes
 .../main/res/drawable-xhdpi/icon_todos.webp   | Bin 0 -> 606 bytes
 wearos/src/main/res/drawable-xhdpi/magic.png  | Bin 529 -> 0 bytes
 wearos/src/main/res/drawable-xhdpi/magic.webp | Bin 0 -> 602 bytes
 .../drawable-xhdpi/watch_habit_negative.png   | Bin 156 -> 0 bytes
 .../drawable-xhdpi/watch_habit_negative.webp  | Bin 0 -> 70 bytes
 .../drawable-xhdpi/watch_habit_positive.png   | Bin 186 -> 0 bytes
 .../drawable-xhdpi/watch_habit_positive.webp  | Bin 0 -> 90 bytes
 .../res/drawable-xhdpi/watch_habit_posneg.png | Bin 1417 -> 0 bytes
 .../drawable-xhdpi/watch_habit_posneg.webp    | Bin 0 -> 110 bytes
 .../res/drawable-xhdpi/watch_task_add.png     | Bin 220 -> 0 bytes
 .../res/drawable-xhdpi/watch_task_add.webp    | Bin 0 -> 116 bytes
 .../res/drawable-xhdpi/watch_task_minus.png   | Bin 181 -> 0 bytes
 .../res/drawable-xhdpi/watch_task_minus.webp  | Bin 0 -> 86 bytes
 .../main/res/drawable-xxhdpi/broken_heart.png | Bin 6104 -> 0 bytes
 .../res/drawable-xxhdpi/broken_heart.webp     | Bin 0 -> 2780 bytes
 .../main/res/drawable-xxhdpi/checkmark.png    | Bin 685 -> 0 bytes
 .../main/res/drawable-xxhdpi/checkmark.webp   | Bin 0 -> 264 bytes
 .../main/res/drawable-xxhdpi/experience.png   | Bin 569 -> 0 bytes
 .../main/res/drawable-xxhdpi/experience.webp  | Bin 0 -> 492 bytes
 wearos/src/main/res/drawable-xxhdpi/gold.webp | Bin 0 -> 1098 bytes
 .../res/drawable-xxhdpi/habit_diagonal.png    | Bin 1626 -> 0 bytes
 .../res/drawable-xxhdpi/habit_diagonal.webp   | Bin 0 -> 678 bytes
 .../src/main/res/drawable-xxhdpi/handoff.png  | Bin 731 -> 0 bytes
 .../src/main/res/drawable-xxhdpi/heart.webp   | Bin 0 -> 1102 bytes
 .../main/res/drawable-xxhdpi/icon_avatar.png  | Bin 773 -> 0 bytes
 .../main/res/drawable-xxhdpi/icon_avatar.webp | Bin 0 -> 640 bytes
 .../main/res/drawable-xxhdpi/icon_dailies.png | Bin 356 -> 0 bytes
 .../res/drawable-xxhdpi/icon_dailies.webp     | Bin 0 -> 252 bytes
 .../main/res/drawable-xxhdpi/icon_habits.png  | Bin 692 -> 0 bytes
 .../main/res/drawable-xxhdpi/icon_habits.webp | Bin 0 -> 598 bytes
 .../main/res/drawable-xxhdpi/icon_plus.png    | Bin 426 -> 0 bytes
 .../main/res/drawable-xxhdpi/icon_plus.webp   | Bin 0 -> 174 bytes
 .../res/drawable-xxhdpi/icon_settings.png     | Bin 907 -> 0 bytes
 .../res/drawable-xxhdpi/icon_settings.webp    | Bin 0 -> 780 bytes
 .../main/res/drawable-xxhdpi/icon_stats.png   | Bin 906 -> 0 bytes
 .../main/res/drawable-xxhdpi/icon_stats.webp  | Bin 0 -> 788 bytes
 .../main/res/drawable-xxhdpi/icon_todos.png   | Bin 940 -> 0 bytes
 .../main/res/drawable-xxhdpi/icon_todos.webp  | Bin 0 -> 800 bytes
 wearos/src/main/res/drawable-xxhdpi/magic.png | Bin 647 -> 0 bytes
 .../src/main/res/drawable-xxhdpi/magic.webp   | Bin 0 -> 818 bytes
 .../drawable-xxhdpi/watch_habit_negative.png  | Bin 166 -> 0 bytes
 .../drawable-xxhdpi/watch_habit_negative.webp | Bin 0 -> 76 bytes
 .../drawable-xxhdpi/watch_habit_positive.png  | Bin 203 -> 0 bytes
 .../drawable-xxhdpi/watch_habit_positive.webp | Bin 0 -> 104 bytes
 .../drawable-xxhdpi/watch_habit_posneg.png    | Bin 1529 -> 0 bytes
 .../drawable-xxhdpi/watch_habit_posneg.webp   | Bin 0 -> 128 bytes
 .../res/drawable-xxhdpi/watch_task_add.png    | Bin 279 -> 0 bytes
 .../res/drawable-xxhdpi/watch_task_add.webp   | Bin 0 -> 168 bytes
 .../res/drawable-xxhdpi/watch_task_minus.png  | Bin 209 -> 0 bytes
 .../res/drawable-xxhdpi/watch_task_minus.webp | Bin 0 -> 108 bytes
 .../main/res/drawable-xxxhdpi/experience.png  | Bin 707 -> 0 bytes
 .../main/res/drawable-xxxhdpi/experience.webp | Bin 0 -> 528 bytes
 .../main/res/drawable-xxxhdpi/icon_avatar.png | Bin 1048 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_avatar.webp     | Bin 0 -> 894 bytes
 .../res/drawable-xxxhdpi/icon_dailies.png     | Bin 402 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_dailies.webp    | Bin 0 -> 318 bytes
 .../main/res/drawable-xxxhdpi/icon_habits.png | Bin 842 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_habits.webp     | Bin 0 -> 724 bytes
 .../res/drawable-xxxhdpi/icon_settings.png    | Bin 1235 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_settings.webp   | Bin 0 -> 1072 bytes
 .../main/res/drawable-xxxhdpi/icon_stats.png  | Bin 1270 -> 0 bytes
 .../main/res/drawable-xxxhdpi/icon_stats.webp | Bin 0 -> 1120 bytes
 .../main/res/drawable-xxxhdpi/icon_todos.png  | Bin 1172 -> 0 bytes
 .../main/res/drawable-xxxhdpi/icon_todos.webp | Bin 0 -> 986 bytes
 .../src/main/res/drawable-xxxhdpi/magic.png   | Bin 743 -> 0 bytes
 .../src/main/res/drawable-xxxhdpi/magic.webp  | Bin 0 -> 606 bytes
 .../drawable-xxxhdpi/watch_habit_negative.png | Bin 181 -> 0 bytes
 .../watch_habit_negative.webp                 | Bin 0 -> 88 bytes
 .../drawable-xxxhdpi/watch_habit_positive.png | Bin 220 -> 0 bytes
 .../watch_habit_positive.webp                 | Bin 0 -> 118 bytes
 .../drawable-xxxhdpi/watch_habit_posneg.png   | Bin 1685 -> 0 bytes
 .../drawable-xxxhdpi/watch_habit_posneg.webp  | Bin 0 -> 146 bytes
 .../res/drawable-xxxhdpi/watch_task_add.png   | Bin 292 -> 0 bytes
 .../res/drawable-xxxhdpi/watch_task_add.webp  | Bin 0 -> 180 bytes
 .../res/drawable-xxxhdpi/watch_task_minus.png | Bin 230 -> 0 bytes
 .../drawable-xxxhdpi/watch_task_minus.webp    | Bin 0 -> 124 bytes
 wearos/src/main/res/drawable/cancel.xml       |   4 +--
 wearos/src/main/res/drawable/google_icon.xml  |   4 +--
 wearos/src/main/res/drawable/handoff.xml      |  10 ++++++++
 wearos/src/main/res/drawable/logout.xml       |   4 +--
 248 files changed, 133 insertions(+), 133 deletions(-)
 rename {common/src/main/java/com/habitrpg/common/habitica => Habitica/src/main/java/com/habitrpg/android/habitica/ui}/views/CurrencyView.kt (94%)
 rename {common/src/main/java/com/habitrpg/common/habitica => Habitica/src/main/java/com/habitrpg/android/habitica/ui}/views/HabiticaIcons.java (99%)
 rename {common/src/main/java/com/habitrpg/common/habitica => Habitica/src/main/java/com/habitrpg/android/habitica/ui}/views/HabiticaIconsHelper.java (99%)
 rename {common/src/main/java/com/habitrpg/common/habitica => Habitica/src/main/java/com/habitrpg/android/habitica/ui}/views/UsernameLabel.kt (91%)
 delete mode 100644 wearos/src/main/res/drawable-hdpi/experience.png
 delete mode 100644 wearos/src/main/res/drawable-hdpi/habit_diagonal.png
 create mode 100644 wearos/src/main/res/drawable-hdpi/habit_diagonal.webp
 delete mode 100644 wearos/src/main/res/drawable-hdpi/icon_avatar.png
 create mode 100644 wearos/src/main/res/drawable-hdpi/icon_avatar.webp
 delete mode 100644 wearos/src/main/res/drawable-hdpi/icon_dailies.png
 create mode 100644 wearos/src/main/res/drawable-hdpi/icon_dailies.webp
 delete mode 100644 wearos/src/main/res/drawable-hdpi/icon_habits.png
 create mode 100644 wearos/src/main/res/drawable-hdpi/icon_habits.webp
 delete mode 100644 wearos/src/main/res/drawable-hdpi/icon_settings.png
 create mode 100644 wearos/src/main/res/drawable-hdpi/icon_settings.webp
 delete mode 100644 wearos/src/main/res/drawable-hdpi/icon_stats.png
 create mode 100644 wearos/src/main/res/drawable-hdpi/icon_stats.webp
 delete mode 100644 wearos/src/main/res/drawable-hdpi/icon_todos.png
 create mode 100644 wearos/src/main/res/drawable-hdpi/icon_todos.webp
 delete mode 100644 wearos/src/main/res/drawable-hdpi/magic.png
 delete mode 100644 wearos/src/main/res/drawable-hdpi/watch_habit_negative.png
 create mode 100644 wearos/src/main/res/drawable-hdpi/watch_habit_negative.webp
 delete mode 100644 wearos/src/main/res/drawable-hdpi/watch_habit_positive.png
 create mode 100644 wearos/src/main/res/drawable-hdpi/watch_habit_positive.webp
 delete mode 100644 wearos/src/main/res/drawable-hdpi/watch_habit_posneg.png
 create mode 100644 wearos/src/main/res/drawable-hdpi/watch_habit_posneg.webp
 delete mode 100644 wearos/src/main/res/drawable-hdpi/watch_task_add.png
 create mode 100644 wearos/src/main/res/drawable-hdpi/watch_task_add.webp
 delete mode 100644 wearos/src/main/res/drawable-hdpi/watch_task_minus.png
 create mode 100644 wearos/src/main/res/drawable-hdpi/watch_task_minus.webp
 delete mode 100644 wearos/src/main/res/drawable-mdpi/broken_heart.png
 create mode 100644 wearos/src/main/res/drawable-mdpi/broken_heart.webp
 delete mode 100644 wearos/src/main/res/drawable-mdpi/checkmark.png
 create mode 100644 wearos/src/main/res/drawable-mdpi/checkmark.webp
 delete mode 100644 wearos/src/main/res/drawable-mdpi/experience.png
 create mode 100644 wearos/src/main/res/drawable-mdpi/experience.webp
 create mode 100644 wearos/src/main/res/drawable-mdpi/gold.webp
 delete mode 100644 wearos/src/main/res/drawable-mdpi/habit_diagonal.png
 create mode 100644 wearos/src/main/res/drawable-mdpi/habit_diagonal.webp
 delete mode 100644 wearos/src/main/res/drawable-mdpi/handoff.png
 create mode 100644 wearos/src/main/res/drawable-mdpi/heart.webp
 delete mode 100644 wearos/src/main/res/drawable-mdpi/icon_avatar.png
 create mode 100644 wearos/src/main/res/drawable-mdpi/icon_avatar.webp
 delete mode 100644 wearos/src/main/res/drawable-mdpi/icon_dailies.png
 create mode 100644 wearos/src/main/res/drawable-mdpi/icon_dailies.webp
 delete mode 100644 wearos/src/main/res/drawable-mdpi/icon_habits.png
 create mode 100644 wearos/src/main/res/drawable-mdpi/icon_habits.webp
 delete mode 100644 wearos/src/main/res/drawable-mdpi/icon_plus.png
 create mode 100644 wearos/src/main/res/drawable-mdpi/icon_plus.webp
 delete mode 100644 wearos/src/main/res/drawable-mdpi/icon_settings.png
 create mode 100644 wearos/src/main/res/drawable-mdpi/icon_settings.webp
 delete mode 100644 wearos/src/main/res/drawable-mdpi/icon_stats.png
 create mode 100644 wearos/src/main/res/drawable-mdpi/icon_stats.webp
 delete mode 100644 wearos/src/main/res/drawable-mdpi/icon_todos.png
 create mode 100644 wearos/src/main/res/drawable-mdpi/icon_todos.webp
 delete mode 100644 wearos/src/main/res/drawable-mdpi/magic.png
 create mode 100644 wearos/src/main/res/drawable-mdpi/magic.webp
 delete mode 100644 wearos/src/main/res/drawable-mdpi/watch_habit_negative.png
 create mode 100644 wearos/src/main/res/drawable-mdpi/watch_habit_negative.webp
 delete mode 100644 wearos/src/main/res/drawable-mdpi/watch_habit_positive.png
 create mode 100644 wearos/src/main/res/drawable-mdpi/watch_habit_positive.webp
 delete mode 100644 wearos/src/main/res/drawable-mdpi/watch_habit_posneg.png
 create mode 100644 wearos/src/main/res/drawable-mdpi/watch_habit_posneg.webp
 delete mode 100644 wearos/src/main/res/drawable-mdpi/watch_task_add.png
 create mode 100644 wearos/src/main/res/drawable-mdpi/watch_task_add.webp
 delete mode 100644 wearos/src/main/res/drawable-mdpi/watch_task_minus.png
 create mode 100644 wearos/src/main/res/drawable-mdpi/watch_task_minus.webp
 delete mode 100644 wearos/src/main/res/drawable-xhdpi/broken_heart.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/broken_heart.webp
 delete mode 100644 wearos/src/main/res/drawable-xhdpi/checkmark.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/checkmark.webp
 delete mode 100644 wearos/src/main/res/drawable-xhdpi/experience.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/experience.webp
 create mode 100644 wearos/src/main/res/drawable-xhdpi/gold.webp
 delete mode 100644 wearos/src/main/res/drawable-xhdpi/habit_diagonal.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/habit_diagonal.webp
 delete mode 100644 wearos/src/main/res/drawable-xhdpi/handoff.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/heart.webp
 delete mode 100644 wearos/src/main/res/drawable-xhdpi/icon_avatar.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/icon_avatar.webp
 delete mode 100644 wearos/src/main/res/drawable-xhdpi/icon_dailies.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/icon_dailies.webp
 delete mode 100644 wearos/src/main/res/drawable-xhdpi/icon_habits.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/icon_habits.webp
 delete mode 100644 wearos/src/main/res/drawable-xhdpi/icon_plus.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/icon_plus.webp
 delete mode 100644 wearos/src/main/res/drawable-xhdpi/icon_settings.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/icon_settings.webp
 delete mode 100644 wearos/src/main/res/drawable-xhdpi/icon_stats.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/icon_stats.webp
 delete mode 100644 wearos/src/main/res/drawable-xhdpi/icon_todos.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/icon_todos.webp
 delete mode 100644 wearos/src/main/res/drawable-xhdpi/magic.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/magic.webp
 delete mode 100644 wearos/src/main/res/drawable-xhdpi/watch_habit_negative.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/watch_habit_negative.webp
 delete mode 100644 wearos/src/main/res/drawable-xhdpi/watch_habit_positive.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/watch_habit_positive.webp
 delete mode 100644 wearos/src/main/res/drawable-xhdpi/watch_habit_posneg.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/watch_habit_posneg.webp
 delete mode 100644 wearos/src/main/res/drawable-xhdpi/watch_task_add.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/watch_task_add.webp
 delete mode 100644 wearos/src/main/res/drawable-xhdpi/watch_task_minus.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/watch_task_minus.webp
 delete mode 100644 wearos/src/main/res/drawable-xxhdpi/broken_heart.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/broken_heart.webp
 delete mode 100644 wearos/src/main/res/drawable-xxhdpi/checkmark.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/checkmark.webp
 delete mode 100644 wearos/src/main/res/drawable-xxhdpi/experience.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/experience.webp
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/gold.webp
 delete mode 100644 wearos/src/main/res/drawable-xxhdpi/habit_diagonal.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/habit_diagonal.webp
 delete mode 100644 wearos/src/main/res/drawable-xxhdpi/handoff.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/heart.webp
 delete mode 100644 wearos/src/main/res/drawable-xxhdpi/icon_avatar.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/icon_avatar.webp
 delete mode 100644 wearos/src/main/res/drawable-xxhdpi/icon_dailies.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/icon_dailies.webp
 delete mode 100644 wearos/src/main/res/drawable-xxhdpi/icon_habits.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/icon_habits.webp
 delete mode 100644 wearos/src/main/res/drawable-xxhdpi/icon_plus.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/icon_plus.webp
 delete mode 100644 wearos/src/main/res/drawable-xxhdpi/icon_settings.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/icon_settings.webp
 delete mode 100644 wearos/src/main/res/drawable-xxhdpi/icon_stats.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/icon_stats.webp
 delete mode 100644 wearos/src/main/res/drawable-xxhdpi/icon_todos.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/icon_todos.webp
 delete mode 100644 wearos/src/main/res/drawable-xxhdpi/magic.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/magic.webp
 delete mode 100644 wearos/src/main/res/drawable-xxhdpi/watch_habit_negative.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/watch_habit_negative.webp
 delete mode 100644 wearos/src/main/res/drawable-xxhdpi/watch_habit_positive.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/watch_habit_positive.webp
 delete mode 100644 wearos/src/main/res/drawable-xxhdpi/watch_habit_posneg.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/watch_habit_posneg.webp
 delete mode 100644 wearos/src/main/res/drawable-xxhdpi/watch_task_add.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/watch_task_add.webp
 delete mode 100644 wearos/src/main/res/drawable-xxhdpi/watch_task_minus.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/watch_task_minus.webp
 delete mode 100644 wearos/src/main/res/drawable-xxxhdpi/experience.png
 create mode 100644 wearos/src/main/res/drawable-xxxhdpi/experience.webp
 delete mode 100644 wearos/src/main/res/drawable-xxxhdpi/icon_avatar.png
 create mode 100644 wearos/src/main/res/drawable-xxxhdpi/icon_avatar.webp
 delete mode 100644 wearos/src/main/res/drawable-xxxhdpi/icon_dailies.png
 create mode 100644 wearos/src/main/res/drawable-xxxhdpi/icon_dailies.webp
 delete mode 100644 wearos/src/main/res/drawable-xxxhdpi/icon_habits.png
 create mode 100644 wearos/src/main/res/drawable-xxxhdpi/icon_habits.webp
 delete mode 100644 wearos/src/main/res/drawable-xxxhdpi/icon_settings.png
 create mode 100644 wearos/src/main/res/drawable-xxxhdpi/icon_settings.webp
 delete mode 100644 wearos/src/main/res/drawable-xxxhdpi/icon_stats.png
 create mode 100644 wearos/src/main/res/drawable-xxxhdpi/icon_stats.webp
 delete mode 100644 wearos/src/main/res/drawable-xxxhdpi/icon_todos.png
 create mode 100644 wearos/src/main/res/drawable-xxxhdpi/icon_todos.webp
 delete mode 100644 wearos/src/main/res/drawable-xxxhdpi/magic.png
 create mode 100644 wearos/src/main/res/drawable-xxxhdpi/magic.webp
 delete mode 100644 wearos/src/main/res/drawable-xxxhdpi/watch_habit_negative.png
 create mode 100644 wearos/src/main/res/drawable-xxxhdpi/watch_habit_negative.webp
 delete mode 100644 wearos/src/main/res/drawable-xxxhdpi/watch_habit_positive.png
 create mode 100644 wearos/src/main/res/drawable-xxxhdpi/watch_habit_positive.webp
 delete mode 100644 wearos/src/main/res/drawable-xxxhdpi/watch_habit_posneg.png
 create mode 100644 wearos/src/main/res/drawable-xxxhdpi/watch_habit_posneg.webp
 delete mode 100644 wearos/src/main/res/drawable-xxxhdpi/watch_task_add.png
 create mode 100644 wearos/src/main/res/drawable-xxxhdpi/watch_task_add.webp
 delete mode 100644 wearos/src/main/res/drawable-xxxhdpi/watch_task_minus.png
 create mode 100644 wearos/src/main/res/drawable-xxxhdpi/watch_task_minus.webp
 create mode 100644 wearos/src/main/res/drawable/handoff.xml

diff --git a/Habitica/proguard-rules.pro b/Habitica/proguard-rules.pro
index 15e1ba3a7..c511cae23 100644
--- a/Habitica/proguard-rules.pro
+++ b/Habitica/proguard-rules.pro
@@ -97,21 +97,6 @@
 -keepclassmembers class * {
     native <methods>;
 }
-# Keep our interfaces so they can be used by other ProGuard rules.
-# See http://sourceforge.net/p/proguard/bugs/466/
--keep,allowobfuscation @interface com.facebook.common.internal.DoNotStrip
-
-# Do not strip any method/class that is annotated with @DoNotStrip
--keep @com.facebook.common.internal.DoNotStrip class *
--keepclassmembers class * {
-    @com.facebook.common.internal.DoNotStrip *;
-}
-
-# Keep native methods
--keepclassmembers class * {
-    native <methods>;
-}
-#end fresko
 
 #amplitude
 -keep class com.google.android.gms.ads.** { *; }
diff --git a/Habitica/res/layout/activity_armoire.xml b/Habitica/res/layout/activity_armoire.xml
index b706c0c89..15e6339d5 100644
--- a/Habitica/res/layout/activity_armoire.xml
+++ b/Habitica/res/layout/activity_armoire.xml
@@ -23,7 +23,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:gravity="center_horizontal">
-        <com.habitrpg.common.habitica.views.CurrencyView
+        <com.habitrpg.android.habitica.ui.views.CurrencyView
             android:id="@+id/gold_view"
             android:layout_width="wrap_content"
             android:layout_height="30dp"
diff --git a/Habitica/res/layout/activity_gift_subscription.xml b/Habitica/res/layout/activity_gift_subscription.xml
index a7216f4b9..917be5105 100644
--- a/Habitica/res/layout/activity_gift_subscription.xml
+++ b/Habitica/res/layout/activity_gift_subscription.xml
@@ -38,7 +38,7 @@
                 app:showMount="false"
                 app:showSleeping="false"
                 android:layout_gravity="center_horizontal"/>
-            <com.habitrpg.common.habitica.views.UsernameLabel
+            <com.habitrpg.android.habitica.ui.views.UsernameLabel
                 android:id="@+id/display_name_text_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/ad_button.xml b/Habitica/res/layout/ad_button.xml
index 730295e43..b5a4e893f 100644
--- a/Habitica/res/layout/ad_button.xml
+++ b/Habitica/res/layout/ad_button.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:textStyle="bold"
         android:textSize="16sp" />
-    <com.habitrpg.common.habitica.views.CurrencyView
+    <com.habitrpg.android.habitica.ui.views.CurrencyView
         android:id="@+id/currency_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/autocomplete_username.xml b/Habitica/res/layout/autocomplete_username.xml
index 0f03cf5c4..f2bf955ed 100644
--- a/Habitica/res/layout/autocomplete_username.xml
+++ b/Habitica/res/layout/autocomplete_username.xml
@@ -6,7 +6,7 @@
     android:paddingBottom="@dimen/spacing_medium"
     android:paddingStart="@dimen/spacing_large"
     android:paddingEnd="@dimen/spacing_large">
-<com.habitrpg.common.habitica.views.UsernameLabel
+<com.habitrpg.android.habitica.ui.views.UsernameLabel
     android:id="@+id/display_name_view"
     android:layout_width="match_parent"
     android:layout_height="wrap_content" />
diff --git a/Habitica/res/layout/chat_item.xml b/Habitica/res/layout/chat_item.xml
index f892e641f..b5b158ed5 100644
--- a/Habitica/res/layout/chat_item.xml
+++ b/Habitica/res/layout/chat_item.xml
@@ -35,7 +35,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
-                    <com.habitrpg.common.habitica.views.UsernameLabel
+                    <com.habitrpg.android.habitica.ui.views.UsernameLabel
                         android:id="@+id/user_label"
                         style="@style/ChatMessageUserTextViewStyle"
                         android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/customization_grid_background_item.xml b/Habitica/res/layout/customization_grid_background_item.xml
index 74d868e13..0aed8fdd0 100644
--- a/Habitica/res/layout/customization_grid_background_item.xml
+++ b/Habitica/res/layout/customization_grid_background_item.xml
@@ -23,7 +23,7 @@
             android:layout_width="match_parent"
             android:layout_height="32dp"
             android:background="@drawable/layout_rounded_bg_shopitem_price">
-            <com.habitrpg.common.habitica.views.CurrencyView
+            <com.habitrpg.android.habitica.ui.views.CurrencyView
                 android:id="@+id/price_label"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
diff --git a/Habitica/res/layout/customization_grid_item.xml b/Habitica/res/layout/customization_grid_item.xml
index 11f66fb40..9380199f9 100644
--- a/Habitica/res/layout/customization_grid_item.xml
+++ b/Habitica/res/layout/customization_grid_item.xml
@@ -23,7 +23,7 @@
             android:layout_width="match_parent"
             android:layout_height="32dp"
             android:background="@drawable/layout_rounded_bg_shopitem_price">
-                    <com.habitrpg.common.habitica.views.CurrencyView
+                    <com.habitrpg.android.habitica.ui.views.CurrencyView
                         android:id="@+id/price_label"
                         android:layout_width="wrap_content"
                         android:layout_height="32dp"
diff --git a/Habitica/res/layout/customization_section_footer.xml b/Habitica/res/layout/customization_section_footer.xml
index 6f82ca019..fb5c3987c 100644
--- a/Habitica/res/layout/customization_section_footer.xml
+++ b/Habitica/res/layout/customization_section_footer.xml
@@ -22,7 +22,7 @@
             android:textColor="@color/text_primary"
             style="@style/Body1"
             android:layout_marginEnd="@dimen/spacing_medium"/>
-        <com.habitrpg.common.habitica.views.CurrencyView
+        <com.habitrpg.android.habitica.ui.views.CurrencyView
             android:id="@+id/set_price_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
diff --git a/Habitica/res/layout/dialog_hatch_pet_button.xml b/Habitica/res/layout/dialog_hatch_pet_button.xml
index 7ab09a57f..895be21a2 100644
--- a/Habitica/res/layout/dialog_hatch_pet_button.xml
+++ b/Habitica/res/layout/dialog_hatch_pet_button.xml
@@ -15,7 +15,7 @@
         android:textColor="@color/white"
         android:layout_marginEnd="6dp"
         />
-    <com.habitrpg.common.habitica.views.CurrencyView
+    <com.habitrpg.android.habitica.ui.views.CurrencyView
         android:id="@+id/currencyView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
diff --git a/Habitica/res/layout/dialog_purchase_shopitem_button.xml b/Habitica/res/layout/dialog_purchase_shopitem_button.xml
index 71e560cf7..f2d784958 100644
--- a/Habitica/res/layout/dialog_purchase_shopitem_button.xml
+++ b/Habitica/res/layout/dialog_purchase_shopitem_button.xml
@@ -15,7 +15,7 @@
         android:text="@string/reward_dialog_buy"
         android:textColor="@color/brand_300"
         style="@style/SubHeader1" />
-    <com.habitrpg.common.habitica.views.CurrencyView
+    <com.habitrpg.android.habitica.ui.views.CurrencyView
         android:id="@+id/priceLabel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/fragment_challenge_detail.xml b/Habitica/res/layout/fragment_challenge_detail.xml
index 2289a9200..378418a37 100644
--- a/Habitica/res/layout/fragment_challenge_detail.xml
+++ b/Habitica/res/layout/fragment_challenge_detail.xml
@@ -151,7 +151,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:layout_weight="1">
-                <com.habitrpg.common.habitica.views.UsernameLabel
+                <com.habitrpg.android.habitica.ui.views.UsernameLabel
                     android:id="@+id/creator_label"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
diff --git a/Habitica/res/layout/fragment_gift_gem_balance.xml b/Habitica/res/layout/fragment_gift_gem_balance.xml
index 024f16c38..614f6c32b 100644
--- a/Habitica/res/layout/fragment_gift_gem_balance.xml
+++ b/Habitica/res/layout/fragment_gift_gem_balance.xml
@@ -18,7 +18,7 @@
             app:showMount="false"
             app:showSleeping="false"
             android:layout_gravity="center_horizontal"/>
-        <com.habitrpg.common.habitica.views.UsernameLabel
+        <com.habitrpg.android.habitica.ui.views.UsernameLabel
             android:id="@+id/display_name_textview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/fragment_gift_gem_purchase.xml b/Habitica/res/layout/fragment_gift_gem_purchase.xml
index aeaaf3148..17bee47d1 100644
--- a/Habitica/res/layout/fragment_gift_gem_purchase.xml
+++ b/Habitica/res/layout/fragment_gift_gem_purchase.xml
@@ -18,7 +18,7 @@
             app:showMount="false"
             app:showSleeping="false"
             android:layout_gravity="center_horizontal"/>
-        <com.habitrpg.common.habitica.views.UsernameLabel
+        <com.habitrpg.android.habitica.ui.views.UsernameLabel
             android:id="@+id/display_name_textview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/fragment_guild_detail.xml b/Habitica/res/layout/fragment_guild_detail.xml
index 432488ed9..b62f35db0 100644
--- a/Habitica/res/layout/fragment_guild_detail.xml
+++ b/Habitica/res/layout/fragment_guild_detail.xml
@@ -162,7 +162,7 @@
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
                         android:gravity="center_vertical">
-                        <com.habitrpg.common.habitica.views.UsernameLabel
+                        <com.habitrpg.android.habitica.ui.views.UsernameLabel
                             android:id="@+id/leader_profile_name"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content" />
diff --git a/Habitica/res/layout/item_inbox_overview.xml b/Habitica/res/layout/item_inbox_overview.xml
index 69706b2c3..ff7653273 100644
--- a/Habitica/res/layout/item_inbox_overview.xml
+++ b/Habitica/res/layout/item_inbox_overview.xml
@@ -30,7 +30,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
-            <com.habitrpg.common.habitica.views.UsernameLabel
+            <com.habitrpg.android.habitica.ui.views.UsernameLabel
                 android:id="@+id/display_name_textview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
diff --git a/Habitica/res/layout/menu_bottom_sheet_item.xml b/Habitica/res/layout/menu_bottom_sheet_item.xml
index f1bc752ad..0fd7574bd 100644
--- a/Habitica/res/layout/menu_bottom_sheet_item.xml
+++ b/Habitica/res/layout/menu_bottom_sheet_item.xml
@@ -18,7 +18,7 @@
         android:layout_height="wrap_content"
         style="@style/BottomMenuItemText"
         tools:text="Menu Item"/>
-    <com.habitrpg.common.habitica.views.CurrencyView
+    <com.habitrpg.android.habitica.ui.views.CurrencyView
         android:id="@+id/currency_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/party_member.xml b/Habitica/res/layout/party_member.xml
index e2c81901d..53a29d1d5 100644
--- a/Habitica/res/layout/party_member.xml
+++ b/Habitica/res/layout/party_member.xml
@@ -24,7 +24,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
-        <com.habitrpg.common.habitica.views.UsernameLabel
+        <com.habitrpg.android.habitica.ui.views.UsernameLabel
             android:id="@+id/display_name_textview"
             android:layout_height="wrap_content"
             android:layout_width="0dp"
diff --git a/Habitica/res/layout/row_shopitem.xml b/Habitica/res/layout/row_shopitem.xml
index b62c8269a..35e4b3aea 100644
--- a/Habitica/res/layout/row_shopitem.xml
+++ b/Habitica/res/layout/row_shopitem.xml
@@ -27,7 +27,7 @@
             android:minHeight="40dp"
             android:gravity="center"
             android:background="@drawable/layout_rounded_bg_shopitem_price">
-            <com.habitrpg.common.habitica.views.CurrencyView
+            <com.habitrpg.android.habitica.ui.views.CurrencyView
                 android:id="@+id/priceLabel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/tavern_chat_intro_item.xml b/Habitica/res/layout/tavern_chat_intro_item.xml
index d16466948..be589d9ee 100644
--- a/Habitica/res/layout/tavern_chat_intro_item.xml
+++ b/Habitica/res/layout/tavern_chat_intro_item.xml
@@ -30,7 +30,7 @@
         android:textColor="@color/gray_300"
         android:textSize="12sp" />
 
-    <com.habitrpg.common.habitica.views.UsernameLabel
+    <com.habitrpg.android.habitica.ui.views.UsernameLabel
         android:id="@+id/display_name_textview"
         android:layout_width="wrap_content"
         android:layout_height="24dp"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
index 920a0db64..3c620c083 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
@@ -38,7 +38,7 @@ import com.habitrpg.android.habitica.ui.activities.LoginActivity
 import com.habitrpg.common.habitica.extensions.setupCoil
 import com.habitrpg.common.habitica.helpers.LanguageHelper
 import com.habitrpg.common.habitica.helpers.MarkdownParser
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import java.lang.ref.WeakReference
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 8db1ce247..116a782d5 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
@@ -11,7 +11,7 @@ import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.common.habitica.views.AvatarView
 import com.habitrpg.android.habitica.ui.activities.BaseActivity
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import io.reactivex.rxjava3.core.Flowable
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt
index 42642905a..9f7439c22 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt
@@ -19,7 +19,7 @@ import com.habitrpg.android.habitica.extensions.round
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.activities.BaseActivity
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.SnackbarDisplayType
 import io.reactivex.rxjava3.core.Flowable
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt
index eb28b134e..aeccc8dcb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt
@@ -18,7 +18,7 @@ import com.habitrpg.android.habitica.ui.activities.mainActivityCreatedAt
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.common.habitica.helpers.HealthFormatter
 import com.habitrpg.common.habitica.models.Avatar
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import java.util.Date
 import java.util.Locale
 import kotlin.math.floor
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/ItemDetailDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/ItemDetailDialog.kt
index 02ba02ad6..3b51d8029 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/ItemDetailDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/ItemDetailDialog.kt
@@ -10,7 +10,7 @@ import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import com.habitrpg.android.habitica.R
 import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.common.habitica.views.PixelArtView
 
 class ItemDetailDialog(context: Context) : AlertDialog(context) {
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 85208586c..0b25760bd 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
@@ -34,10 +34,9 @@ import com.habitrpg.common.habitica.models.tasks.TaskType
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.adapter.social.challenges.ChallengeTasksRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengesOverviewFragmentDirections
-import com.habitrpg.android.habitica.ui.helpers.ToolbarColorHelper
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaProgressDialog
 import io.reactivex.rxjava3.core.Flowable
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
index 818d10752..b84ef5c54 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
@@ -21,7 +21,7 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaProgressDialog
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.reactivex.rxjava3.functions.Consumer
 import javax.inject.Inject
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt
index 27e267e99..3f283f8b0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt
@@ -19,7 +19,7 @@ import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.ads.AdButton
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.plattysoft.leonids.ParticleSystem
 import javax.inject.Inject
 
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 2d97777f4..ba36246ca 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
@@ -13,9 +13,7 @@ import com.habitrpg.android.habitica.databinding.ActivityFixcharacterBinding
 import com.habitrpg.android.habitica.extensions.setTintWith
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.modules.AppModule
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaProgressDialog
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 
 import javax.inject.Inject
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 79bf63242..873598e5e 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
@@ -16,7 +16,7 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.ui.fragments.purchases.GiftBalanceGemsFragment
 import com.habitrpg.android.habitica.ui.fragments.purchases.GiftPurchaseGemsFragment
-import com.habitrpg.common.habitica.views.CurrencyView
+import com.habitrpg.android.habitica.ui.views.CurrencyView
 import javax.inject.Inject
 
 class GiftGemsActivity : PurchaseActivity() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/VerifyUsernameActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/VerifyUsernameActivity.kt
index 7d7988aec..1e9845793 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/VerifyUsernameActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/VerifyUsernameActivity.kt
@@ -12,7 +12,7 @@ import com.habitrpg.android.habitica.databinding.ActivityVerifyUsernameBinding
 import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
 import com.habitrpg.android.habitica.extensions.runDelayed
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.core.Flowable
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
index 5c8ab7da8..a1e8f30ba 100644
--- 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
@@ -14,7 +14,7 @@ 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.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.common.habitica.views.PixelArtView
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import io.reactivex.rxjava3.core.BackpressureStrategy
@@ -126,7 +126,8 @@ class CustomizationEquipmentRecyclerViewAdapter : androidx.recyclerview.widget.R
                     equipment?.value ?: 0
                 }.toString()
 
-                (dialogContent.findViewById<View>(R.id.gem_icon) as? ImageView)?.setImageBitmap(HabiticaIconsHelper.imageOfGem())
+                (dialogContent.findViewById<View>(R.id.gem_icon) as? ImageView)?.setImageBitmap(
+                    HabiticaIconsHelper.imageOfGem())
 
                 val dialog = HabiticaAlertDialog(itemView.context)
                 dialog.addButton(R.string.purchase_button, true) { _, _ ->
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 6460d7a1e..043b5a1cd 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
@@ -14,7 +14,7 @@ import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.android.habitica.models.Skill
 import com.habitrpg.android.habitica.models.user.OwnedItem
 import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.subjects.PublishSubject
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.kt
index ba74a5f2b..ba218b5b8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.kt
@@ -13,7 +13,7 @@ import com.habitrpg.android.habitica.databinding.GearListItemBinding
 import com.habitrpg.android.habitica.models.inventory.Equipment
 import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
 import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.reactivex.rxjava3.subjects.PublishSubject
 
 class EquipmentRecyclerViewAdapter : BaseRecyclerViewAdapter<Equipment, EquipmentRecyclerViewAdapter.GearViewHolder>() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/HabiticaClassArrayAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/HabiticaClassArrayAdapter.kt
index b0f082009..983c8e243 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/HabiticaClassArrayAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/HabiticaClassArrayAdapter.kt
@@ -10,7 +10,7 @@ import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.models.user.Stats
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class HabiticaClassArrayAdapter(context: Context, resource: Int, objects: List<CharSequence>) : ArrayAdapter<CharSequence>(context, resource, R.id.textView, objects) {
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt
index 9320cfe68..950f6e00d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt
@@ -11,7 +11,7 @@ import com.habitrpg.android.habitica.models.social.ChallengeMembership
 import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeFilterOptions
 import com.habitrpg.common.habitica.helpers.EmojiParser
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.subjects.PublishSubject
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/GuildListAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/GuildListAdapter.kt
index 3c850d49b..9b406565b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/GuildListAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/GuildListAdapter.kt
@@ -19,7 +19,7 @@ import com.habitrpg.common.habitica.helpers.NumberAbbreviator
 import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
 import com.habitrpg.common.habitica.helpers.EmojiParser
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.realm.Case
 import io.realm.OrderedRealmCollection
 import java.util.Locale
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 ec3a996a2..12e0dc8f6 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
@@ -18,7 +18,7 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder
 import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.functions.Action
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
index b4a1a6013..1c930c965 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
@@ -19,7 +19,7 @@ import com.habitrpg.common.habitica.models.tasks.Attribute
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.stats.BulkAllocateStatsDialog
 import javax.inject.Inject
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 73c04e42e..f35438e5c 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
@@ -17,7 +17,7 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.activities.SetupActivity
 import com.habitrpg.android.habitica.ui.adapter.setup.TaskSetupAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import java.util.Date
 
 class TaskSetupFragment : BaseFragment<FragmentSetupTasksBinding>() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt
index 1b14dfc22..6d17af42a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt
@@ -15,7 +15,7 @@ import com.habitrpg.android.habitica.databinding.FragmentWelcomeBinding
 import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.subjects.PublishSubject
 import java.util.concurrent.TimeUnit
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 b3ff2011b..c5d47dd86 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
@@ -24,7 +24,7 @@ import com.habitrpg.android.habitica.ui.adapter.SkillsRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.Companion.showSnackbar
 import io.reactivex.rxjava3.core.Flowable
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 0e36f7438..e86c4aeef 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
@@ -25,7 +25,7 @@ import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import com.habitrpg.common.habitica.views.UsernameLabel
+import com.habitrpg.android.habitica.ui.views.UsernameLabel
 import javax.inject.Inject
 
 class InboxOverviewFragment : BaseMainFragment<FragmentInboxBinding>(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener, View.OnClickListener {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt
index bde759f26..a7f76692d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt
@@ -28,7 +28,7 @@ import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.common.habitica.models.PlayerTier
-import com.habitrpg.common.habitica.views.UsernameLabel
+import com.habitrpg.android.habitica.ui.views.UsernameLabel
 import javax.inject.Inject
 
 class TavernDetailFragment : BaseFragment<FragmentTavernDetailBinding>() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt
index e9569346f..55ab3ca7d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt
@@ -36,7 +36,7 @@ import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.common.habitica.helpers.EmojiParser
 import com.habitrpg.common.habitica.helpers.setMarkdown
 import com.habitrpg.common.habitica.models.tasks.TaskType
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import retrofit2.HttpException
 import javax.inject.Inject
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildDetailFragment.kt
index a706835d9..eb4eb1c11 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildDetailFragment.kt
@@ -26,8 +26,8 @@ import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.common.habitica.helpers.setMarkdown
 import com.habitrpg.android.habitica.ui.viewmodels.GroupViewModel
-import com.habitrpg.common.habitica.views.HabiticaIcons
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIcons
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.SnackbarActivity
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import kotlinx.coroutines.Dispatchers
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 bef1f6e90..39c4c28e7 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
@@ -17,7 +17,7 @@ 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.common.habitica.helpers.setMarkdown
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.reactivex.rxjava3.functions.Consumer
 import javax.inject.Inject
 
@@ -45,13 +45,20 @@ class FAQOverviewFragment : BaseMainFragment<FragmentFaqOverviewBinding>() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        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?.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")) }
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 80033e1a9..2063d4c2a 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
@@ -47,7 +47,7 @@ import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.common.habitica.models.responses.TaskDirection
 import com.habitrpg.common.habitica.models.responses.TaskScoringResult
 import com.habitrpg.common.habitica.models.tasks.TaskType
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import kotlinx.coroutines.Job
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/AutocompleteAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/AutocompleteAdapter.kt
index 5088338a0..d624d7787 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/AutocompleteAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/AutocompleteAdapter.kt
@@ -15,7 +15,7 @@ import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.models.social.FindUsernameResult
 import com.habitrpg.android.habitica.models.user.Authentication
 import com.habitrpg.android.habitica.models.user.Profile
-import com.habitrpg.common.habitica.views.UsernameLabel
+import com.habitrpg.android.habitica.ui.views.UsernameLabel
 import com.habitrpg.common.habitica.helpers.EmojiMap
 import com.habitrpg.common.habitica.helpers.EmojiParser
 import java.util.Date
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt
index 935b2356a..a595185ca 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt
@@ -23,7 +23,7 @@ import com.habitrpg.common.habitica.extensions.DataBindingUtils
 import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.helpers.MarkdownParser
 import com.habitrpg.common.habitica.helpers.setParsedMarkdown
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Maybe
 import io.reactivex.rxjava3.schedulers.Schedulers
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder.kt
index 9be773190..8bdc10c86 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder.kt
@@ -8,7 +8,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.PartyMemberBinding
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.user.Stats
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class GroupMemberViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), PopupMenu.OnMenuItemClickListener {
     private val binding = PartyMemberBinding.bind(itemView)
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 4c180c4d1..4f126516e 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
@@ -11,7 +11,7 @@ import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.android.habitica.models.shops.ShopItem
 import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.shops.PurchaseDialog
 
 class ShopItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt
index d291df02d..f5c863667 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt
@@ -10,7 +10,7 @@ import com.habitrpg.common.habitica.helpers.NumberAbbreviator
 import com.habitrpg.common.habitica.models.responses.TaskDirection
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.ItemDetailDialog
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class RewardViewHolder(
     itemView: View,
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 81bc6c7bc..e3ee68a1d 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
@@ -13,7 +13,6 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ViewCollapsibleSectionBinding
 import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.common.habitica.extensions.layoutInflater
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
 
 class CollapsibleSectionView(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs) {
     val infoIconView: ImageView
diff --git a/common/src/main/java/com/habitrpg/common/habitica/views/CurrencyView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt
similarity index 94%
rename from common/src/main/java/com/habitrpg/common/habitica/views/CurrencyView.kt
rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt
index fbd641889..d62f07d79 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/views/CurrencyView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt
@@ -1,4 +1,4 @@
-package com.habitrpg.common.habitica.views
+package com.habitrpg.android.habitica.ui.views
 
 import android.animation.ValueAnimator
 import android.content.Context
@@ -13,8 +13,8 @@ import androidx.core.animation.doOnEnd
 import androidx.core.animation.doOnStart
 import androidx.core.content.ContextCompat
 import androidx.core.view.updateLayoutParams
-import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.common.habitica.R
+import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.common.habitica.helpers.NumberAbbreviator
 
 class CurrencyView : androidx.appcompat.widget.AppCompatTextView {
@@ -69,21 +69,21 @@ class CurrencyView : androidx.appcompat.widget.AppCompatTextView {
 
     private fun configureCurrency() {
         if ("gold" == currency) {
-            icon = HabiticaIconsHelper.imageOfGold()
+            icon = com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper.imageOfGold()
             if (lightBackground) {
                 setTextColor(ContextCompat.getColor(context, R.color.yellow_1))
             } else {
                 setTextColor(ContextCompat.getColor(context, R.color.yellow_100))
             }
         } else if ("gems" == currency) {
-            icon = HabiticaIconsHelper.imageOfGem()
+            icon = com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper.imageOfGem()
             if (lightBackground) {
                 setTextColor(ContextCompat.getColor(context, R.color.green_10))
             } else {
                 setTextColor(ContextCompat.getColor(context, R.color.green_50))
             }
         } else if ("hourglasses" == currency) {
-            icon = HabiticaIconsHelper.imageOfHourglass()
+            icon = com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper.imageOfHourglass()
             if (lightBackground) {
                 setTextColor(ContextCompat.getColor(context, R.color.brand_300))
             } else {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyViews.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyViews.kt
index 134a0089c..6d3f44a55 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyViews.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyViews.kt
@@ -6,7 +6,6 @@ import android.util.TypedValue
 import android.widget.LinearLayout
 import com.habitrpg.android.habitica.R
 import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
-import com.habitrpg.common.habitica.views.CurrencyView
 
 class CurrencyViews : LinearLayout {
     var lightBackground: Boolean = false
diff --git a/common/src/main/java/com/habitrpg/common/habitica/views/HabiticaIcons.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java
similarity index 99%
rename from common/src/main/java/com/habitrpg/common/habitica/views/HabiticaIcons.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java
index 0f8228b7e..2dc734973 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/views/HabiticaIcons.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java
@@ -1,4 +1,4 @@
-package com.habitrpg.common.habitica.views;
+package com.habitrpg.android.habitica.ui.views;
 
 import android.content.Context;
 import android.graphics.Bitmap;
diff --git a/common/src/main/java/com/habitrpg/common/habitica/views/HabiticaIconsHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
similarity index 99%
rename from common/src/main/java/com/habitrpg/common/habitica/views/HabiticaIconsHelper.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
index 5263e360f..d53a38a1d 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/views/HabiticaIconsHelper.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
@@ -1,4 +1,4 @@
-package com.habitrpg.common.habitica.views;
+package com.habitrpg.android.habitica.ui.views;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -8,8 +8,6 @@ import android.graphics.RectF;
 
 import androidx.annotation.ColorInt;
 
-import com.habitrpg.common.habitica.views.HabiticaIcons;
-
 /**
  * Created by phillip on 05.09.17.
  */
diff --git a/common/src/main/java/com/habitrpg/common/habitica/views/UsernameLabel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/UsernameLabel.kt
similarity index 91%
rename from common/src/main/java/com/habitrpg/common/habitica/views/UsernameLabel.kt
rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/UsernameLabel.kt
index 6ab09431d..ce0c49760 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/views/UsernameLabel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/UsernameLabel.kt
@@ -1,4 +1,4 @@
-package com.habitrpg.common.habitica.views
+package com.habitrpg.android.habitica.ui.views
 
 import android.content.Context
 import android.util.AttributeSet
@@ -44,7 +44,7 @@ class UsernameLabel @JvmOverloads constructor(
                 tierIconView.visibility = View.GONE
             } else {
                 tierIconView.visibility = View.VISIBLE
-                tierIconView.setImageBitmap(HabiticaIconsHelper.imageOfContributorBadge(value.toFloat(), isNPC))
+                tierIconView.setImageBitmap(com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper.imageOfContributorBadge(value.toFloat(), isNPC))
             }
         }
 
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
index d328c626d..e5eed8ced 100644
--- 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
@@ -16,7 +16,7 @@ import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.inventory.QuestDropItem
 import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.common.habitica.views.PixelArtView
 
 class QuestCompletedDialogContent : LinearLayout {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewItem.kt
index df9a974fb..5c722cc5d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentOverviewItem.kt
@@ -10,7 +10,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.EquipmentOverviewItemBinding
 import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class EquipmentOverviewItem @JvmOverloads constructor(
     context: Context,
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientHourglassesDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientHourglassesDialog.kt
index 9ce7df8aa..115e0f181 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientHourglassesDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientHourglassesDialog.kt
@@ -6,7 +6,7 @@ import androidx.core.os.bundleOf
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.addCloseButton
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class InsufficientHourglassesDialog(context: Context) : InsufficientCurrencyDialog(context) {
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/StarView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/StarView.kt
index e6a9d17b7..d7c004062 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/StarView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/StarView.kt
@@ -8,7 +8,7 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import androidx.appcompat.widget.AppCompatImageView
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class StarView : AppCompatImageView {
 
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 a5ded43d3..d6ba0758b 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
@@ -28,9 +28,9 @@ import com.habitrpg.android.habitica.models.shops.ShopItem
 import com.habitrpg.android.habitica.models.user.OwnedItem
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.activities.ArmoireActivityDirections
-import com.habitrpg.common.habitica.views.CurrencyView
+import com.habitrpg.android.habitica.ui.views.CurrencyView
 import com.habitrpg.android.habitica.ui.views.CurrencyViews
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.SnackbarActivity
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.insufficientCurrency.InsufficientGemsDialog
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 755e8c296..42fda0c87 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
@@ -6,7 +6,7 @@ import com.habitrpg.android.habitica.databinding.DialogPurchaseGemsBinding
 import com.habitrpg.android.habitica.extensions.asDrawable
 import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.shops.ShopItem
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.common.habitica.views.PixelArtView
 
 internal class PurchaseDialogGemsContent(context: Context) : PurchaseDialogContent(context) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt
index 5253c89d0..67d3e1b88 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt
@@ -13,7 +13,7 @@ import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.inventory.QuestDropItem
 import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.common.habitica.views.PixelArtView
 
 class PurchaseDialogQuestContent(context: Context) : PurchaseDialogContent(context) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt
index 7f5d8fb60..a10a867ba 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt
@@ -18,8 +18,8 @@ import com.habitrpg.android.habitica.models.inventory.QuestProgress
 import com.habitrpg.android.habitica.models.inventory.QuestProgressCollect
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.views.HabiticaIcons
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIcons
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class OldQuestProgressView : LinearLayout {
     private val binding = QuestProgressOldBinding.inflate(context.layoutInflater, this)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestMenuView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestMenuView.kt
index fffb1a616..129275201 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestMenuView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestMenuView.kt
@@ -13,7 +13,7 @@ import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.inventory.Quest
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import java.util.Locale
 
 class QuestMenuView : LinearLayout {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestProgressView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestProgressView.kt
index 50044c633..9a32b88b4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestProgressView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestProgressView.kt
@@ -28,8 +28,8 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.common.habitica.extensions.DataBindingUtils
 import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.common.habitica.helpers.setMarkdown
-import com.habitrpg.common.habitica.views.HabiticaIcons
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIcons
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.NPCBannerView
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt
index 6bd94abec..8a3455f0d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt
@@ -11,7 +11,7 @@ import com.habitrpg.android.habitica.databinding.StatsViewBinding
 import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.extensions.setTintWith
 import com.habitrpg.android.habitica.helpers.HapticFeedbackManager
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class StatsView(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs) {
     private val binding = StatsViewBinding.inflate(context.layoutInflater, this, true)
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 8c396b4b1..fb2d10d45 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
@@ -11,7 +11,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.SubscriptionDetailsBinding
 import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.models.user.SubscriptionPlan
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import java.text.DateFormat
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitScoringButtonsView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitScoringButtonsView.kt
index db4f51f32..f5dd0af0c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitScoringButtonsView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitScoringButtonsView.kt
@@ -11,7 +11,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.TaskFormHabitScoringBinding
 import com.habitrpg.android.habitica.extensions.asDrawable
 import com.habitrpg.common.habitica.extensions.layoutInflater
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class HabitScoringButtonsView @JvmOverloads constructor(
     context: Context,
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 b91d58f85..1230ef00a 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
@@ -9,7 +9,7 @@ import com.habitrpg.android.habitica.databinding.FormStepperValueBinding
 import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
 import com.habitrpg.android.habitica.extensions.asDrawable
 import com.habitrpg.common.habitica.extensions.layoutInflater
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import java.text.DecimalFormat
 
 class StepperValueFormView @JvmOverloads constructor(
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt
index c3351ac4c..4f706e911 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt
@@ -15,7 +15,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.asDrawable
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.common.habitica.models.tasks.TaskDifficulty
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class TaskDifficultyButtons @JvmOverloads constructor(
     context: Context,
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt
index 0bdaf10a4..1cc60c14d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt
@@ -18,7 +18,7 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.common.habitica.views.AvatarView
 import com.habitrpg.android.habitica.ui.activities.MainActivity
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 
 class AvatarStatsWidgetProvider : BaseWidgetProvider() {
 
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt
index 0c3964c53..9b2689c61 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt
@@ -4,7 +4,6 @@ import android.app.Application
 import android.content.Intent
 import com.habitrpg.common.habitica.extensions.setupCoil
 import com.habitrpg.common.habitica.helpers.MarkdownParser
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
 import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
 import com.habitrpg.wearos.habitica.data.repositories.UserRepository
 import com.habitrpg.wearos.habitica.ui.activities.BaseActivity
@@ -26,7 +25,6 @@ class MainApplication : Application() {
 
     override fun onCreate() {
         super.onCreate()
-        HabiticaIconsHelper.init(this)
         MarkdownParser.setup(this)
         setupCoil()
 
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/StatsActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/StatsActivity.kt
index 3332b620d..fa9959a69 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/StatsActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/StatsActivity.kt
@@ -8,7 +8,6 @@ import androidx.activity.viewModels
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ActivityStatsBinding
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
 import com.habitrpg.wearos.habitica.models.user.Stats
 import com.habitrpg.wearos.habitica.models.user.User
 import com.habitrpg.wearos.habitica.ui.viewmodels.StatsViewModel
@@ -25,6 +24,8 @@ class StatsActivity : BaseActivity<ActivityStatsBinding, StatsViewModel>() {
         viewModel.user.observe(this) {
             loadViews(it)
         }
+
+        viewModel.retrieveUser()
     }
 
     private fun setViews() {
@@ -58,9 +59,9 @@ class StatsActivity : BaseActivity<ActivityStatsBinding, StatsViewModel>() {
         binding.expStatValue.visibility = INVISIBLE
         binding.mpStatValue.visibility = INVISIBLE
 
-        binding.hpStatValue.setStatValueResources(HabiticaIconsHelper.imageOfHeartLarge(), R.color.hp_bar_color)
-        binding.expStatValue.setStatValueResources(HabiticaIconsHelper.imageOfExperience(), R.color.exp_bar_color)
-        binding.mpStatValue.setStatValueResources(HabiticaIconsHelper.imageOfMagic(), R.color.mpColor)
+        binding.hpStatValue.setStatValueResources(R.drawable.heart, R.color.hp_bar_color)
+        binding.expStatValue.setStatValueResources(R.drawable.experience, R.color.exp_bar_color)
+        binding.mpStatValue.setStatValueResources(R.drawable.magic, R.color.mpColor)
     }
 
     private fun updateStats(user: User) {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt
index 83a07e251..080ab510d 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt
@@ -16,7 +16,6 @@ import com.habitrpg.android.habitica.extensions.localizedCapitalize
 import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.common.habitica.models.responses.TaskScoringResult
-import com.habitrpg.common.habitica.views.HabiticaIconsHelper
 import com.habitrpg.wearos.habitica.ui.viewmodels.TaskResultViewModel
 import com.habitrpg.wearos.habitica.ui.views.TaskRewardChip
 import dagger.hilt.android.AndroidEntryPoint
@@ -57,7 +56,7 @@ class TaskResultActivity : BaseActivity<ActivityTaskResultBinding, TaskResultVie
             val chip = TaskRewardChip(this)
             chip.set(
                 viewModel.result?.healthDelta,
-                HabiticaIconsHelper.imageOfHeartDarkBg()
+                R.drawable.heart
             )
             chips.add(chip)
         }
@@ -65,7 +64,7 @@ class TaskResultActivity : BaseActivity<ActivityTaskResultBinding, TaskResultVie
             val chip = TaskRewardChip(this)
             chip.set(
                 viewModel.result?.experienceDelta,
-                HabiticaIconsHelper.imageOfExperience()
+                R.drawable.experience
             )
             chips.add(chip)
         }
@@ -73,7 +72,7 @@ class TaskResultActivity : BaseActivity<ActivityTaskResultBinding, TaskResultVie
             val chip = TaskRewardChip(this)
             chip.set(
                 viewModel.result?.goldDelta,
-                HabiticaIconsHelper.imageOfGold()
+                R.drawable.gold
             )
             chips.add(chip)
         }
@@ -81,7 +80,7 @@ class TaskResultActivity : BaseActivity<ActivityTaskResultBinding, TaskResultVie
             val chip = TaskRewardChip(this)
             chip.set(
                 viewModel.result?.manaDelta,
-                HabiticaIconsHelper.imageOfMagic()
+                R.drawable.magic
             )
             chips.add(chip)
         }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/StatsViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/StatsViewModel.kt
index b3a6afa0a..83d29bb8b 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/StatsViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/StatsViewModel.kt
@@ -2,12 +2,14 @@ package com.habitrpg.wearos.habitica.ui.viewmodels
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.asLiveData
+import androidx.lifecycle.viewModelScope
 import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
 import com.habitrpg.wearos.habitica.data.repositories.UserRepository
 import com.habitrpg.wearos.habitica.managers.LoadingManager
 import com.habitrpg.wearos.habitica.models.user.User
 import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
@@ -15,6 +17,11 @@ class StatsViewModel @Inject constructor(userRepository: UserRepository,
     taskRepository: TaskRepository,
     exceptionBuilder: ExceptionHandlerBuilder, loadingManager: LoadingManager
 ) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, loadingManager) {
+    fun retrieveUser() {
+        viewModelScope.launch(exceptionBuilder.silent()) {
+            userRepository.retrieveUser(true)
+        }
+    }
 
     var user: LiveData<User> = userRepository.getUser().asLiveData()
 
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/StatValue.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/StatValue.kt
index 09c03546a..6ddd83490 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/StatValue.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/StatValue.kt
@@ -2,7 +2,6 @@ package com.habitrpg.wearos.habitica.ui.views
 
 import android.animation.ValueAnimator
 import android.content.Context
-import android.graphics.Bitmap
 import android.graphics.Color
 import android.util.AttributeSet
 import androidx.constraintlayout.widget.ConstraintLayout
@@ -31,8 +30,8 @@ class StatValue @JvmOverloads constructor(
         startUpdateCountAnimation(currentValue)
     }
 
-    fun setStatValueResources(bitmap: Bitmap, bitmapColor: Int) {
-        binding.bitmap.setImageBitmap(bitmap)
+    fun setStatValueResources(resId: Int, bitmapColor: Int) {
+        binding.bitmap.setImageResource(resId)
         binding.currentValue.setTextColor(
             context?.resources?.getColor(bitmapColor, null) ?: Color.WHITE
         )
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TaskRewardChip.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TaskRewardChip.kt
index 13c619c3c..73a1330c2 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TaskRewardChip.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TaskRewardChip.kt
@@ -47,8 +47,8 @@ class TaskRewardChip @JvmOverloads constructor(
         gravity = Gravity.CENTER
     }
 
-    fun set(value: Double?, icon: Bitmap) {
-        binding.iconView.setImageBitmap(icon)
+    fun set(value: Double?, iconRes: Int) {
+        binding.iconView.setImageResource(iconRes)
         var text = formatter.format(value?.round(if (value < 1 && value > -1) 1 else 0))
         if (text.firstOrNull() == '0') {
             text = text.substring(1)
diff --git a/wearos/src/main/res/drawable-hdpi/experience.png b/wearos/src/main/res/drawable-hdpi/experience.png
deleted file mode 100644
index a0f4a06b786766da2d6ca8c9dff32cc20aa28ece..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 390
zcmeAS@N?(olHy`uVBq!ia0vp^G9b*s3?yAI>n{UREa{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaOm0(?ST-3xsF&sX@rOc{h0EB#-p3_^>*BFlk-N+9t)QGd4i{lD1%d4=`=
z)rNl$<$j#2`2SSx|4k16A8!49b@sza@_%nG`Ty)dU_<Lopvl}NL4Lsu0`KoTBs3^2
z+<(7jiBdUGc)zEMV~EE2+6xc)niY850=KVx5VeAbvG%|CUG?sndDs3a?X>iDzWio+
z{uje5FE3tt%rwbQ_mOk^WG~&`!Vryw4!?yBcAqp&cc>{e@x85Q`qJsxzf*0N#kubC
z_2O?oO`G8ym3AcdT{hPY%cWB`mn&_0r`CPT_G7`t-#jyl4{-fqz56>lcF)rn&lQe;
zIeR9u>(3Hh>$0VPmY1?gMRMtxs^7of<n>eL=A6L5gr$oPPMyT29h$h*t@kY}i>dg>
b=h^rEW$^aQGiSB}dWFH$)z4*}Q$iB}ve&Vw

diff --git a/wearos/src/main/res/drawable-hdpi/habit_diagonal.png b/wearos/src/main/res/drawable-hdpi/habit_diagonal.png
deleted file mode 100644
index e16e1f5b68696707eef792e9e99ddcb2a4b0c859..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 636
zcmeAS@N?(olHy`uVBq!ia0vp^N+8U^1|+TAxeoy;#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz07TEL88gA_7VEerutGMO&^Aespz
z1_XjYtO2D#>}M=1ywZU5CQlc~kO<DC1PRu~iUv|lGZa7k|6lK>Fpv3&=8R1xLXB2Q
zW)s*N?H%5DsIL~h#-PjEdc;S;jqQA+jADzH)aHh1jWUL^H(5R2%rx01muPe0(n=4p
z#m0_-OPT_FmBlVh(tKf-{Lp{##IFL$jbeU>k~Ga0mOD6>&9Y$2_`s55_DHaJ*)HdX
zX<r|16qp_&94gDSWhwh~UzQ`+gU%{CbnoJbX!HNY6Dq^BWg+u?U6&JgK_2@5KTJ<!
zGAJ-WuHQQKJQri2Nc+^*O<T5nWBRsv(%S7Gm?o(NFY=IcsAS>RH>zytWZ$rP%A#Z6
zwS&b>((hFJ*G@e5bME@=e<50ZQ&Vqp#b}paO89;0>I2*Pe{`J=9Gcvc^sT<rz~Z~c
z!WBEVa5x+LR;^nxh2wPcd8V%24p()YK8FM|W(B(?2{|}SEYFzbk|C3=6tH%!&|(Ls
zE?eil0WHfG?qa^$duN+#l7NT9M*bI~UMm`p+1VT{f2ooqv{RE=_JZxZ)g`_n|7CX`
zc&^^ed!zC6%NJs?&L3NU?)-DR+$m~9t9FF<@|}#giyz&76u)0Es#)*F+3E)6ISQ>T
j-xgeVVEK03j5~f+K}~Zm&q@PepfGs4`njxgN@xNAq-x%a

diff --git a/wearos/src/main/res/drawable-hdpi/habit_diagonal.webp b/wearos/src/main/res/drawable-hdpi/habit_diagonal.webp
new file mode 100644
index 0000000000000000000000000000000000000000..c44f32a76be1c6c453345deff374d75436a2cf14
GIT binary patch
literal 238
zcmV<K01^LENk&HI00012MM6+kP&iE50000lAwUQag(J6Z11bOiG-r0Vj(gf`gxgx%
zmgb8~NlDED^zo!+3l@mGySrxrU4+8`HUM2pmv;h&{zE1Q;w>h7@D;qnWD5Wc%nc@M
z__n=a2|s;tJqtKm)y&}R#!)hXRJdaVv0B9da@U3)EXf5O*wS`du%@guVNcqqLD6xc
z3QdJf8LB*y0#q3+i9B@mhC*5BdSU}<DC-QJC812`K8Zuw9Y1swg|ZJ}=uGtOxD$p_
oAx49aAIdSdz8g;+?x8i#$}M5&VTY<5B5JN=8inMjz{4_>0?J=zHvj+t

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-hdpi/icon_avatar.png b/wearos/src/main/res/drawable-hdpi/icon_avatar.png
deleted file mode 100644
index dc4050d659261d08f5ced233c5d42dcf3b163e14..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 485
zcmeAS@N?(olHy`uVBq!ia0vp^DnP8x!3-n=yrfuw6id3JuOkD)#(wTUiL5|AV{wqX
z6T`Z5GB1G~%K)DcSN8&+*(v`g$9|a>|8-{4Hy~qj%oiXzHU8TqAOncvzD<eyvOEi@
z<|_!re3=sSWm3%Nbu#wPfrbc`1o;Is@aG%I{CwD8`fhW86WhZ0^ApeIpVkIir{n43
z7-Dg{HRR@^Rt1hTtkYvY|F{39R;DfL|2f2jiMRQ-nS+$__W1=DrwN<wQa$>-NV$5}
zVQ+T7!V<{^on^PC&$T}O{hN*Hu?@+kN9P{;CmE`9KXBU0rmq?u&tn~Y?-aY(R_sxB
z@9pTDvP?kEd$Zd^S<cO2v(#Shj4_X}oc=kuC})9u!iuO{;aZ)I7qSHk)y`Y{srAJ%
zr^N15DRQ`^wjs(uZA<LU1o^d_gzJ)+v(s6Q|KQ+fU1ZLz{UL@U<=>?Pt2Z_5dio_`
zT0^&L&QHc}Hm<c{K4}hJYm<J=Um|*C+E%I3cVG7(xbQnGYx~bD>8kIH*{;pmvPV9q
zc<MYG%b&rIU)}hcno@X`?~=vbvwho`BJ~$U9ru~aA7Xk}ob$WZLG$Nt^wzBvdcEf#
ZL*+NkNX1_TJit(8@O1TaS?83{1OPkd)5HJ(

diff --git a/wearos/src/main/res/drawable-hdpi/icon_avatar.webp b/wearos/src/main/res/drawable-hdpi/icon_avatar.webp
new file mode 100644
index 0000000000000000000000000000000000000000..55a6f8295aea0d741c3cd3674347d5089693b3c2
GIT binary patch
literal 366
zcmV-!0g?VvNk&Fy0RRA3MM6+kP&iCl0RR9mBY+7Im!Oc1Bxvpo4(|L#_R&z(wvprx
ze<VY0{(G8f+a@c2zB{c(lBDD!!y$9|HP0l5BoKVVn<VvCONQ?!)f~)Cmv7fLq^hCB
z&qAEsOFD2ENmAUL_<siHpY6$jGKlE^1jw;<&dRs3PJmhCz0le0;Zou-T`3%w3z65B
zVodFYcx0v;QC{Ov)0`B5Zsf1&0Oe!=%gd%;z&P*#KiU2P_`R(Bo>zG<sb}v|X|LQW
zds*2%tMXn@X)md;_e@~g9Xo;f>`4V^I}M=9p<MvYzS#z_?1>b`EZ!JjCc4OZQ~OOW
zns(C61>-_pJF5m~4xZGx+S9WU2G>XU6BZw?@Zu+*PA?+QK-cV!b5)E-Bmqn>SN#M?
zA{|&xF1rPEF#t`jHvkh<ycbm{%HFf8{D3JRPT;4Oy=Rxo0KHrv0MQISACJWEvWVpM
MQ5J3MxHqa75kgR}8~^|S

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-hdpi/icon_dailies.png b/wearos/src/main/res/drawable-hdpi/icon_dailies.png
deleted file mode 100644
index b0835b5680120f06c91e44b8f40a1cabd24a1bdd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 345
zcmeAS@N?(olHy`uVBq!ia0vp^3P7yL!VDz6IJP7KDVB6cUq=Rpjs4tz5?O(K#^NA%
zCx&(BWL^R}x&b~Ru9IWGxEJ_Lj`;#Yv0o?0d|#URAIP2-^KEj>=NSoKCdGc48UrN1
zPKx;)`Z~@QsFANE$S=5o;oyT5RgOi@pT&!#r=&`l+y=^Q@N{tu(Kw$hAR;n_ON6C)
zsX`ND$9Y>X7Q@tgD;-(i+_P+AX}NFP$hD{XIET=L>hBCX3fKO=o6E#3@L_ND6E2~Q
zx^|XzoJJiApYPlHrF6ImR+LX%$QSxRv-z%du%m>)<Ld7%j9Ka|Pxe+fXeqSEGQ82^
zcu@U)4&&8H<^3mw6>{D-aGa?Q?-1yy{yxi*|3$LJhU)K42l=n+r|~$gVCv-wsygvU
j^S}y`i!L9|GP5!&F8(V}ydt<A=ynEAS3j3^P6<r_+aZPb

diff --git a/wearos/src/main/res/drawable-hdpi/icon_dailies.webp b/wearos/src/main/res/drawable-hdpi/icon_dailies.webp
new file mode 100644
index 0000000000000000000000000000000000000000..93099b7dd9e10d6f7d722b7117a625405ce65630
GIT binary patch
literal 238
zcmV<K01^LENk&HI00012MM6+kP&iE50000l9{>mtcVH@#je7{He*#~whJv<jn3O+=
z!Tg78fFk^Vt~s^=0G7$<<p1kzqgVp~Yr>g}a}(l$bU^#)A_tU_>{W;S{UtXBZe!b4
zmHQ*yHT)%f=HM0*dhC?IPzf=S^CGMOdY}V~DC0fuL-UCKPXG~_UQ%92T^t(H2~kxF
zE~$=#3UEpmW|DsjEQJsvkKu!e+F-|N3x3O}YQUb+xu$TZ=l(nnfRjN9%rvamECn-<
o5p;*&;3TGn+5bzz#wlZx#z-(zI2WK9>FIdPH19~Xt#HO(0{S{@#Q*>R

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-hdpi/icon_habits.png b/wearos/src/main/res/drawable-hdpi/icon_habits.png
deleted file mode 100644
index 356e8d066c018df733bd92e5ea82cfe72c937d4a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 448
zcmeAS@N?(olHy`uVBq!ia0vp^`arD6!3-qpJ~O=oQY`6?zK#qG8~eHcB(ehejKx9j
zP7LeL$-D$|Yyx~jT-^(NCdYo69QSov+?V;8|0l<MnGyeea@^-hv0o;|d;v-UNe~0Z
zo)Y(ca_rYBv7aZ!d=~uXc>!pSa7mC~Fhh~A9_JSMhC}aWU4FQ<=ciR_*k%?<praU>
zJzX3_EKW}ic|EIDf#XPaR_4~d|98J*$}IKUX1M=T_Jl+S2EK}?$1-;-^eJX?mq#35
z+idw;f7`oFno6}#G;Z6^IMbOMJN5OY0>_gJ|6O9QU;g~*I=%gy*gqGE3iFgCT=kLs
zw#xM4<W{?B9_F7K=XieLaAvfBV%>Tx-L88^&fa@l#9sS3+!Ow>S?d4vZFfG~UYo-x
z@@aKwMaNv08yy)Zf4fN<>^L00M*6AsHwE@rJ_TLgC5-_$xSRi*_=N83J-#L3z$L#L
zS<zig(*mRZbS~_3KM;HDykpJ&ko{NWSN>Pg-v54mN!^jpnse(v{+_h&{x<nbr~fM4
nv%mCL?f(2nfB%&I|Ic)Bg>J<(LGBg6&|>g(^>bP0l+XkK@0`&~

diff --git a/wearos/src/main/res/drawable-hdpi/icon_habits.webp b/wearos/src/main/res/drawable-hdpi/icon_habits.webp
new file mode 100644
index 0000000000000000000000000000000000000000..1f31a2afbf9107b5f9236115652556867b522008
GIT binary patch
literal 346
zcmV-g0j2&@Nk&Fe0RRA3MM6+kP&iCQ0RR9mE&vD+pP;C1Bgut4)aQHb(lC&=O_+Zr
zlXeeh3fs1AnEZcmI;|*@q&9l5eB_J}tPp@|q;KZrrMLEc8g`OkiJwc^CuQQNAR@pB
ziXZjhFp{J;I=lz*%0F4LxcdYm`mexk8>KzQ!NDJBMd?zheZy9AFoKR~OF!ll<sPQ=
zD?UMN@b+s~wSq{qiBj+zzA?`tnFXd8H62mfilg+VH!C`(a1Ru5c>^&Bx}k2M2%tcu
zODYIIBC;UxRe7a)6;rMj2g)3Wh?!is$=3UO3ON>t<OVbXglNZE9x{ovmdy8$r@;BD
zd`M{Zm@Ak&IkalZz*nGH1E$VBqV)ww(0yjYjsg38cqgehg1OaY!!tGD*%S6=_G#??
shGin(X<|RC>^Fh?o^jt|_BUep0)^`ri2Hrxem%M0=6}8X-2Vyz0906{q5uE@

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-hdpi/icon_settings.png b/wearos/src/main/res/drawable-hdpi/icon_settings.png
deleted file mode 100644
index c1de183e0f7246be3e07eaf17eca8ab7860c2660..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 547
zcmeAS@N?(olHy`uVBq!ia0vp^IzX(&!3-q-GkfX*DVB6cUq=Rpjs4tz5?O(K#^NA%
zCx&(BWL^R}P60k4uI>dslViV3j{P<{<_i$bOaDJP_A3a*e4Uo~V+xE7Rs$6OGA;fa
zkemWUao;Azew!5YS;SE@5onrdNswPK!_}Ji2e?k{STE^5X>m#W4~<9B=9zn0pWgvm
z9p~xd7-DgHZ|KcQEebp$PdVBvc>n)joz0+X5v_MFFIP^ZmF?0?m6E&9mo3#|`)ez~
zWV-EMQz$FnWBG>OEmqBu{b`kK>(6y-oB6B~XA?9FJX#x+)7R=4mLb^5tKiHl*RWq$
zR{T*0Td@)AlMLSq!wZ?4!Vg<o{$Sb`%rQCS_l^cl_nwJ*4^})&E;}qeb)N3?t!c&v
z5!U_Y7FxHP0&ksBUBI+h?B?k`Uy{VR!lStzF8AJ_eR%ca_O0HXvu3XT@00caP(SCf
zN5^_D`Lt-Q+R@G*>3a3s4B7UXnn$O}N6decsP=2m1=qbXLFYDXnbRVwuaLKXd5(7(
z)B0)eQUpIMXlHeQ+V!MK>CNqf{&y~H>RhmC=^H7h?P&#*HU27^o1FTqF;Q-5M)W7+
z&z_M>n@V$8qqj2s4A!o=l47MOzeWE^#bt@Brqj+{*S$V{TK50-pMw{z<)6UzX-nb%
dZud>UnM@`b-~N9&)C?FE44$rjF6*2UngEnM^eX@W

diff --git a/wearos/src/main/res/drawable-hdpi/icon_settings.webp b/wearos/src/main/res/drawable-hdpi/icon_settings.webp
new file mode 100644
index 0000000000000000000000000000000000000000..12b8c1bea776f47f707ff99b35289fc69fb62be0
GIT binary patch
literal 438
zcmV;n0ZIN+Nk&Gl0RRA3MM6+kP&iDX0RR9mD?kbmub`-HBPk&}{NJ-jXeemghVjOq
zz_4D#ktCxJ`G@PrsEH&=xs2f%{L6Vgp9jEHf}88)>zDj5rNO!Ue63ETNHZ0ga3Y!D
z;lh2W^}t8~kS1tZ?osgnzdEpakLbSxw{0Uy-r0LMp483!0bZ1($SIhc1mu;sd&CL2
ze*i^J4rJ5h(!l1em>zgWBUGxmzPqtPV)Yph;%}ns<q-&H93fq(xfkrkl8{s29wgh!
z93*ry@nASCgF6vViYH<TigUil&T~Y>xD2eRxsZ!XX_k;B<gkHlWjq^_vNy8|W)fBm
z4JXy1bKkWa+8ASUuzO3sov;BI+AvGGT6$)U1ZV}$uyZdKYEBG$_}nV&09{6~gz*&A
ziJj7jP5pwa_IBYt$ubSM%DpYuEr<^6cQza;!+V5?<QD)gb3=R_GLl^IBEZ8u{zB42
zUy1E2@wq?RD$ixW4A~0LWb4t)KD!ql++$fix_2it!QY(;*Jce}oi#7bFc9?QY=kx4
go4IkicHYirx#ecL`^EKyuleXTO@_!RS$I(Z0E08tfB*mh

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-hdpi/icon_stats.png b/wearos/src/main/res/drawable-hdpi/icon_stats.png
deleted file mode 100644
index 829ce553ecd8aca2600cf4b9cfa79669fb3f4944..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 527
zcmeAS@N?(olHy`uVBq!ia0vp^S|H593?x6vT4n+%mUKs7M+SzC{oH>NS%G}U;vjb?
zhIQv;UIICm0X`wF?gc*Ua{o_``7${cgr>%Qog529K=#)e$zLbOe}hO(kN+_RC>Zm3
za_r~%3I8X>e3m)9?mo~Ep^_lKU<S6Qi#8gi9uJVP{Zg;mHtnVW+i9tvK<mOhT^vI!
zPWOi1WNKF65!Q%MJNNj%ec7cT8#a&m1>A<d{Ot<`Hh*=F*ZD0db;r8yo~qlMHn|7>
z?F^iYZ|!-(<m2>5FH+GU>^7gaopSQ-HNQ8pU2S%ql#^Beo7G34(PNM4`G|*I;=IYK
zU;pL_-#sFh?Nh5JFSVsk(lq(HuHEGQrH6HbXV00Led7s-bZ@{#gNm*9JD7aW8ivn_
z;6Eb5E&50`Z|73QgQpG_D^IUnE74VR{2K4KNtI2%b_vf^<y>IYwk^!l`?`;{tiWc6
zx{mcc5g$yaADH`B;^@q`>!WsVm?A#M=2mXMoW<?bGh6&-y}uSYUF}Fs$cFn(zrWtP
zRr2qWVa!Au*6oc8&6iZ02`|4{)w8hEKUiyKIrkjl-!geeU$)Jg`mnUnRZM)M?>mN7
z*S|hXU8K&zciTI7=3a@Tp?@U*H(q7!=P&rY`JwC*mfd!4&D)Rq-{HS^L0x$<SLZ!o
P_%nFA`njxgN@xNAQ-bE$

diff --git a/wearos/src/main/res/drawable-hdpi/icon_stats.webp b/wearos/src/main/res/drawable-hdpi/icon_stats.webp
new file mode 100644
index 0000000000000000000000000000000000000000..6d975f1818aa8c0e4859d593fc9e72cddd21a517
GIT binary patch
literal 440
zcmV;p0Z0B)Nk&Gn0RRA3MM6+kP&iDa0RR9mDL@Jkm!J@mB&RQc9NPIae9%zPwhfcA
zDEs03Q`oj`qs;dIZ?_dkl9b%<4tJMO$e(y1fB>)|D_64jowx4U@uV+$Na&a!{S*V_
z5B_5k7%$P}8P5xcvF%imngEMI%+i0g@)AB3MD(A5BdKk`y&W-U@`qzeFQ#LY-uh{k
zxMAs~R!i6*UgN*qaW%KaW{62%JGcR(1;JGL*r5M{X^*ddIN7$O02p~%=$4$=CTLEB
z;;lTvoh-AE>HvBMhxx()UVyVw(OoL0=j?WXKNk=fmuF{7Tmg)bI%4YxvhM9{yS4N1
znkL-y$=g0j`YCYxUK(O+0Kt2iZ8A8}E@U)g78mZ?5j10|a5})5v^4B3sU37_n|F|a
z9p*bz82i!ncm&=%7n08jZUln{3&pd(#?$57fSJXqqGh?q;Q`x&V?h%gXuaGQ<e2aS
z6Ou25#;@|Pp0(@@K4I#m=PqwF+=;hHPCOYs8eVYP5|OBy*t;Xjv2lllwjMdDDC#RI
ihQ(;yvQBDl3$a&q%U>g4W7D6AqEyv=f475}r`8_X%Gi4V

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-hdpi/icon_todos.png b/wearos/src/main/res/drawable-hdpi/icon_todos.png
deleted file mode 100644
index a785c45f19ae16eefafaafc8a17e1cb6d5242430..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 551
zcmV+?0@(eDP)<h;3K|Lk000e1NJLTq001@s001=z0{{R3JrC$X00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#Gf+%aMMrQ<lU?+aUG<Y(^s9USlU($ZT=bJ&^`2z^
zlU?+cUiOn+^p;=ulU($cVD^(-^^#okgW=ej0000GbW%=J0I+k_1@*y>4dpw6Et(lz
z(-JM&0004YNkl<ZNXPA#&ANmj2!{Pl(K7G<YENpGHjuTM=PZUz3wq-d5Mu0S|JKyo
z_nqLNW7LxS`6*-t#KxouPa=68F9zd?vy7i+M$}qE0XJS4UgY`_RTym!S+jvS*{psQ
z_LefeyJW;pTXxWrxU3Kyn%*h-Fqg{Nkb$NmmQs;p-BDO-f~I8LQ6<>&mSX8-U}*}k
z`AoTPDdvw%sTUOENn>eB-bhsqrHG^P?U`PiEJhiPbb{W!x#pE?DCKrJeTyWwsCB5_
z%i~#<?D)v^Q5kb^9aVCsD3K@EQ*1#o*i&+HJ$0lSFTlz5RQ~RSx8!`~PRikJ>AGGp
zSE?KhxgSY{wjI|{Hn~9&7ss?cx-{*yP*=xZuBi>zBj`Zh0emO~s7>@{1cl-uHqcBA
zJeOl>HyFxG*RXak#yTA4&<=Awr25q%d|e%z!u5W6IBZcxIo@#MV=Zd`WQzyUMFeU;
pA*JwKrj-v|xYz#+zhA5`*dN}ZBe+Ky3OfJ*002ovPDHLkV1icu`r-fp

diff --git a/wearos/src/main/res/drawable-hdpi/icon_todos.webp b/wearos/src/main/res/drawable-hdpi/icon_todos.webp
new file mode 100644
index 0000000000000000000000000000000000000000..d3013aab1d421b42923fc52f27ce08ea63e5cd0d
GIT binary patch
literal 456
zcmV;(0XP0qNk&G%0RRA3MM6+kP&iDp0RR9mH2@6|hoGjB6li#q;=iT@8w%RCkzD>5
zM)bQ=*tTsWr~kjZhm=OLoqP>(>A#Lt5=EMsWB^PldikqMt?@;Ph8*7}M6#bde#V8+
z%7-@3QII46Y}+;j32=#~@c-vVSmdd_MfBf+B&l%&Ob$u5iNujNr2iAm*YCGiXC%Vf
zpZA);VluU^a%IJX<SJiS@K%cGJeHpx<vyP^I}3S^ks~;by?7^61F>bl1!qjpE4dOH
zQOzOQVwSgipaw)c^dND!T27$QAujPbO#GQejO|0h@8deDeq(UL3<jg{=sM{!&L-a^
z_3yh(fDUFDnB?e8|C7(V1~Dc^0uPl_m4pSzn~2yC$j_@K9%@<cq{2Wu1g;s8FqK)D
z$CQI#Z1YGXCM=fNrf?27dL!E;&d+JV@PD;M*ufOoPUKCWG*l*rCJ+pBfzK_DMCJ0r
z{Q1b%dpJkItp-s1eZvyVwv)<JScUA}Dp#aOIoc({6?L;1+ovUefV0o)^nd4_g6&R$
yifdhIJ-RCq;Tb9IN+GQmI_E-P@X6_dmgOwq1?iT)Pp?RX+}FPU4<!BLY61Wi4c@f?

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-hdpi/magic.png b/wearos/src/main/res/drawable-hdpi/magic.png
deleted file mode 100644
index 88a1f56071d3ddb61b0e0797a20f2c228cfca36a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 422
zcmV;X0a^ZuP)<h;3K|Lk000e1NJLTq000~S000~a0{{R3Mbj^)00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#T~JI^MMrQ<DU{1El*uTS%_x-1DwfYFl*}oW%^{Z0
zD3{DAmCh-Z%_xn+U$EJe#o$o2>6Oanr`q(M(d)$G@~zkHgu&o(y5KXL&_AZ!P^i{E
zpV5KJ@VDReW3}H`tk}$FJh}h?01I?dPE!DY_h3Sgpx+Q7%8U!hF8}}l&`Cr=R4C7t
z(%BA!AP_)N*NToHAd6b<|9@r&m(~cFme&(*U?53;UiF<-MI0Yck(lKGP)4IL0Ti*Q
zHB%&vQKP91hB5l$nvTIRMj7XnhQb9#x$HHi{)tHiBj<guOdwo>)m$M;KfFf~l@~su
zvy#dSZ_!x@$<`CwQ@93Lj1gi*#^{7w(*ql@UDrK#)LGl&3)J7?>?%K&pGOCSQ^|De
zEIZ$nG@DAZT2)_1>vRd4yAJ9Qwj@bW2ec;m+Nc)bLH_?>IR7lY`PG-?8!!nFzvvRV
Qi2wiq07*qoM6N<$f=ENU3;+NC

diff --git a/wearos/src/main/res/drawable-hdpi/watch_habit_negative.png b/wearos/src/main/res/drawable-hdpi/watch_habit_negative.png
deleted file mode 100644
index b33059881f3ac3b198c092dc43a5e8fafce87491..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~n#0(^#-%mddq*&4&eH|GXHuiJ>Nn{1`8H<D5
zofy`glX(f`@C5jTxVjhk{D%Ry`4>Q@F_#4S1v50%Gx{4?0J##LE{-7_*OPAmmGQTM
f)F!R~65I^Ir@0k8GTLqc)i8Lv`njxgN@xNAUqmvv

diff --git a/wearos/src/main/res/drawable-hdpi/watch_habit_negative.webp b/wearos/src/main/res/drawable-hdpi/watch_habit_negative.webp
new file mode 100644
index 0000000000000000000000000000000000000000..3fc69f420d6ba1159804aa0bada81c47c68615dc
GIT binary patch
literal 58
zcmWIYbaOLeU|<M$bqWXzu<%g>vi12J7zE@E{(rXr&(zfPG?u?aB4I+V$`ogdme1|K
N*1Ng<f6Vbs1OVmZ6ukfd

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-hdpi/watch_habit_positive.png b/wearos/src/main/res/drawable-hdpi/watch_habit_positive.png
deleted file mode 100644
index 2828fd1c5c0d0819aff6240f5b1fae6bae50269b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaN10(?ST-3xsF!vNd-3n0^&OM?7@85-&t{S7RDTrE!*#}JO|$q5hg5)u*~
w*f-3*0o1_X2GW(d0!VP@mGZpd<4Is(h^!LfaQa%20@TIe>FVdQ&MBb@0LDT%^#A|>

diff --git a/wearos/src/main/res/drawable-hdpi/watch_habit_positive.webp b/wearos/src/main/res/drawable-hdpi/watch_habit_positive.webp
new file mode 100644
index 0000000000000000000000000000000000000000..08b4b0e5405bfaf7779c488c4c385d6715de58d8
GIT binary patch
literal 76
zcmWIYbaQiIU|<M$bqWXzu<)?}vi127Fbl{V{QqqKpQ)+oX)J$<M1#h*+&k~t1sz%b
fmMe99;4av1@8t5oSvcTkh1J!+rGcK0`4|`grnwub

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-hdpi/watch_habit_posneg.png b/wearos/src/main/res/drawable-hdpi/watch_habit_posneg.png
deleted file mode 100644
index 2be2812fd2e427c26c1e27fb4f155c2d984c11f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1354
zcmeAS@N?(olHy`uVBq!ia0vp^N<gf@!3HGD`&XR=QjEnx?oJHr&dIz4a+ak=c&7RK
zGH3zW91LuXLJZ6xB|yl)D8;}EW-~B^F-pVPaf}*JHB3M?h73TGK@^D7+A|qgpz3RY
zGzfSAG0-Fk9gta(nv<JYl3%0{P?WD=q-UaM0+eH3z=*JO0TbK|r3K7zwgONcgX-P6
zx<HDvz$3Dlfq`2Xgc%uT&5;0_k&_t`Q4-<nW0jnrtCyIPpOmUsky`-L#b8rm1!U%?
zmLw`v<mTiRTUFR9fmK)m*&tzkB?YjOl5AV02;Tq&=lr5n1v5PZJp&~>E(HYzo1&C7
zs~{IQsCFRFRw<*Tq`*pFzr4I$uiRKKzbIYb(9+UU-@r)U$VeBcLbtdwuOzWTH?LS3
zVhGF}m(=3qqRfJl%=|nBkhzIT`K2YcN=hJ$-~i&z)QU`mO?kyoZvj2150cS0)HBe>
zrVZ#>xcg9aRU{VR)Krq0hQlt93`83^Fd%NU0lB~m9HEgenYpQX#X$eq85`MvorWQS
z@EnrH2qcXr$QqF(kTe3lW#wFy3Q9g9`T03^*iw^?KDsJ21AKweosw9R=#p5HYG-5s
zj4J~(T_ej7LnA9wLn|XQZ381K0|SULC~A?+0R@OvL{MsReoiSU8tu%D41hr25JcMO
zV@RWGMd%F8%Pg@2h8b83nlQSqNQ68#3z4PKwfYxjrUDZq*sX?8+mOYe>TUEv=@BV?
zLJ~h%6qx$$xPZX|%Sm=z8;$2Y0cNhFo-U3d5u9&B5Aq&S;Awuvwlj2>r~5;*muY)_
zGjwEyx;#{i0=_=<2vtmYyvxDKK<W9MCypw~r!JIixv^kDk89_pd0*qw1iya@>L`0-
z+4mqMA^Ft`(bpT}?XMR9%XObn<>@w0?a!?K;12QYG3WNkXDxTDs|;>cnZG$wx3&EF
z%Z{=?rzRF@or+GrxtzJAf$sq0<`-XYDZ75sov~J2{d2kIs(AKwyn>4CTHBQQ4C3yt
tc`K@(8qZuA{_vJe&2DCA4%r3F4_OvDbZ(NU4u}C27oM(uF6*2UngAS(kAMIG

diff --git a/wearos/src/main/res/drawable-hdpi/watch_habit_posneg.webp b/wearos/src/main/res/drawable-hdpi/watch_habit_posneg.webp
new file mode 100644
index 0000000000000000000000000000000000000000..0f42a55c1fe4c34f1f017c3d69b93674e37bfbb1
GIT binary patch
literal 96
zcmV-m0H6O-Nk&Fk00012MM6+kP&iCX0000lA;1R^Couo>KmP&&G9<+r0WL-mj3P-=
z)B{F#rOdW}RlRiZkLdpd04T>U^LvWY7pQZglrI2aV)q-$w|>5LX$ylgZnQ3K;o|`Y
C$|WuU

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-hdpi/watch_task_add.png b/wearos/src/main/res/drawable-hdpi/watch_task_add.png
deleted file mode 100644
index 9388cefde219585872c60c3ec8afa4396e71362d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 232
zcmeAS@N?(olHy`uVBq!ia0vp^GC(ZN!VDzms(q3NQY`6?zK#qG8~eHcB(ehejKx9j
zP7LeL$-D%q4DbnYbuaMwj{}JPmE{8}<0uL83ub88FJbV$;QXf^o@k(0xTlL_h{WaO
z1O`U2ULiJ>gj*N08jhTO@xsI5kyl9x$Awv^=V)kXthjh_A;*$Qk`gi20t>D-E@bMw
zz3@Q8nb#Q!7aX36EqLu}JTuSkkl3V*hi8HoG9@xFR84c_UGPtQ6VM6<Pgg&ebxsLQ
E0O^ulu>b%7

diff --git a/wearos/src/main/res/drawable-hdpi/watch_task_add.webp b/wearos/src/main/res/drawable-hdpi/watch_task_add.webp
new file mode 100644
index 0000000000000000000000000000000000000000..489844990646760d21bd46aeeb9555d07740314a
GIT binary patch
literal 132
zcmV-~0DJ#ZNk&F|00012MM6+kP&iC)0000l8-NB7M=<~MKmSAmq(LVTi9XRlF2n%_
zPyn`(Y&ZE5HgpYm8sSqAM9OimZ_RiW5Yd0NZQC&NmR`Oft>N9sq!UV*xPi>X1LO(Q
m?9BWE2Q&9{!6YR=BPd{|e$A9Nvn4I{+u45Q{>R~4NkagrFE~E{

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-hdpi/watch_task_minus.png b/wearos/src/main/res/drawable-hdpi/watch_task_minus.png
deleted file mode 100644
index d0af9df8b21648dd3d35666c42bfce7867d58e90..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 168
zcmeAS@N?(olHy`uVBq!ia0vp^(m>44!VDz2-)Xl2DVB6cUq=Rpjs4tz5?O(K#^NA%
zCx&(BWL^R}`~f~8uI>ds|B-<314Aj0zLFrnV21Y%6K*a1#R252d%8G=a9mGL5GrhB
zPGn;f7FSttK%wc3sKfJB3dOt<GbS!+mAJsb&`~BF+_YRr1gM3<)78&qol`;+0IJY5
A+5i9m

diff --git a/wearos/src/main/res/drawable-hdpi/watch_task_minus.webp b/wearos/src/main/res/drawable-hdpi/watch_task_minus.webp
new file mode 100644
index 0000000000000000000000000000000000000000..499863d081bbe03798fbccf73ff3a48e591b2980
GIT binary patch
literal 76
zcmWIYbaQiIU|<M$bqWXzu<$Vlvh}4J7zNY~{(rXr&&24|<g9&(xu!!w#AVVghol9P
f8D1LyQf0-Ie%UiB3)Ou*BDE&GXRC0Ew<rSuLxdO-

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-mdpi/broken_heart.png b/wearos/src/main/res/drawable-mdpi/broken_heart.png
deleted file mode 100644
index cee972753d924f37fa5055aef37e0390f87ba212..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2343
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
N002ovPDHLkV1l9tct!vK

diff --git a/wearos/src/main/res/drawable-mdpi/broken_heart.webp b/wearos/src/main/res/drawable-mdpi/broken_heart.webp
new file mode 100644
index 0000000000000000000000000000000000000000..96bcfc969a905e75afbc1fbf6091a53b96d587c8
GIT binary patch
literal 1290
zcmV+l1@-z;Nk&Ej1pok7MM6+kP&iEW1ONapEkFwp&j%@zBu7$Ib?<2{zDN8R9fHHL
zuMu4pG$2Hhq}ZxndY`|J@88IG!hCyEkRwTwq(oH@_x<CA*hqx}$g#hft_%l}Z41dZ
z;79mTFp3dOU=)W4CXfg;@S1>20t4{x{~svOCbN}^uE_MBsYlYia{Ct13;|G}P?20f
zq4pwy9iY%BBGX1KH+AQF+?2y9CW=vvCRCkpi-HmVXo8>|2$e{MpwNWs^x_aHU1Mc%
z2oZOsuA>;mSZqLmEcV(vI<fZVhnl#ske01YmuM{oy~IyDJe^(+Pu)i~ffSXE|53s#
zk-2YuzxYFY>5Z<4t!iRMH4u!nor^VG&{%B#gMvt*0m33ub%hF{YJ(O6PN>>2;VDoP
z0tz5Y0u3VxPYF~aluE4#s0cWchWwB=K^Sz-q^T2_6bNfn-J;cKGu6_;!O<-P$Q_Tk
zqNCQCs}1fjH2#*nX*t^L2fvh6u*`9X(IVx-A$x-|Yq{~r<9wOWj=Kww5-BXHj678i
zw=9Wh+CNX#w((NFpT1qV<3DcJoeOv3yKu%2KREGx{bsNb-0>)SiIhlL8Sw^0((f93
z=}OKc7iH%4-ErR@KOv$@&Ng$1UC!GpV4*5(P+7<I{Fq<cAAf1=@AGdA(ynbYB&Sw!
zma%Qywr$&1$F}XHV%xUUv2EL5Yu~D=&M$c0i2g%x+eVT^SECAjxn}lwgwV5rVV#X^
zv6IC!<zlk1+>tNqW=jCG*Vy2hzIU`?nFL_BSUp>6S-QdW5lxxB&iF}}Nn;k9p2Fl|
z<#$Vxxq1gnl3ne4P1Qf}O0t0&TO2-^y5crTqCK=k!MHmmI=C1_7b{mQ7(dWq=E|w*
zV$OPMw#1a?CHS@rpw}n`s~Nyphh+bg)XWXH$%Wb*<dimLN^sc@F3BL>NQ&zz{NRYt
zX0>AGrmi)<pPHF}P)*8}U{<qh>zKnWlyBNxvIKG5MFTr|3LSHbq-Op}{H4cjx7odH
zmVg>9mG6S26w&xzHns<3PN`q`qZE6TjlIbg6f@;lZ7QBNVJ5GT%nz}D6F(9Jf6C?=
zlK3Hj2oFw}?LYYF2Sium1>?OprYVLJCpdXFPiksj1o;U7p~0CnRqX65tc|4pO5EVj
z+L5oVFPqPG?&~nO*5rz&L?qPbW-idJcfaY8*3Xi_&TBYxsk>8K8!rXohiDaC!R^tf
zzr$nbAKVHF;PN#9r!Ewv-U!6eDzX>oJHTP)q59wQd}Y!}1-SV%Lzdim@Kzu!W8|3}
zx$_=yn3;#Db67<F*UXW?4g#f9GpEb)S|EA0>^XDi0U9~P1PRO$Bx`3$pbH&EQ#1Kv
z`Jm1Ks6~$v62N*vvr3tEmbm^*N%KqiC4H_GHlAB3^emIWRyy5!mO6dbZ14OK^-G?@
zhv__30`r6csk%bPjjGw0U-<z@T;E}4Lzf}6>b!EglZ(39nEeo#C^Z*36nT#RBQ(TN
zb>gB60PXT;^NW%qH8XSdLjw(6000=Ows&=DI#!C6DmBgHy`;+!W7X82u9nnV?rx)9
zh8U}W;l3P|AYC?DAVE%=JlrDz%vvSvvVIOdsjIU|0+_Q_SZ6*N6MHKB@G9BFqJP3e
zR+E!c2fL}Ok+ZW_2ya<GPXfT`RsewIzA8PG*|m8nvupEEX4mGe%+&UO?qb*h0M%)E
Ag#Z8m

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-mdpi/checkmark.png b/wearos/src/main/res/drawable-mdpi/checkmark.png
deleted file mode 100644
index 5ef0f45ab579f35dfbc0d1311e224b75e4d522e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 330
zcmeAS@N?(olHy`uVBq!ia0vp@K+MI#1|;*}T{!}zI14-?iy0WWg+Z8+Vb&Z8pde#$
zkh>GZx^prwfgF}}M_)$<hK>E)e-c@N{QI6Rjv*C{y%P>{9tsd}NjE(*d4kZT#?B5G
z*ACeX_FIi%3&Ir25;)5Q{1q1*+TJ|nfg?X#>RtKHmIQ-hsejMkp3z&lsOI?gyb2#)
zlW%UJFZ@n2F1R*Xcy$=-i!JQZY*8#n*v`oQW&h=E5SFx_ZFb%gKEu*GaSjT*&pq?7
zpTeNfRvohNlHFSMi{H8@9Vo7`X5MwKU=CwKT#AF$fnpm*jReojb4wp_cOGqV_@~Qw
zU0rnDC*DhQyB3_gHc#^QX0GQ)ZTGjIXrAwOgWKRBf33gVN{>|^I}U90*=3S=E?|-Q
Yyqi(~cTR8b0eY3e)78&qol`;+06vR<ApigX

diff --git a/wearos/src/main/res/drawable-mdpi/checkmark.webp b/wearos/src/main/res/drawable-mdpi/checkmark.webp
new file mode 100644
index 0000000000000000000000000000000000000000..f8a8220708f3920cae417bc57cc71ee6ba6b50d6
GIT binary patch
literal 152
zcmV;J0B8SFNk&GH00012MM6+kP&iD30000l3_t=9k3b-4BX9Kn-ToSi+D3A`<qDwV
z59_{brfr+#E2i<MwbmfOG$Dj^^s7YhouB~qT>$}1_-6MJh=8EzX@si^kqiD06tt0~
z%-u8p`*({PBKl7-NmFgd@Nw4h!%6y3#C$G`4!jxnq=A>y5~)D9yQY%h$x4Jb3Gm6y
G3jhG=a!4rv

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-mdpi/experience.png b/wearos/src/main/res/drawable-mdpi/experience.png
deleted file mode 100644
index cd22d0e25b2d182a3090e9d28ec674a3c6a9439a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 324
zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaN*1AIbU-3xsF&sX@rSmFONWe{4f{C}y+|D`~-5?EXXDERL{>c35n|91xb
zU#<85Z1eBM${*(`{l7f<&0_OEHx~bYwC(A1<+ppw=G>nHvXi?c$S;^dz~TLZ{S68C
z6&woJ8SVuNH+Z@@hDcn_o!~9htRTQ@*vPRb@kjEz`b!yyoQ(IShF=%i5>%WQnskfn
z34>ymi?+$L`atE2p(Ro=ng?wBSQ@K%RsDad`ec@5rCz$K6tpV&i<eBp^VbITCVQoi
z&(-<-$d7sJTbDk`57XWjRnB+UcvQ?5>GHvxcgn=IQ}$<8-C|$*mG$2O&YX6jTNpfD
L{an^LB{Ts5`#p(r

diff --git a/wearos/src/main/res/drawable-mdpi/experience.webp b/wearos/src/main/res/drawable-mdpi/experience.webp
new file mode 100644
index 0000000000000000000000000000000000000000..45ace4f2b008632cb3222d6bfc921f2e39395a29
GIT binary patch
literal 254
zcmV<a00I9}Nk&HY00012MM6+kP&iEK0000l5kLeGC!wH?BxRq$zr=UIw0|}jH<Hw-
z@chU>PdIN_MUvENfqx4BRxpBy%*$~IvTdq1vZFsh${$ZBA>+yTK=&J6=mc0Qz_FkM
zod8(DUZ^#3U0gT7xTb3d5TE}+K6w{-2_LM95WPGsHMZboxq)FMxoKpFnVDtvU!+Ns
z4kG%m$ZgvuOFDJ_0-RI`Y!b1dwv7eN3$ZN64LK&YABwgzuEvd&$Cfb<vf<pdIM!5|
z2;1+n1ZkVgB$gsdt7cj@LI6vOwCf!Muw<&<Tbp;GwRsNaX>glv>-qdJ<gnrYUjTFo
E0F&NxA^-pY

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-mdpi/gold.webp b/wearos/src/main/res/drawable-mdpi/gold.webp
new file mode 100644
index 0000000000000000000000000000000000000000..3471f0f838973fd2ec6fe6ce9656e1f5a5aa1d2b
GIT binary patch
literal 426
zcmV;b0agA|Nk&GZ0RRA3MM6+kP&iDL0RR9m5kLeGXTrE`BS+Tk?&W5#>Z>olHn<JP
zjU*{j3@ki%kNvmp3}7B$6-ly_x$xct7pTJj4-#^?MF`1OHj@xS%`AjI!Xbp<>dQ8c
zgbrfKr(sI-F9sk&NJs=QG8dFE#*$)rNBLj>!62drGowf^Qa^A50s_&%1tXz9yJQHH
zq&v2*<bnJn7a~G%Lu3OWL`abY>A#fU#y+il?sFJ!-7PP>^Ryy@^s|yvqcXT*G#LfU
zJjr23D#-u{vTdhrei**YOj61aX3j6yPPG3GS>8iL|0e*-ZO1?~ojO!@Z0x3476qtv
z6h7;6Qu2WL0MKE97>qt{x6dJofOP=$Ks^6S<?oZ|+0aBzg;f8n?l`vGfQC|D^XoPL
z-fs8QbF7g5q|8rwejabPb4oPKNS5B;F5~TXOBq(ZzEtTc{Y#mj$K%qBV$<u>PRg(G
zdOcomw?_(`7V`VzXRBTj#|GGa@wiYeA4H%5)L0<sINfX}hk*!K4FG%=a8mLv^PybR
UF$l9P?V??S%BE`~8cqw!03{~HzW@LL

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-mdpi/habit_diagonal.png b/wearos/src/main/res/drawable-mdpi/habit_diagonal.png
deleted file mode 100644
index e16e1f5b68696707eef792e9e99ddcb2a4b0c859..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 636
zcmeAS@N?(olHy`uVBq!ia0vp^N+8U^1|+TAxeoy;#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz07TEL88gA_7VEerutGMO&^Aespz
z1_XjYtO2D#>}M=1ywZU5CQlc~kO<DC1PRu~iUv|lGZa7k|6lK>Fpv3&=8R1xLXB2Q
zW)s*N?H%5DsIL~h#-PjEdc;S;jqQA+jADzH)aHh1jWUL^H(5R2%rx01muPe0(n=4p
z#m0_-OPT_FmBlVh(tKf-{Lp{##IFL$jbeU>k~Ga0mOD6>&9Y$2_`s55_DHaJ*)HdX
zX<r|16qp_&94gDSWhwh~UzQ`+gU%{CbnoJbX!HNY6Dq^BWg+u?U6&JgK_2@5KTJ<!
zGAJ-WuHQQKJQri2Nc+^*O<T5nWBRsv(%S7Gm?o(NFY=IcsAS>RH>zytWZ$rP%A#Z6
zwS&b>((hFJ*G@e5bME@=e<50ZQ&Vqp#b}paO89;0>I2*Pe{`J=9Gcvc^sT<rz~Z~c
z!WBEVa5x+LR;^nxh2wPcd8V%24p()YK8FM|W(B(?2{|}SEYFzbk|C3=6tH%!&|(Ls
zE?eil0WHfG?qa^$duN+#l7NT9M*bI~UMm`p+1VT{f2ooqv{RE=_JZxZ)g`_n|7CX`
zc&^^ed!zC6%NJs?&L3NU?)-DR+$m~9t9FF<@|}#giyz&76u)0Es#)*F+3E)6ISQ>T
j-xgeVVEK03j5~f+K}~Zm&q@PepfGs4`njxgN@xNAq-x%a

diff --git a/wearos/src/main/res/drawable-mdpi/habit_diagonal.webp b/wearos/src/main/res/drawable-mdpi/habit_diagonal.webp
new file mode 100644
index 0000000000000000000000000000000000000000..c44f32a76be1c6c453345deff374d75436a2cf14
GIT binary patch
literal 238
zcmV<K01^LENk&HI00012MM6+kP&iE50000lAwUQag(J6Z11bOiG-r0Vj(gf`gxgx%
zmgb8~NlDED^zo!+3l@mGySrxrU4+8`HUM2pmv;h&{zE1Q;w>h7@D;qnWD5Wc%nc@M
z__n=a2|s;tJqtKm)y&}R#!)hXRJdaVv0B9da@U3)EXf5O*wS`du%@guVNcqqLD6xc
z3QdJf8LB*y0#q3+i9B@mhC*5BdSU}<DC-QJC812`K8Zuw9Y1swg|ZJ}=uGtOxD$p_
oAx49aAIdSdz8g;+?x8i#$}M5&VTY<5B5JN=8inMjz{4_>0?J=zHvj+t

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-mdpi/handoff.png b/wearos/src/main/res/drawable-mdpi/handoff.png
deleted file mode 100644
index 3656b0163951124c85ea423ca7b5eafcac03a91e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 321
zcmeAS@N?(olHy`uVBq!ia0vp^f<P?6!3HE{lEjRF6lZ})WHAE+w=f7ZGR&GI0Tg5`
z4sv&5Sa(k5C6L3C?&#~tz_78O`%fY(kblk7#WAFU@ovaP!6pM9Ut6|<mQ9VyFIcR)
z{2G*ZH0C_uNM$jbAXw1!>(SPjuU|Zp_g9p^mr|&7KcxI*Z+!E)=Z71oNpM81KR(x#
z$Nh`^D^XDg!HHU()gM%}7c1}huVy5bY$e2yEK?X`;dVA)B9q3O%dg+e++cp-^^=JO
z#YX)BPXufy&C>N&xiTks;mw%}FWZtoKi<eXH$|=gCQqvM+1oK*JYmVz-#obA-N*>E
z+&$NSg^cvA4Ij@23EnG+p0toLIdAWVrAL%xUmEVQEB>+7RQkT_W?RPilvq8%oakdf
PA2N8l`njxgN@xNAG!=KO

diff --git a/wearos/src/main/res/drawable-mdpi/heart.webp b/wearos/src/main/res/drawable-mdpi/heart.webp
new file mode 100644
index 0000000000000000000000000000000000000000..1667efdb3714baf11e7b8e04fe9f69104c93ccb1
GIT binary patch
literal 420
zcmV;V0bBl3Nk&GT0RRA3MM6+kP&iDG0RR9m5kLeG591(`Bt@!44M$?mzk<`j_b}Zy
z90p*UHj+|q$MFA&%#Ot%k|Zbd|A2-h2LBRpku$f85R$EI20wq93{rRoJ%a*Z^YjI|
zaB|3}c|Ex3FS5wuury~0_~G+;K1hf{Kt&8wh+(!dKom*bBl0I%z9d=2*RN-}L<w)b
z*(OVB@OSVV`h{P7Vjm*Hm!JRZ#~0<B?d=BQ>lZ)RrW!n$34{cgNL_+pSuPm@rjTMc
zF&8)pHYEYPAVb1HQc8vnAXEm_a!EHksjM|sj&9yu@cGAcn*I`h0Y-&wosD%hTF!&v
z(}Dv50L<hvXJp%MdC0c?|7Q&01rhz90PwG?Zf_x4bcKb)fIX(z-eNysw=H%kV$b))
zE6sAdXohL95|>BL0r{hWV76G3snCcX3b^ffUJ0$$SPZy=>itP$Djkgb7^&$l6hq0k
zk?@pm?Y`*1Cj(BM$xP+$Cw?IUb2bu=d)2n`m0bbp(YnqQtdMIn1M)Mr$v`1?1e7lM
OPMV(s<%{uT5B?bmmBJYS

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-mdpi/icon_avatar.png b/wearos/src/main/res/drawable-mdpi/icon_avatar.png
deleted file mode 100644
index 0de54ad0557238bf639805a269a6f131007a2f1c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 392
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1)!3-p4CFUFiQY`6?zK#qG8~eHcB(ehejKx9j
zP7LeL$-D$|Yyx~jT-^(NCdYo66az$Gm*o8iGN#6VpA!2OC<sJg#@ESl-zUd>nH=|Z
zQtW4l)a;bslVU#mp55~UXpV46kY6xE&WnE5pW5Y1t~7;P@A7}=G)LsN>>MSa^l48Q
z#}JM4rGb&tjwo=H@Jb0!FZjRP?1^Xl4dbuMO(G$gJrA@Po*HSdYw4LW?b5@7L$X%;
zO}(BP8p-Acw@!`=<I^ggx2jRjudVse@>F*pq02(M1I4vBhW7u{7q~j1B4d@`sb@!Y
zmA<9x-m<?xwO3i!W|Q<aHM{sr-Xh*f7x~I0F6)>t=<YvgR<rP?f>ziauZG^QA6nD9
z8#_Agu<!NwV4^kSS6oa==;N)d{jT%=uUOZ5=<#K%rUyF%KKM`hy}!Ot$n(bMNxghc
aKN;Q^2=&U^{g?vu7K5j&pUXO@geCwgo2p{~

diff --git a/wearos/src/main/res/drawable-mdpi/icon_avatar.webp b/wearos/src/main/res/drawable-mdpi/icon_avatar.webp
new file mode 100644
index 0000000000000000000000000000000000000000..4393384384edb64e16cd373ca07e05f9d5dfb6f8
GIT binary patch
literal 266
zcmV+l0rmb;Nk&Ej0RRA3MM6+kP&iEX0000l7eEFOpJ1kK8<*_(zq>+1LEAP=I{pNP
z^+iG3HjK-k@h+nP0L+|iP6^h(m-P$)*H6L!ROg1U$p3j)T2(Zo=UZWgNNt!>frw|r
z28WR(wb9|d8|5FZ1pH?Z(f<jMy>=-%E!Vp7UQJ)v$#&W!^8lmP0X*iU!}KB|enLMm
zfR#@Rm|cb@+Xi{pAnqcx|7EDV3V9b`nJ=>->}0?&FEe1sp<S?AjBUZPC*l^{<>XL@
zROi>MDd;a1A1<G$UX33%5lO%(>97nSiJDN99IFCTc^Gm%z!%7O8A=C#=b$wx>Z(9<
Q{MbqVO;@7wxLPwQ0oS5=j{pDw

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-mdpi/icon_dailies.png b/wearos/src/main/res/drawable-mdpi/icon_dailies.png
deleted file mode 100644
index 24fed64f736fba066100cec73520ed660509756c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 216
zcmeAS@N?(olHy`uVBq!ia0vp^qChOh!VDzuu06#Kq*&4&eH|GXHuiJ>Nn{1`8H<D5
zofy`glX(f`hz9tCxVjhkOp5t3E9v{>m@kv#zD|n$GAZV>`rZ@=paQm%AirRSr*g}@
zi!Bv?Z~#U8JzX3_BrYc>Bm{&eGzjtVBrzE@H7e>dx*13=Yjj*B$lRPHC8DBbFyr8j
zOg5e*%>-W_olGVH-vH%+8wCyRz25qrIVs;2b_?J9>+z3?fx*al{hzg4X9107@O1Ta
JS?83{1OT-1Lo)yX

diff --git a/wearos/src/main/res/drawable-mdpi/icon_dailies.webp b/wearos/src/main/res/drawable-mdpi/icon_dailies.webp
new file mode 100644
index 0000000000000000000000000000000000000000..57bb2b82836ae3f478ccceff25ad6a0f21e44055
GIT binary patch
literal 146
zcmV;D0B!$LNk&GB00012MM6+kP&iC}0000l6hH+KH=v+x8y5GE<j8~}=F(qb1lcy-
z{cSIxCIAwK{;deW1&##PFaUmk=n&*d+UpE90ob-tx_+eyHk95igT<ePr7i*y{a4$z
z4I^djIRjW4NFH*bd0>*fePFP=Fq0BZOSQ}!f-4KA2$($Tb4<#Q*xT(#?4R8C02|sq
A761SM

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-mdpi/icon_habits.png b/wearos/src/main/res/drawable-mdpi/icon_habits.png
deleted file mode 100644
index 9046fe165ac8904355e1ad51bc49d64b95c9d1e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 338
zcmeAS@N?(olHy`uVBq!ia0vp^@<1%c!3-q%>$e{UQY`6?zK#qG8~eHcB(ehejKx9j
zP7LeL$-D$|j01c^T-^(NrpA1k68m{_>=z)K5%+y^%$FJI|EB=CKt|$EAY&3p>hqKs
zpqkH<Vm^DY>GuG&3zP);1v5lvpS~gchNtGcRzbr0R;P^tADMu13q4&NLp08}2HoU4
zY`~%H&b>40-~a6NO?gu{W&O|;JT{{_qv`hvS9^`hl4a65yVu=#diusBJH_1a8<UDx
zZ&$iL%{NI%;->1QE)MIHK`aj^*A+G?c(hk7QFjSRc(uZIzq_RvlTC@#s@#8F(^T(;
zv`^H!$7mMPv{jjHbDXb~-UFi;+xC^K-p}HBo_FW+_dk_?D?fjH_WIrN+v}_4-_`!z
beO`RdVL|o8^8&>{$1-@j`njxgN@xNANYId5

diff --git a/wearos/src/main/res/drawable-mdpi/icon_habits.webp b/wearos/src/main/res/drawable-mdpi/icon_habits.webp
new file mode 100644
index 0000000000000000000000000000000000000000..1cca6a2978a711ba6278a0ce36eb288031495190
GIT binary patch
literal 254
zcmV<a00I9}Nk&HY00012MM6+kP&iEL0000l9zX>UhoF#+B&Z8;kms-PX&6Y`rmKGe
zH~UR(+cu2sIsgCKqqMf2CN{45xX^ZDGv;cZ4RTPJ0MM7sZ%o%sMhO35ehx)b8Q|G#
z)G-2o%jjSjNm7*cJvrup{L}S4BZ%m~0=I3Hj<;j@gf2AJ9?qRS`a1ML!z%Ao?e5Ht
zZ`9_iR3NtLVH+CL7C=3DH1J*Tv^%sR8Tg_vv^bbXg^T~ig*sLUojCl^8wIQ#whJ78
z#RffKl2i<^B5AghW=Ru-!;lJBDpCN~jSlcM(m}dOdZ6@mWG^%Q6tWK~`wV}0#L9jF
E0h*q6V*mgE

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-mdpi/icon_plus.png b/wearos/src/main/res/drawable-mdpi/icon_plus.png
deleted file mode 100644
index 5354565ab9f827fd343ca3059fc4ba8fbe98c257..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 223
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|&H|6fVg?3oVGw3ym^DWND9BhG
z<nF|<?wrg^AcrO0(btiIVPik{pF~z5zr@qUF{Fa=?WDV$4F&?ui-j$kX5SQ*Ip}$t
z_ZIKDIUy_RMWf_h{wPdn7qHNCU=x(o@Q?hep(?iKN6faJnv;BI#H2>s9GTudNnHL$
z`%{_Kvb|DiRaXSRY~lN=<Es2Lz;D5_`U(14T%F|_t^US^J9pJgK7DSQN9mTy;yd>M
P?Pu_G^>bP0l+XkK`4vce

diff --git a/wearos/src/main/res/drawable-mdpi/icon_plus.webp b/wearos/src/main/res/drawable-mdpi/icon_plus.webp
new file mode 100644
index 0000000000000000000000000000000000000000..e9f6512ae03e0af123555fc366f1a703504c94ec
GIT binary patch
literal 100
zcmV-q0Gt0(Nk&Fo00012MM6+kP&iCb0000l5kLeGFEIb}KmP>THk-i=k8<?@AH)#?
zn@EyX&3pg<oD84<&N;{RZ|1Xti2hFi;5UZTLhjij?>D{9qy1t&F52oM2Nrq2Z#p?=
G@n`{Itt!a?

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-mdpi/icon_settings.png b/wearos/src/main/res/drawable-mdpi/icon_settings.png
deleted file mode 100644
index 3764285a69417a68a27f4e12f48ddb082ee4bc09..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 432
zcmV;h0Z;ykP)<h;3K|Lk000e1NJLTq0012T000~a0{{R3su4t(00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#LQqUpMMrQ<y?+0bT=t-4|CC+!lU?<nWdD<0^^;um
zlwS6fUiX$@_mf@qlU($ZT=bJ%^^{=tlU?+ZUG<e<^^;xpl3et}Sv6Gv000$qQchC<
z1DOn8s|b$TPCy;V_`H89?RzzC(5U9z0002%Nkl<ZD9?pc*#d+h2*hJWO}qX7UtKV*
zZ7bs?bmAIDfNH`O^8&7>ZQ9HZHz=lRcm~Ak45J@J{4i?VYL2itNl(|B3(!wqPEl6S
zbH$i;H2c<XppxX%IUr{<7*ak<wKY4XpwY^)q#C6~AJW8`pre8_O{?}cloK#h`HuXd
ze9y))H1`rx#KMlzgD#T@j43SOr~!*PZO6UYoJS#FJAk>b^z@mjz7p5ZxyQnTDMXsW
z$u>h1ea=i}+g-IMYP0deWZr^*+QQ2Q+uH|_H_ADrr*2gDBWiI`?7!lNUG4ft?cnQE
aIpV%3mKWTooo|Bx0000<MNUMnLSTZmTE<lX

diff --git a/wearos/src/main/res/drawable-mdpi/icon_settings.webp b/wearos/src/main/res/drawable-mdpi/icon_settings.webp
new file mode 100644
index 0000000000000000000000000000000000000000..28f1d3e2b170456141f4c0776c2b2ffa45e87696
GIT binary patch
literal 336
zcmV-W0k8g2Nk&FU0RRA3MM6+kP&iCG0RR9m9KZ$;uV9#sq#1}qJAaFN-e{n0+ctFi
z|0Dgc9UZl8+b~M||J-br8cC9p!`(H5nE$_w_<{hiS2i&BK>v@pX}ct*4ypf}YeB}A
zaU_*mO!-(v3ywv3?!jSfTT$~^0xloq>$Cq}6TU(!i0D5fw{09rr>R?<d;(UNjmcra
zRoScC2tup8;FcVIR1v8^LSDkd{_8BMk}H6ftf`z=F(f5<@c~{WHFfwxD#<3{OOVFy
zJ&Nxhd9tmd<woyaR8r%)eu<Ub;j)L-XNR4v5!kw$UNrY^_%vSPdcwM`!TeRZ*gjcF
zm2NdENsZm2D5)9yVZ%7OTn-!4u>-ixZx8GZCW0HYObs$7w@h9%_wy%XGl8eEz$Z)P
i4@Cx)q4Jc6FCQxGr>1cOE#dIu_Rvf#Moii0EC2w>U7^1K

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-mdpi/icon_stats.png b/wearos/src/main/res/drawable-mdpi/icon_stats.png
deleted file mode 100644
index 98cd4e5869a0536d947bdf507349ed7deefc3817..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 422
zcmeAS@N?(olHy`uVBq!ia0vp^G9b*s3?yAI>n{UREa{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaMA1AIbU-3xrCCw`wC^JQ}E=P9vYC&zx79RF=a=Km?NUnYSBzk&q83?O%E
z+z+6FNpV1_&s#Eg^8pPJDhcunW{`WgCi0jyXZOz%@1^P2RCmpG=2e;ilzr>z;uxZF
zzBKserd9<WVT}N@z<>Xf{kiU0>rG%kmYL&`e0Q6*#-z`;Wv(#fUYf<SX7;8z<%!Ob
z8R2{jDi7wJYWn-F>gwJq=BMBHdTlS5u;Inl;O*?YMBml=KH2<ka>LVWXRe>ITobm$
z@TAruo>Mc#r**{XoYF|OTxoyrV61q$i0Ho;^Ta#P{ZaAP<d3|5>z|*~ni6NZ$6;3{
z*@evi`XWDm@r**v6ee|XRkmOJiVM5s#Ba&}5SuUC7;3E%`|hB3|HKs<(b-+~b(@qD
zS6@Az7Ad{1+f?)J*?E<_63%Utwp%^3XWt#a>9?%A&fkB?{&t_hdA~m)D}Wwn@O1Ta
JS?83{1OWeNyS@Mb

diff --git a/wearos/src/main/res/drawable-mdpi/icon_stats.webp b/wearos/src/main/res/drawable-mdpi/icon_stats.webp
new file mode 100644
index 0000000000000000000000000000000000000000..63553e50ac2f7dea0556656259fd5a3e011fe73f
GIT binary patch
literal 338
zcmV-Y0j>U0Nk&FW0RRA3MM6+kP&iCJ0RR9m8^8t-mtc@>q~04p`5WA8C}`V8ay9-$
z25tcEHPg0DI{t)rS!pC&%~$`ELFNu}ztlu63=S6r+xX4r#?Mmzs|_735HnD3j=Y})
zj<(vZJK_OiB*}4`0r62FFb0@^wt7Hk5Yhh$;P+Kl3Ou}2`+5I^+R_uOSufR*pLjp!
zQ0GGso0|7R3;^NOk#=HtycQ6eww>ksD?l82Z-m-aTY#zO1`z+$35WKu1w}`IOA~AD
zaOr}oYw6mVI$>%lI(LfxeOg*~{<J{VmGs((T@zfI!q5Y_`zyYMmtJsa51cxIs$<@%
zbalbh6K)+5((wC)IP?aZwg5-_)H8&p4Im9Y1F&jqXATff9qEm%w#bjMshQ7H9rO5f
k%%M)c=b?JlIqRi5GQXzg&n>ZepZ!xmZypS3m9kRcM-OtKegFUf

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-mdpi/icon_todos.png b/wearos/src/main/res/drawable-mdpi/icon_todos.png
deleted file mode 100644
index 91c0d1989ff16f49bdd3e731ec0210285800b66b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 431
zcmeAS@N?(olHy`uVBq!ia0vp^DnP8v!3-o%-;NLhQY`6?zK#qG8~eHcB(ehejKx9j
zP7LeL$-D$|ECYN(T-^(NCdYo668Cj#?Dv^TKY;AXv0o?0e3=yUWmf8cAY*FWH?Sa3
z{LB2b|I^}tYCZ#HGase101Xi;3GxeOI2mFu{y8!GI?ocLR|Qkpl-FM8S3U!j{pRW7
z7-Dhy?qqMVW(6KsMW#lL1#jv%`f_b`z35jxOS0(X^Ph{Z)F0{T+}85hbmGP7V)tTG
zZwhv1o>&m0+rlvM4eJw@g8}@EOSGS_Ojk?WVrlz&U&=f8cHzal^*4%CpDV67*7-r&
zxOmZr)`=f01*Tt<c3T>>C@Qkq%Td-egIoSW7}tsf>8lbGQ-3#jD42$NN#th*zB+xf
zz+Y>h#6{J)QtPjr^AO%RJ%Q8us>I7e*{+iz$trv8xVB!gX7-g&{++d0UdH75Sz8nN
zHA!Di%uVvyJ)2M5Zr4WB?xh?JDklz#=@*xEKhVFXb^N<m;=b5(y?N6=hd*MB{VllY
U&eSiTfg!-)>FVdQ&MBb@0NO;j?EnA(

diff --git a/wearos/src/main/res/drawable-mdpi/icon_todos.webp b/wearos/src/main/res/drawable-mdpi/icon_todos.webp
new file mode 100644
index 0000000000000000000000000000000000000000..bcd26f72049492957a07e962de8f8a2f97794055
GIT binary patch
literal 342
zcmV-c0jd5{Nk&Fa0RRA3MM6+kP&iCN0RR9mBY+4Hm!P0+8!7vD$M5(vxzbS6Hj<Q-
z%b&%P+y1*#+_r6Gy|e$YS1Tm}03;+EK!dgH(+@OvEdc>9g}0jjli8Q*e+GVi7Gily
zGaev(9j1X!vh7hO6x}u9NRp&B8VMNDc=-QoJ*>S(^q+y-Mv4l{yNCS*{Q+uDF(lRp
zxY%K!d$w0NOeyxj0AM0ZsiNJ*(^_1pW0AVuii-;f06uTrZJwXzs>_BwO`!n0Zm;jw
z0eox?*m7!OAQC<4J~1Ug(G8ehvVXb7TRB4jBo*5<GYKHf5F1Ez>g;lVOk8xB2C31c
zfV5mPXkrS0S{!6bubGPl?)A6pHJW(&4=`Z*Tgr0y9@)13;lETo;I0Mq@}JCpD+3I`
oPX28+0G`bNz(yq{$JPSV4#gsCPVZ(`xk-z!v+ReMSkrGK0rDW7H~;_u

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-mdpi/magic.png b/wearos/src/main/res/drawable-mdpi/magic.png
deleted file mode 100644
index e9cc12874ead77b9768994c06879f611aa4fe7ae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 365
zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaNR1AIbU-3xqFr<~WEc1~mJInAkOHK(1`n0g+_(3pN+WBPHesi!nRf@d_R
zoY9(g7APLG?xxY~3)4?OTX*B_<l~Rp4?ZxPdMtd$s};Au9C`HFWBn7arB^h156-^&
zId${x%DoS?CZ9Nbyzv##I{uO%zhDM|{TJRB)ZbT7Fh~eku>R*-qiUd3ucwP+h{WaE
z3orSa6$IP@1GTcI_n&3Wy!yTV6rWk(fhC{2=R9dUDROjvW?s1Pp0g|4v_1<3DXnh3
z)b0OTYHytCsV!H|>DaAXX>u-O<vFV<=Ol%%hC~_rUW<D9@keB9;UAXQ?TmBYUgI<s
z7TUZ0@$@uzr4PS%dLM9z-ILH-+3d0YK-`JWXOUa4GjDqQm6fT4lTV|kaz4;u44$rj
JF6*2UngANoq@@4=

diff --git a/wearos/src/main/res/drawable-mdpi/magic.webp b/wearos/src/main/res/drawable-mdpi/magic.webp
new file mode 100644
index 0000000000000000000000000000000000000000..2e84c1763fa64e16450cc9bf9f175f176f6d996b
GIT binary patch
literal 384
zcmV-`0e}8dNk&F^0RRA3MM6+kP&iC$0RR9m5kLeGpTZE5BuO<7zyX}U$f=yf?9;8m
zD3T;awQ&4r%_r>KFyG8LjwH!Zs^`#nfd6jc0Y5Ff5Ja+#tsuHYGDtv#lRyCe>H4kE
zC!J%xAC}TzlCbFhGC$`U{^fT_f5`qsX<OO$a^Ld4b{^fQY|vNtk?c?J*yo=`{T+0&
z=(v(0Do4mlCQ&J-zIca|u12NNW!UQ*&+ZL;Nq~m5fPf$c1crkR#%Bn#^g!o^voJd#
z918-=PB#mW5GK3~J)(?2Hgz_FMWx#RaWLZnaA4cE+5DPeZO3+M+nxVt{!g+xgNXhs
zY}>ZUF8c}iBbTelI9cX5DyFjLMwwCV7@G)dV-4B*h8vx)G__;66%)C77@e#xmWri`
zFgmDoHl8eGLTGK&a7h#?ifjeQF-D94qx61h4*H`E8D6By&->OogFp=?9Q(W>jh3zV
e$B*l7{{zANct-DH_&*SuGsBpIsGKhV8UO$y6}f)^

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-mdpi/watch_habit_negative.png b/wearos/src/main/res/drawable-mdpi/watch_habit_negative.png
deleted file mode 100644
index 87472b37cc61ae8f562d544226fb284cc02efe5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 131
zcmeAS@N?(olHy`uVBq!ia0vp^AT|>tGmwm4e}6KNVo7)Ob!1@J*w6hZkrl{iEDmya
zVpw-h<|UBB7T^=&`X3BJYrf`yq)USQg71fQi7Nv+e4Z|jAsp9}SL7$G$Y)?+{m=M+
Tr`QW;pbUejtDnm{r-UW|U|}WM

diff --git a/wearos/src/main/res/drawable-mdpi/watch_habit_negative.webp b/wearos/src/main/res/drawable-mdpi/watch_habit_negative.webp
new file mode 100644
index 0000000000000000000000000000000000000000..7836ea88685fe27535b6d7cd1b9772b3fd99b6d4
GIT binary patch
literal 42
wcmWIYbaPW;U|<M$bqWXzu<#KDvh_I~7zFqY{(rXr&;GNIeNDZ~|HTXp0M;%HQ~&?~

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-mdpi/watch_habit_positive.png b/wearos/src/main/res/drawable-mdpi/watch_habit_positive.png
deleted file mode 100644
index 33685979e9c5b13210f18a05cbbcdc17efe027a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 146
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2hGm!icqpk;}SkfJR9T^xl_H+M9WCijWi-X*q
z7}lMWc?slj2Ka=y{{R2qy}$=Zx-8ms5h%!1666<rpP|55<OPr?>FMGa!f`#BBb7IS
mBev^6)M}{%5|KPB*ce{1aPKVnyl@gw5re0zpUXO@geCxFz$z#J

diff --git a/wearos/src/main/res/drawable-mdpi/watch_habit_positive.webp b/wearos/src/main/res/drawable-mdpi/watch_habit_positive.webp
new file mode 100644
index 0000000000000000000000000000000000000000..b1ecd0150a7a473dfa73e6203ac637879b33bc20
GIT binary patch
literal 64
zcmWIYbaS&{U|<M$bqWXzu<+3Vvh_I~m;}TP{(rXr&(x?g<?qrk&L13HQl7oj=3m>-
U`JuDD;~zWY|1-~WK3OsX0BETf#Q*>R

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-mdpi/watch_habit_posneg.png b/wearos/src/main/res/drawable-mdpi/watch_habit_posneg.png
deleted file mode 100644
index 382ef7390f364c0a15a91f67f41a4ce2796e9e75..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1260
zcmZ`&-%Aux6u#r8*ob6_Kd_Q%4T*ARW@pvfVRlGeYZqGEmMvC@aMW3ynw?o@uIvN_
zCTR3lX%uGROF=JE6!aJ<y+sB62|?6T??u?Tv+M4->K*RAXYM)Qch0%z+<VE9^Nn-|
zjSy;#$D%3NTVb};*TFi-bUuQOvQy^=(c0%Dzu@Pknu%u<33L+VdQ?XpLOx;wAEG)?
ztt%sRg*sf8uTdvTHZ@=qM6jY3nAy7;+E=o_1v?orn7~xrlbWOIIR%>*leA1mV0+nK
z(D_!WiqF-WGDqvGuPhUORQIEM5w`vL*r<(ALo=BaT3%@f4qZ!Ua3*m<oG^2&GHH&h
ztdq+V6p|bf#GHy1#>wf1EjkguYaxP6jyXT$n&2A|e<qP+hD=Lk`dOak{W8rkjATt_
z#Z>fM2@Zb||1`#Vk>d)50$T{NrZvR{!{IQ;3!ESXz#?GZG_c|X47;mHvc(fs?FmcE
zW6d-e!mEs%GdSY+6G!Dyj8k>AiYLP^r3DFcM8gGHp4$xu$(G~WhH{kro*=Ac_wYqD
zMVNaT#TX?Lf#?==G^*uP!-jlhAt<?_?NC&b^8hm*px_016doX?B@S6CX`i%d>hf;g
zByrVNRRjqr_oRZAsDf2l;GtH0e?SPQgM!${i+!O}ydd&?k!G8%hlgB<m`SO&sn3uy
z%BKY$1{Wl&#O+X5Lo3M3hK6NG-Gx*gSEEKN`rRCQ)z#38mZm~8y0JoqTyNg9lD)){
ze)RNbvH9Io=zf`oYuS29GX3-!ehiOmDjpq3pE)=&cGkDKx%uJ1`t<seeP>~gdeI%c
zbRDt(-i6wK{{GwaWhnNf;r_>2{o%$+mR$%pjci<{+nB|HP}{dpW34^%?b%^HJ$-y0
sb-j8%pEYZ1{&arrIokZ%NiWmK5c>Wm(*E}S(gX6K<HIA-wZXBu|DnlSF8}}l

diff --git a/wearos/src/main/res/drawable-mdpi/watch_habit_posneg.webp b/wearos/src/main/res/drawable-mdpi/watch_habit_posneg.webp
new file mode 100644
index 0000000000000000000000000000000000000000..933bb3464abf7cb5f413ab8c8a199071236e1724
GIT binary patch
literal 74
zcmWIYbaQiJU|<M$bqWXzu<$Vjvh_t7SOvrl{(rXr&(x?g<?qrk&L13Hw>*NLJ-E2P
e(|UeCm(nkLMiGW*ktuf*io$*vZ_-=G%m4snCmN>!

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-mdpi/watch_task_add.png b/wearos/src/main/res/drawable-mdpi/watch_task_add.png
deleted file mode 100644
index 28c5202799da13a1bedd272c362573cb8390ac6c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 192
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh-3?!F4n4AKnSkfJR9T^xl_H+M9WCijWi-X*q
z7}lMWc?nV(;1lBNUf}Z|6?912)B|N%OM?7@8ScMNh;KM8uLu;d_H=O!;kcfh00e<0
z2@MR#0$4S=O-&j^rUh%TbQp9vMLP1V3J6nZR-Cfbr|qP}0TC^RR6}k_22X|^zl8ob
TwKqNn8pGh}>gTe~DWM4fW%xjC

diff --git a/wearos/src/main/res/drawable-mdpi/watch_task_add.webp b/wearos/src/main/res/drawable-mdpi/watch_task_add.webp
new file mode 100644
index 0000000000000000000000000000000000000000..e9f6512ae03e0af123555fc366f1a703504c94ec
GIT binary patch
literal 100
zcmV-q0Gt0(Nk&Fo00012MM6+kP&iCb0000l5kLeGFEIb}KmP>THk-i=k8<?@AH)#?
zn@EyX&3pg<oD84<&N;{RZ|1Xti2hFi;5UZTLhjij?>D{9qy1t&F52oM2Nrq2Z#p?=
G@n`{Itt!a?

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-mdpi/watch_task_minus.png b/wearos/src/main/res/drawable-mdpi/watch_task_minus.png
deleted file mode 100644
index 0cb8ab9495a107f5d60feec4ed6ff29a24e770fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 156
zcmeAS@N?(olHy`uVBq!ia0vp^LO{&I!VDw}^NSvVIO&eQjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaOi1AIbU|D%G5<-wvLeI-GD!S~-M#D6rd2U#HP>Eal|aXs0fq>&+wO-$qT
jL`RlWMF{~7n_3u_f95FA`I@&9sEonW)z4*}Q$iB}Nf0#s

diff --git a/wearos/src/main/res/drawable-mdpi/watch_task_minus.webp b/wearos/src/main/res/drawable-mdpi/watch_task_minus.webp
new file mode 100644
index 0000000000000000000000000000000000000000..a28a91f8294ac3d83b9f917ab8eeceac7fcf376d
GIT binary patch
literal 72
zcmWIYbaQiHU|<M$bqWXzu<$Vfvh@WIFbJp{{QqqKpGioG-^S$V*9rz_4%Xb;9+xzD
b4zfRR-5^^Z63!?1cYZ@feUt%v3<EO&=}s12

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/broken_heart.png b/wearos/src/main/res/drawable-xhdpi/broken_heart.png
deleted file mode 100644
index 72a0eba892b77554226eb90399bb2229138d0810..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4357
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

diff --git a/wearos/src/main/res/drawable-xhdpi/broken_heart.webp b/wearos/src/main/res/drawable-xhdpi/broken_heart.webp
new file mode 100644
index 0000000000000000000000000000000000000000..abc481c22729e45e2a715a14d42fb57ff3cb987f
GIT binary patch
literal 2064
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

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/checkmark.png b/wearos/src/main/res/drawable-xhdpi/checkmark.png
deleted file mode 100644
index f55e2942eca81acec6aa9bc44c650944bf577caf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 521
zcmV+k0`~ohP)<h;3K|Lk000e1NJLTq000^Q000vR1^@s6jzt{?00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0iH=jK~#7Fy_CyN
z!ax*;&$NU!OD;-q=gtWN;Sv*g1AGGE3DhSLo&eps6Q9B*xG5y9GQ2?ziY&WvW1z>G
zps|-}g;@O;o#td_zUG|&FTg*Ez#phcs}u<g_~jNNUKwn389As-%ef^{Cj2$=S+bTG
z--{F^AS*%!2qfpM8xxHv5RvM%o{&KRp(~ciKyT!ID1#VG>qG`B<ZC?yIB+o#Z@(Zy
zzn)PcU%lX8-f`CWrBi*PQD-gYvLb=L@u+oSLlqAzr)c{iri$^VcdwdGW$*Z!gS8#&
z>GUqlUuXC5gG%(MiGY0xq%meg)4N|06LX2Tp+GBV5F%k?o2+g;Ws9FZmO<7aw9kE2
zLV6`yI|+ga8^d=X*B2qSb*3>0kUC#Ho0(+hiC^yOE1y?$Cz&;07PF}rBD1m1M%NG`
zRXjM1Z30WBvLY+{UWn7iL2}u<NXsoGinsT?Eu>{DKzTS^vlCf)V51gnAYYDxV3LEr
ztc1z;XVBTWPta~dI7FJ2FsZU)(99f=Mv#rS0)@b=7{)8xLWDj5`kcG3MJ|VV00000
LNkvXXu0mjfs1DP(

diff --git a/wearos/src/main/res/drawable-xhdpi/checkmark.webp b/wearos/src/main/res/drawable-xhdpi/checkmark.webp
new file mode 100644
index 0000000000000000000000000000000000000000..27c78d41413a0c4d34ed1e87c172fbc4ffb52ef3
GIT binary patch
literal 208
zcmV;>05AViNk&G<00012MM6+kP&iDx0000l8Gr;3zd#^q<9VX@@Ae!D+P0Cr-3#dW
zV>$*^)V7i2&TB9&e^U1%h-^bo0-}p_4X%O+PXYn<#z93sWW^D}<9mXy`l?7JwQ@&Z
znTE!t4`X)Q2ZKhE6m9P_^S^(sN0V0&(SNjU+s2XBr1cs0_v~IxVonEtG;09KJ93oL
z==Q-^atJob@*$fqSY06<kYmefEx?p55Z^7z0l=CqaIs|O3};$kkz9cSX@Lq!fhyHy
K0vScTpaB3lQCwvJ

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/experience.png b/wearos/src/main/res/drawable-xhdpi/experience.png
deleted file mode 100644
index 2cb5dc1f2759669f6bfa8a28f07ac93b8f59fa64..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 469
zcmeAS@N?(olHy`uVBq!ia0vp^svyk43?x4}TrdPuEa{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaLr1AIbU-3xsFFH`<MU*Z2UrT@#7!K4C+0TfxR^nWQ(MEU=osQ;HH{9kMG
z_h8oldu!g#R`_*k=Kt+}zqfe3T44O|bkqOmhkh<nx<66=<2)tawAU6u!?{a>{DK+Y
zE8IWWpfF#+G2zkYFS$VbxjkJRLo81BUb#4_S%JqP@b=cFdX7w8VgLU-n{$@AM`xW_
zT>QM_#08W0#d}RfllAy*cSS`vN@kb#tl&CRur$$Wr9|N01&KbD>l1w}@6S(mvgCh0
zBOqjMV*l)b5W{O_PoE{VcJWDQm+sssHpiJoV&1pS)uze^MAGN9nXY+%cOByg3+28<
z-sA6XT=<>VlPBeDQF7Nm?!u8~V_z2+c4goB|5rVX{W*2ra@z&`DOzslKTJ?Az8|*j
zy;_f*=qzV;f#j&5l{ZVju+~L7?fm(ktznDK`Fvh~?FgY)|GxT^G^s8-b5c`8XKt|c
zG!d<2&xJ;5rd|e9Zy7AUr<TjAI%DOIr?<GeHb`}y`|*6Sy={Z|QXTFCCxM~G;OXk;
Jvd$@?2>@sY&j0`b

diff --git a/wearos/src/main/res/drawable-xhdpi/experience.webp b/wearos/src/main/res/drawable-xhdpi/experience.webp
new file mode 100644
index 0000000000000000000000000000000000000000..5e7c8aeb62ee30551deb5ef887da4a784310ac5d
GIT binary patch
literal 386
zcmV-|0e${bNk&F`0RRA3MM6+kP&iC(0RR9mBftm{m%%8KBt^Y+dd|P2doniIV9-dC
zqPn|h@-OfeF#j`(BuPql1Wz!DS|p%j@4E;DA-ZlE&jiTwf0xb%+W=HZ2Z#f}XVU{@
zgKj8vqq1KF2$3QrHUL!tN^G(&#D-@+lm`i0E01?Fe3xvutNE2EB}y->7glKGz_O02
z9?ZjQs;!(4IFKYsQ5JVNx51qiPX7P8yIGliK}7!*wrv#gIRgMgF#A-Jd6+_Y7>aZ0
zLC%E_dpy`f7eV%X?;#tX2B-!wKs5ja(Evy&feZj4lxrcE$p8ws;`cHL#;Xc$KaRtt
zP5{|*G>@+D_eT$hf-0Jg=DW-LZ46sMvYyW;o5P{Cg~a0=2SE@l#-q_>JD;x-0D$8i
z56PG<rt@weR<>fy5_vT5UQcV;qJV1M)b+z$_P7J2ue$!4$|;Tjb^S->e3uZtq)RCg
gNXZx@p-DuO2$l-xTzY!@9*~~?A`eJUf1?K+WKj916#xJL

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/gold.webp b/wearos/src/main/res/drawable-xhdpi/gold.webp
new file mode 100644
index 0000000000000000000000000000000000000000..05300312f5d88585fdfd7ed96ddf87f976a886ce
GIT binary patch
literal 786
zcmV+t1MU1$Nk&Er0{{S5MM6+kP&iEf0ssInBftm{|Km22WLKHphqA~&0|LVbTi&38
za3e{QqhvJF()|B@1h$5W#&O$7j-;CEb>{-O*X5tYMYVpn8$l%7*x%qu;71TaQxR#P
z3c%_A>n9o^SV#php%Op`KX}S2U1_Nz3hhS)B_IXFLO`*Y!QTlK0*VD>rU(>*g$0UW
z(S!zJ5GqP5AuP2fyxz?+*m$VH;eaUQHbs^frEyZy#WvH6Qi4Zky(|M{$9r@Co@J0A
zku)?GG9!*rYeHF;X>CtQiV#4PB;9Jj`vqcQi_-0m<L<2qVUBILVs;6(J_1uvTL}qL
zYr=W{$nAQYU9O9<d)XNz+P1bfQA&$j{lnd<d^qDSxWl;NI*!Z3=g*%!!f8bR8Mtkv
zDBUje!6O{2<|9?9v`~mvM&_M>TBsGPq6<MNN{X)%zL~jF0UDaR2eV3{zq>^MYUb>V
z#N1p*RxQf3Hwq-?ZB7cb8aZpG%^v1lcPTLbZs+G;er-P+RiIrU>S-($=v5fmJ-hJe
z&!<U+9)TJMU_qcm;rZ!>RsW_Hx&^{6Nuf>Q!-cP2Dzpd*Gi}T$PyGFRYf8!23kwc$
zqi*svfcZXQOi=603uKhNAcj>l2^9;?%H)N?$pI(Excx0dV@i`yQXzCI?@bPFIB>_^
zUYop9x`e8@(61c%aC_%rT^SS-X(6YaT6lcGqdPC3mAsG!6fP{l?VSY_1pF`@0JHGl
z!ozDGSomrdlEQ#;?BZSM+QORBCq%1_i9UL`z4PI%F;PXa(4^cm*}rCEiw$EOz^KwH
zl!S!3oN{PBct0&E8G(>fE3_;3&x82esM0P(9Tv>wX#g{&WEzD9^WAP%c;WBY3T@`Q
zO<0UcnEm3@I<3$yW(wurZ*6hY%a7$@g<gR&&o>(tV*(hSS-INea^=mC0$l<L?=K>h
z6llw+kFu?<Lk{-P*q*WG+8YF7Hp5)G05o^^WtGA}caxi=Y|i(u7v!H74)kw~+NoV|
Q0xA@#jHZP`s><gd3mbHF_W%F@

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/habit_diagonal.png b/wearos/src/main/res/drawable-xhdpi/habit_diagonal.png
deleted file mode 100644
index 3fbab0a14f44afafd70cd603a4f50d51ba46c6d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1101
zcmeAS@N?(olHy`uVBq!ia0vp^E+EXo1|%(nCvO5$jKx9jP7LeL$-D%~q(*qA`T8<w
z0ofc3jP02WEFdL7ECs|249p7{8JK}IBS>rk6I|A10W*RPQh4Cz;r&2LCey_~1V}T1
z#DG8vh&7-zkj;1|HnwInke=b`;uuoF_-5*EFXljjw#T+jz5EI{eo2`<VqUUs^H<SN
z99ms0o*$Ydj&OIGHTfsL=Drbe<K~W^{5~6xrfq(H=4p;0x3k&q^t6BPl_&Te*EfH_
zcBetQfI05~?+!*F$4Ek>D~a`M*Q?Zs`|GBvJm#JM@RxJ$cI}0UQU~-GAJSi3^Y_u|
zX^A~$YnVzVd<-%R-1Yy+-z@7%QcD=#2)){=vfx!&hJfmSu1Oz5QWreBnfLEV7bnA>
zj;a+5^S`~|*5B1N@l!8b#Dqfo-aXGM?c=kSo>h6gj&0Yw&>z<$!@JV##SFMt6v`Gh
zm)HJ&!X@o_ESLE~q<dXKg0JGDyB?DYjk`@A{hb$E_0YFrj(e>80W-^AiZYkeWKQnL
za+0WgCjZ<#N26uigr07X3o{=7b_)D@ydjIvv}>Wah4nRc!5a=nZJZ4ob?+xmcSzYQ
zsPfomT2EnJaDSWS%oHAp0?oD7XKq-%Re7w_+HtdZf%B0$Tq}arBC>u98t<yH_V5eJ
zWcj7{v{OQuu|$XAsN}~J9s0Mqx}5ns1K$4z#{U2R+U&};z&LshileJD?Y)}<McSJc
zlolOaxbo=M1^o{$h<sz5)5Y<YUocS6l|{_e#m#wkfa7ctlN}Z=&G#3c%*y1DQd*?Q
zb!r|n=chxvkL>)u_xXY5Uro>dyldVUvtCw~F=X>in<jx(({}Lb$h0Lq(m(9F$cdv+
zU;<BP(X1H)ZSUFDoF7dQ5<K)^FGH%wlBRM+p1ZsuZAVU3h#opHw;|PIOI^N`#5UO-
zJ#GGyM-QZW?Aau)$aBj?!CC3q9PY#uZGw{WPu>)3wJ^SROYu0<l`Wawmf~?`jj^Ih
zys6sbd3)yiwOpt;I)kTkcDZWu$pt;`M&&EH7rtENC@EBVr?rQ5vC%8Nlrz#(Kf1nC
z3{^ClW31(zq@R6y#?qJlfr_EIl9$_3O-{@U5_a0WCsEQr#XtMh3?rS#Q{NoUGFl?Y
zTl|6ZnwOpAE~BWlOdF>Bww@EV&hN7?30?emqQP;8slrk(x4qICyIWoqvwc0_xgaRz
z^3vVsJGeTk&pt4$;PCL7tFz1c!j7ZIW7QqZMIOpd()xMTN^rX2#Mdld2gUX@te<pP
z_NMg9|1H-ydF+Ur(IWkW?d>Gyhg>NK&w5Uu){`O6#D9S21k=2S`%8~YpH`?=+`jzr
zMb{lQXOk`&a1|{m;dx%bdOe`o+oD-WM1lF=zqpi-`@4$;f6A$Li-Gd2r>mdKI;Vst
E09XgYIRF3v

diff --git a/wearos/src/main/res/drawable-xhdpi/habit_diagonal.webp b/wearos/src/main/res/drawable-xhdpi/habit_diagonal.webp
new file mode 100644
index 0000000000000000000000000000000000000000..095eb121b0dc6447d2f39cbd3c774c616a29cac1
GIT binary patch
literal 448
zcmV;x0YCmyNk&Gv0RRA3MM6+kP&iDi0RR9mL%<Lah1^DxBuPsBmA3saB8odI0<LY_
z#-8)rf1JvtAHh!QjK7L)+qP}nww@uWY}@|!1RVYMPGE-1djw{|H>=n1%>aNG25;e;
zg73D7Ucxg8KWlvm&p7<f@flpB@JD-ukKh`CKg)On*AV>O3zZje48Xt2cmPK~{Idtr
zIUKzZ<i3Wj8<JMXuysKcLwgEa2ZZ@8VQGW3fgvod5O<9=gQXdY^j5GmLX-UnmU^fP
zA5jZkl^bfHtaCyYw2dvOfV!mtWzaX@Qv!pAYKmY{YfAx4DlW-`O}-sDFv_eV8&+vH
zWWuVQqoQ<})mV@MyA(M|u<MgNCIN;G9Hqs>GN+VSShj}~5)IRQj<O<Q+6jI}IBau0
ziVB5on@3T>u<eIYL?DcdI!X$_jF~!0^25Nk9jXaF7}$0}|0u`{1KS>%9wjM!Z@FN4
zlx5|4$qxOaG(+1vrl=m}iM5RQ5p~q%Y=6NfqoX#VbgwNZ+>REh%5dMX#|Qstl$3{6
q{~4bKIN=;E)8cQy^}pEFNI`z|Abk$PRp~Tl*}P$Giup35dDH~^#n4ay

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/handoff.png b/wearos/src/main/res/drawable-xhdpi/handoff.png
deleted file mode 100644
index 864df57dd0b6a01ff719afb7f639129a7783cff3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 496
zcmV<M0T2F(P)<h;3K|Lk000e1NJLTq001HY001xu1^@s6bXllU00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0fk9KK~#7F?U~V0
z!!Qg$6|Mtx1dqT5cmuitVFJ2A(g}bGXh-M-4I8il*?=&Ckgg8b3Ol8(Bj>~KPS+&P
z#qaD`Q4;_MA{vSpiZ2`wzV?oy1RvC}z;Ok9R8qnukmy++imWjmJOFd{xS_a*bg+a0
zCo+e${Eo;Z$Rd)-h|B`V8;W;`i=lW3wg%RB4UwU1+CX2H+h?FhOR)+Z*Bg;j<W(b4
z6LB}Ig_I(=uRV4gDC-bS5yBp9*FG67k*(POE2EgumY#kpbrIKB8Irj=v(kkO{XE0}
z3#?9@%hU87BgMbL@y&P%)l?E%7h^;o;k>E2^_;uWzFD7weQAmC>KN=tL*%3c=w;T0
z*k2VzQ9}Ze4Gc&yDy1TI%&$8dxBcNeN3CWJ3H0PrQKB|A?%`N^n$|RJt>*t4L*XkE
z8;YRF9mdbDW~ebFV&VEn`&r~wBgrBX7U^IDu*eqD(NZ#Nz=_n5Zd6{6_At#yf!eEv
m`;P<sUj7ruqyJ1|W&c06Av`5X#*OO$0000<MNUMnLSTZ^pw9gO

diff --git a/wearos/src/main/res/drawable-xhdpi/heart.webp b/wearos/src/main/res/drawable-xhdpi/heart.webp
new file mode 100644
index 0000000000000000000000000000000000000000..161688a9c505ed8c64ed3bb275face63e6eec069
GIT binary patch
literal 806
zcmV+>1KIpiNk&E<0{{S5MM6+kP&iBy0{{RoBftm{Cj~c>WLZ(o<3>UvQ1Ra(47qow
zr`&+sNRlHdtNS>63*LXzUVHKQbV3f`wv9B<=6&V#+x|P+J}#dCFp4B8OrHW42j~BV
z1sudlaBu;5_@35G%tXrm`4=KsGa;~I@J6&r)JE2J_~)O1SG5y^V1l)T1Cp>qiw6)h
z!C*SZV8N7@78|S{*kkqZ$&bvWWg}W=>NTaUoq{<vWv#UnZ^>r*@n?Mo#P+^Wk^0JZ
zvjkGX^Y!8T{ZT(d%3L*jOIr+y#-xT|D)<SIP|#wPVks2-K+3B19azOcz(6Z2u=t=N
z!6sn<#Q>qTJ+G9gja18Fv)CL6&_KgL$e<w&1E2_tX%SLrD4-glL|PS=(@XRb-sX_Q
z-|{bH)xy>VL@C=|`t5)DA6*7DD{j9}6(P94U;M`Axp2-N0bAL#Lgae8y1Wn0wFCLv
zwi$La8%}KdDCWdT-NsJdnp-z%Z1eckcBlDEcb3)95&dW6wrwP;#pE{oC&+)RrGwo?
zeTyFVq7nZV0O$?=jd9g==vo^GE)E0kb-ih16ma`=8~_*RrapB*eKkHefDb3+YXIC@
zz~v{?({FjDYB&PW-^4<)eCG<FXLefYJm;0~A*NQwPRdF*O?X(qId2#kR3_FO3I@%1
z_pR#`7co)q>9Xghl$L(W)vEhxvzb+z6P_Z}re)hKC_R><Qft#_vdxl`FiE167Mk|p
zt5^v_y4XKtL$6*untm-f!Xz52Io`c@UC%bq!rEV+5i3!m8DgKk|M=-7u&1@)#!w?;
zEHAUTwDdUEX0toLOixcwU4q-M_t63$74<PRE<LHp=_>vDPB9PYf0V008)K}B()g^1
zoYK;+>FMbiV3X*#kC7(ESWUUjCP}|8OixcwUcwPEusDW(*4QmS`)-pWQ~BpN(>GxJ
zlaOVgFCZ(Oi{?rdJ-`YvZX39ITP(3F--~mZu&@J6+*E5A2DbggR4Z=a%59nFcLL)+
kVz$LYVB%Kw0I<JEEVKz#USh39H{f0(R$JIn&i22H05A@V*#H0l

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/icon_avatar.png b/wearos/src/main/res/drawable-xhdpi/icon_avatar.png
deleted file mode 100644
index a655d49194fcfb9cd1f03c79fee927e1249b63d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 602
zcmV-g0;T<lP)<h;3K|Lk000e1NJLTq001xm001-y0{{R3`%O!u00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#JWxzjMMrQ<lwS3dT=bJ%^psxqn`Zy4Z~u~A^OIfl
zlU($bVE2<<^pjoml3etXT=bV=_>*1qlwS0dUG$P%^VY<FDF6Tf6LeBeQvgx>zc~&D
z^3kg&ZHeOP7nWalxbB<l0004<Nkl<ZNXMmCS+ay64Aig%L;<<~UEh>|%Mid<lRra3
z)^41p-$ioIP$^`d%NORts(6aBVr0ME%nz5Pf4z>C=uQxUkq~TpNES(9t=j#WMKD5`
zaOUS}dtNRyMPo`xPCDdMe@j5-psW)>Kef6Y!X78vS4+fps4d~J9w*hDmP5VP_AbSC
zZ}qtZtZ%|b5i?ctRrdV518+5)HBvHZo2#{vY2VG%IGE{Fm2BmTbd!kM@>SoHOLHS?
z{^XQK4Ue-K(x6F1gmf9~mugS;G0=c00L5@@pa`d;fjGAnhygN&P`)<T0yPH;(!kra
z!PnY;<vo@(6>%`r;tXz4(KMsb65EZjEBG9p({U*J)+>kcg`n$GYKLU6d_WO$4M#uL
zG;RysL1~t<0`q-^eD59bx22*fl7`m-ZQI%S3N7}`$c`RAo3{Al3Jq2uSp{S+VH>~4
zTP`BBUkr-S!nD6Dp)_aDJfg=AI<rukGc1FD1i3(-wSf2!0daes--v&Z%UBZOaP`(+
oWoVnX0J_#;*6W~lSakx!A5Y^;B?UlXpa1{>07*qoM6N<$g2TKOZ2$lO

diff --git a/wearos/src/main/res/drawable-xhdpi/icon_avatar.webp b/wearos/src/main/res/drawable-xhdpi/icon_avatar.webp
new file mode 100644
index 0000000000000000000000000000000000000000..e48c0ca84461db428e361970d1eaff03d6e76676
GIT binary patch
literal 466
zcmV;@0WJPgNk&G>0RRA3MM6+kP&iD!0RR9mFTe~CpI{(B65P<vUN=MShN8BSoNT${
z58?>kyG3o=HVjk#|2Au^wv8m^GQMZ(ze)@Oz^;Uu_U+3(oBY3k1s^b>Q6d#A|I{%}
zDj+{lgda}S2gKTTs!HJ#<RL@}{a5Q%0y70f^nU{AAM|`S>0R2%eg{{&e(c39%UvgX
zUgN47R=2>3nu;^?O^utkI`y?4(Ybik7d?$waf|dC8&bAu==Ai_pQxFz!b+1BC|eY8
zyBT+bVsU{?(-~X_L1CB+K*JmZAwvN?mq4|sApJcC&7uLGi=g{C-$9)7{h?_t>9hMe
zszBxhR5DCJ^GsHlEc^vV`j!T`yagRV$M4H;C_KnkfT|qs;SNzOWE^g!I;1rj`g#W|
z;_)&$nC$toxR@6D*ydXFR$Qd3ahJk#Np!KKZ=vdjHGBx7TS|CwqMM3CRo_Q99dBAe
zQhev=$<)VuBTWxMr=x}LL_$QYu+riRl!*$s{3?HeLL{Kj^70r$et@_xK6H52=S>^l
z59I^29U3@(pzKh<FN3;61v!C{-7234NNzm#9gfbuPNHz{bO$2hzE5X*M%hIoy{3AN
IRpY9Oo*KB_FaQ7m

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/icon_dailies.png b/wearos/src/main/res/drawable-xhdpi/icon_dailies.png
deleted file mode 100644
index fb8bf36b18fd9c1b1be4928cec3db494b6f1b626..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 271
zcmeAS@N?(olHy`uVBq!ia0vp^T0pGB!VDxIZZR(fQY`6?zK#qG8~eHcB(ehejKx9j
zP7LeL$-D$|Bm#UwT-^(NCdGc89P?#%$~Pc6CI0iI7!aD_EPEfQhP@=nFPNe4t;{a%
ztDi%!_yUERJY5_^G|nd{9N?6g%3=_~!}I8AtAq|4+t*J@JYvkwm6euk+`BUpf-H>!
zgju7b`}iEr6&x4PJ-AF{iG@sehUSI4GZsux+`H$F<k8=1PoJhb+@B)7pu=c7^WXM2
z(k=cgl)5-y=zD4J=hX~+W7uyyHNijdMzH+1DP6Xqk54e(DB@<=GvV<|@l#f_fv#cj
MboFyt=akR{0P6f>EC2ui

diff --git a/wearos/src/main/res/drawable-xhdpi/icon_dailies.webp b/wearos/src/main/res/drawable-xhdpi/icon_dailies.webp
new file mode 100644
index 0000000000000000000000000000000000000000..00770abf6ffd9c8d009c2324575f94149683f415
GIT binary patch
literal 196
zcmV;#06YIuNk&Gz00012MM6+kP&iDl0000lDZmO4KR_U9<Ga3pf%6^;+O}a*{t$|^
z-4WTOjrsrIZUq7f2oD_a!eXD~fgb^=r{(-BjCx=%a2wmUs+=Fa^lJqIIr~ciNX}4#
z#nylN-oev|{ws3ZwvjrnnV*pF^%9H-H1jYb(8SS*KtL>lr?{VpyIV@Sk~T=A!NK|=
ytSs8u;xRy@xO-SnkR{0B2q-1+X1-jrX#W&*w9Fwi$JHEca|OI*G1tmmKmh>TN?eEl

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/icon_habits.png b/wearos/src/main/res/drawable-xhdpi/icon_habits.png
deleted file mode 100644
index 70e3f7a5f1d1d7383b261e53d84d42cb46c9d895..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 484
zcmV<A0UQ2_P)<h;3K|Lk000e1NJLTq002G!001lq0{{R33IY4(00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#Gf+%aMMrQ<l3(<eVD^(;^pafkpJ)G*UG<Y(^pjom
zmtpvmT=c4d|C3(zlU?+aUGtM%^pafje0E?m0000GbW%=J075vV_Y7<3h#|oSeYn}u
zb5Cqo0003qNkl<ZNXMmC+m^#12*fLDlhptJ+U==W-Iz6YXI^q*g1|5+L?`HA(qZ!e
zdn6MyO`#0uDcGn#jdjWkNY^1mlNVv)Mcka1!9xZ<e+B>BIy8oNuc8~Hb5Z%dRU};c
zX76T|ah@;ytLk}kbOX252tN5o*^)IaK-a%3|5CAMq$R|s)K9iM?RIZ3{!6e$YgW@T
zbjd$;ylwOaw#Ht`oEztlz#JZP{`r$VpUW5qS&S$`;YytC3eNIn>fQ=@MXr1IspNH&
z{VviqLkldKdr3a^3VgBFwWaXaEjCJ(l<s&x<GJy=whH6YOFHkjg9-<(W3BT)E>=oi
zVH`CFg9oVt3kS*u6fM{?Xv2cX1$bDYM<sYrqt^s@NugIHdO@S(0Xm$ZqY*lo!DHb+
ahSDD}Mnw@zbxSz_0000<MNUMnLSTX;ZPc~^

diff --git a/wearos/src/main/res/drawable-xhdpi/icon_habits.webp b/wearos/src/main/res/drawable-xhdpi/icon_habits.webp
new file mode 100644
index 0000000000000000000000000000000000000000..f15f57658393a7c1ce3d13f0f9162127590c8a15
GIT binary patch
literal 400
zcmV;B0dM|NNk&G90RRA3MM6+kP&iC`0RR9mJ-`YOhk&S&)XWLsi$eS>fYyeBwr!ZS
z9EyHWui3P1MCbnhYNukgk!&SD#NC~cnEo4~6ruo_y1iY@K3UDlGd}vQdF}&)hTutr
zBCou+;{#%3yKx(UHw{r#|Lq0<kDme}`tQJP8%MHt_e$E#-K4yMmJFr#_Zb^}-d;<f
zGsY_8kW%A5LLXPyH`Te0YplFuCF3GxZIs4krUi=kpSBcv(gr8T)VwoL_TEdHbi|ot
z=WVnadD1awwhGpO#e5s+3WHrGYnZ4%rc30X392{Y?cv&G-iAMPZDFLBgxa8cHkqz6
z8xt#+>EJ6O<vWcdRxIm7Tl6VBWYSwT+RyYLdO@czk5<;X(a3}TEsw=b=ZTi2`$$@#
zy++5IoB!ooFGk9@NUHuSuubs=i?f)GoMr`6c&F>leY>+5v5Gn*8t4yb6|^JtDMe=p
uI6Kjm0bP~A6%k#H!JPozg}@yU+<n2FA3Sw{Cm!&$g`M>N(Ub|Ea0vk6LdA3d

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/icon_plus.png b/wearos/src/main/res/drawable-xhdpi/icon_plus.png
deleted file mode 100644
index 2190e44758d57d7ea234a1dde59fb2843d7f46d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 314
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBI14-?iy0WiR6&^0Gf3qFP>``W
z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{&`Oq$B+ufw>KX0HW>)CJzVe8Aibk$vV~S^
z)27D02W%zHpZzX=X)n6Pc1!-d%5;-i2c(@Ju`XZ`l&xes@8jQG(<U`-Mz}}TI-#TH
zU%$jUsI~hPU7xysaq+tbo@my_=1uGFE;JNdvQeRzHB-mqGsmwF>(^e=^Z8$y&zWZ#
zQ&DwAw9-%L$<G2eX|?aC&+lKXaX!Gsx{7nxBH83({?g;sSA6+w<VrnGsPJA&l3skQ
z$pmVaSCiRIA+M%u+gb#x7hj8uPz`hz67ouZXI>-b*61S60rVP!r>mdKI;Vst02-ll
AR{#J2

diff --git a/wearos/src/main/res/drawable-xhdpi/icon_plus.webp b/wearos/src/main/res/drawable-xhdpi/icon_plus.webp
new file mode 100644
index 0000000000000000000000000000000000000000..fdc1b5ddc48cc6dde56b06e390cee5493c4060bb
GIT binary patch
literal 124
zcmV-?0E7QhNk&F=00012MM6+kP&iCz0000lBftm{H!%P6KmP;*6j{Io6FhY}z>7mL
zhJaCQTW!EWss$wA0QRW@DA&J-l*fv7ME@tiybq_dM%-XkGDHQq8_-e1iRkQxyk;$;
e-&Lb%e$&<=DZ!fehY@?IHYnhg4OV4H!F~WEWiy!o

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/icon_settings.png b/wearos/src/main/res/drawable-xhdpi/icon_settings.png
deleted file mode 100644
index a637d57c56deac74d4728e06893abefa179d7530..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 614
zcmV-s0-61ZP)<h;3K|Lk000e1NJLTq0024w001}$0{{R3o2?rW00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#Hc(7dMMrQ<lU($dVfT|<^pjoml3nzaUiOn*^paim
zlU?+aUG<b+^_yk?lU?<bUG<Y)^^;xol3ep^o98(I000qmQchC<iy77E_B6i7nN~&&
zv88N&G(-9m00058Nkl<ZNXNZb(Sm~@46}d+6p;P@&z^!Ppu4$scYPZYtVvqBuKR9G
zWU8R)E;68hRM8{cLkc`j0dX%~eTM4kf1pxtAzwp<hZ_$l#w~C_M+bB9(H3gifuZZ>
z2zB{^i_p321}qO0>{$_+Wbi&oQ$vq+8J;SlHce~j0#?s-@~Yvqh3=tz!)jv#3CfQM
zvav_ac0%S&8llKa1n7KV+EyYHsglA<bC0=YVqPgy2qZJz4Mz*_!a%M9wJ|Kqi=-AU
zQzmkxqag;eSB9|^4;*89${a^V_T3$qx~Scr80w$D#`YSN94We2&8A?=?i`&z@M^8t
zKF4E}Zu1>hgDHPn){#@WzLxr}|M<$Bl+8m;Wp3N4^q@ka3mwLzLLsQijkGtwL+YtC
z?Q|-yK3jaq9!2Bn$CG6gLXIhseUGSXMO09QvHbjGu)Pw88oIy3ABJt9?iJLXp&uvw
zHcdLy^tm_;OE8Scus@^dayvBdmpZ4xaM~K9nQ~hAn-_<izjIx2E=k7K%ozw6V+d#X
z>8yc&HF9|v``tnBuO?I6gEB^G#sJUx+i){}0Au+~1gBnvJpcdz07*qoM6N<$f=Ch;
Al>h($

diff --git a/wearos/src/main/res/drawable-xhdpi/icon_settings.webp b/wearos/src/main/res/drawable-xhdpi/icon_settings.webp
new file mode 100644
index 0000000000000000000000000000000000000000..907327a5890f59d2e313ed163426d182fdea7cea
GIT binary patch
literal 516
zcmV+f0{i_^Nk&He0RRA3MM6+kP&iER0RR9mIlv7NkD#b+8>rbya{LkOUm9xLwqYbA
z{|~vhscqYak=FeGY1;y;2>_%a1O1y2gP(u9^)v)<-5-3CX-GtQmvM{V#)&SUrC@v{
z65Nt&YW*GomTX&9BM=U71ytrg+l2dwxBEY${|?-?jU;*R-3)p-Y4!`@kLjYOh_2T-
zaYRK2&X>3m4Z{7>XUoF6{s(z6<rlas%8<Zdg2X6jw}A&K#)TO|-zb5pZ1fN&R*VUc
z!2)^T_gZmiXyeJJ-2&<3A)W0-G8?0&$YnrNs@guPuFD_}A**h@WcE8B+rlX>#eHJ2
zd9dM$^xZmiB7JwE2UY!hg@luKQ*}KCPq-U0W-w?Xqut?w8q&6yHMX(Q6HIz&ZXR4)
zNE0TqZFdQ;sBC88%K<iuAJJw9F(y%XNlglQc#LUL^|5Hf?0I`$`ukba*Qkc!th71j
z^F&8vxpd1=WFoZ$uwjyD_yl_7yXE!}l5Bm#VMxC#in<Jme1O;vFNT^w(L5YT&KXDw
zcT{vMB#f|2a&r|nPD7YkW!Yh%{7w;YedF^JR+>F8<mo_9*L!A~XLd^kx4m6a9IKdT
z<#eppo+pIcsg%3pN$7d{I-dBRU4~<4<JwIbZVmPK4z8j-4qfAa>~V2<cI1x#0zChD
G{4E6z4*1pp

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/icon_stats.png b/wearos/src/main/res/drawable-xhdpi/icon_stats.png
deleted file mode 100644
index df98550f82f80c0db6cab6b504e25d74746d6410..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 675
zcmV;U0$lxxP)<h;3K|Lk000e1NJLTq001}u001}$0{{R3pIFN*00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#Hc(7dMMrQ<l3etYT=bb_|C3$yyMF(YT=bM)^^#rm
zm0$RiUG$S(^pjonlU?+aT=bM(^ps!ql3er0$b9qw000qmQchC<`PK|t1mi&LAe)A1
z&AD_g2oLs30005*Nkl<ZNXM;K*^(n63>)qnn*aaVO)WT>Zkl6icuFb}*s?79=jYFl
zaFS>lt-lU|F2m7Qod9J<hw@(na}Me})Ow=XCg+CK+mAA%xT6h8{1Lq-HLMk9CFKw`
zv4=%viBzaR6_V2RO?8Sip>n&f%B3!Y$Y2#2SB%7>Q_j9`)@T>OCMbdA@T@8fg*h-H
zotpl#x#I0WY^>Ci&RNt52}R&LSsE7u`6gPT6-9k({V*ONPn@ORDZD3`5mUZw`A{ta
zEk&URicOdix0&RF5&o6k$0DSg_a{fyQ-x%B+s(Nxv5Lly1{;(+R%zNL<nyU;#-_l~
zYS4hX-S&ED`_C=Zx%vc(s*w}douZJ=S~*JlxOIocn*jWy#l-Nz8dQ_qm3wv+&9uw7
zb}wOfk?T&jrGFD@%Q^tuqpd6!e~moH3oN`Efo2ccb}4{4d^*>8o-FtW;ZN(Rw@86A
zx}P*MD~^8?mmc8U*d9aYWH2O<$MF|KR{b~;u74DW8jOJI+5vimwE^CioYByMyJ%|?
z<DIoGDKQ^&HTub7@itgJ@Q~QyD7Vk4Hdr18z9`xz6_PnxS3E&WpX17~{|i!BFGxz~
z>3L_)#2Ie71akQXTdkeK(-CZI(N*@A>%nS$c^joBzgy-P=O3SgLPHW8?0EnH002ov
JPDHLkV1g>3IOqTX

diff --git a/wearos/src/main/res/drawable-xhdpi/icon_stats.webp b/wearos/src/main/res/drawable-xhdpi/icon_stats.webp
new file mode 100644
index 0000000000000000000000000000000000000000..a68b8b9997a377c630f8dd3026233b4f40edf66c
GIT binary patch
literal 568
zcmV-80>}MQNk&F60ssJ4MM6+kP&iB^0ssInH^2=Lk6<d2jXTNZ6~G^_hJmzg^7;34
z7k6`}ux;Ch$^QqZ(+UCrC}Y{S2NnQ&L*|Ihl<#x(NvBp=l5FZvJt;v_R%EaUBmLnp
z08m;&B>!jsbyajXKt%r;xNW4Uvy68)cwcb;N1n!-qm~`5K_91Ck}1X~Qb$uL)RJLG
zr3!XS)HLk|10<v_rL~<YL6!!JHx?lryjh$vg}hi}J8MdlHIsRQ#_oZ4#1z4ct5~Yf
zOsJ<$U=W&Y@^vVGj0SqXVV$D>h$`v?Xzze;C|8ml#;KK$e4AogETPFXP;E;%;+*uS
zs22nI#Kt$s)6-edUNRHle28cx*=OqKece(!vdjcBnz&&CavAqD2KmQ?qO_!wt?Y&A
z^`5iqrG=B(*<oXgL3;M(+{vZzh;}kv!70Y@h;t!m9SceK>{}>H>Z3}EyqoetTu;eD
zm8&Li`$CodW&NQh-|^EHrv7#Il@%kgf}&4+<5tW>7S*457t-~&h-$_^*H<HV5R;jx
zAgjp5XLBeRLE4zh<OT{A`y@X5@cb*@QNFT=C_j>q^9ponf16?}q3Kw7YwwfhsXS?e
zHQxJ|%2*J%s8AP!raOP8y+H@*Q8txAIr&HbnHCRK%>DJ|pFRic_@IdH@-`m1HN2iA
zcbUO9{@F{69|;qLBi?ET@mA6$)Goe*D#JFO#38{re)YR^*vHF>Df>_2^SDbLbMgOy
Gzaj^Cq8Q2m

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/icon_todos.png b/wearos/src/main/res/drawable-xhdpi/icon_todos.png
deleted file mode 100644
index 90a1ca2066142ae6d98e1778e9768563762cc975..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 754
zcmV<O0uB9%P)<h;3K|Lk000e1NJLTq002k;002e=0{{R3oypGx00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#Fi=cXMMrQ<l3nzbU-pz<_LE)plU?<aT=bb?`jcJs
zlU?+ZUG$@K|C3$xlU?<bUG$P%^XL|uy8r+H4|GyaQvmlXKxI$v7txWw1+jgga|Yo3
z0006-Nkl<ZNXPA!J!lj`6vu}>^~|k`oQg@Io}ejg)JCunf&^3Mqp~|Og(%8Ju!uH^
zjfG7V!B(-*(ksN21_CMbLBPVsv$2wdgm_*w@b|shnYn#4yLW|!O<uEmZ~yn3H}gJ5
zsa^ZO7M~p)9IJPhTv-5F>qQ4y@iUCwuH<Q==Ww>2$67(kma{dF(i*(Z)a<S4k9QW=
z9`kc9Q#8z<cCPa4gBjpLCWtjBD>1*<qc8LHC_H)Ni7t}n_k?hbqA4BGDPUtjvdJ|f
zJS76%R369|QP|B&0FuiUY5zw;(75m%B2O66hCGM!w6$=z9{Uwg7LGy)iYcUL-9QC$
zRl0yw4^?9~klGJy(W#Gh0;x~HFQwL9r7`FjXWBb~!(0d3DG+7kdMiz<0@Las>=q3u
z0&dC7HPjv$RH2rD=wCm5Q9NT%mrO)GdOK32CKHqeaY8*26@F2p;(nNAJW(}iA&rV^
zw%AHCCOU!}%AmemklF`qrbHjj&q>pnN!3mPe^R0YW_68niwyJWwT(_>N3~I={Fh|?
zxKh!mqlt4CvX8mw8V)t!>Zd6({1rH^49cF(X_s(g_ia$>;ZwWBdtE=WG`*J6`ECTG
zpd9p+H!nCS+2)*`Ew6w}epB~njKtZR96cYnf`d6-<ss(0#ifj%N;ZQ&ql&&E7*1}~
zpf$v=XP6U&ZTpC<ckRbp{n8xCn!o47u*bXXE9zQWb0Y7OT5oIm@~^3vR&#Hn!=-px
k*YDlc`oCVUyOw8v0m<y{ezs8T?f?J)07*qoM6N<$g7vgw@Bjb+

diff --git a/wearos/src/main/res/drawable-xhdpi/icon_todos.webp b/wearos/src/main/res/drawable-xhdpi/icon_todos.webp
new file mode 100644
index 0000000000000000000000000000000000000000..0bf45b3d719e3a08af463b12011de8b3938fba8c
GIT binary patch
literal 606
zcmV-k0-^m<Nk&Fi0ssJ4MM6+kP&iCV0ssInM?et}f1sdk8>Zc;jz54K8VcIBVUqD@
zFs9#3+cqwL!n+nlkt8+ujO3gg-~j)2&=3Mt*5drGd+$3=wK|r0E-3J`LIlSk2s2#B
zxoz9np7YtZzh98?R<ZtoQ97-Y_EQ-rrERmdZQFdl^~Lt{+;i@eDrH3f8MtkvC<i&l
zfj`Lq`p`IF*s%A>F_*@k0NC3lIR=GCafYS>Z(d(R8Ctv-uc8j=o~%G8+mF6Mgw4~Z
z-3rO_;|ajh58)#WdIc$d2AEyY7?S*YZ8s4~ocd~U3D}w>`f!=E#)G_Whr4Ok8?{5K
z&T`<pm^OI=XA5jwD}@2{@-RI`r48`d&)pQA4%ljcU;B-o!4HFkhZ_UPi0uSW5Z5vZ
z_QtkshY=#L-^a2%gnE(Zq^s^129<TKJn0K9s#8UF?^O?Y3^_6i$k6>7YK<t#lz})(
z1W}KI{w9sD9367@Pl6F9vLlpcX|u@^DU7J`9O1ip@EEei(d)pC>E*`e4#*Wp$6d>Q
z_^EL)d<sV>sqp|hY0L}X*pXs+0y!F^V5vl;T3$eg8Iy{JON3$|#ft4rMQKW)p4Eft
zDbz_+%D=b=EuwP4-64}Vr8vBVdLscmayAlLnRc1^VJEFwisY$XLtY1wD6wl%Pn~l<
zb+$OLYTDp1P3*$|7}#3iQurd8v>u-inw|0WbvG0|Y8dP-3mN$W%%inL1@=sve-ePR
sJ{H-AF;sgtyCXW|z1!V$jpi5)@0iQDq&U5G>Z_2&os<7bkN(dZ1ZiU?WB>pF

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/magic.png b/wearos/src/main/res/drawable-xhdpi/magic.png
deleted file mode 100644
index 3bb78d2afbbf6338e2df8a6528f0298969bdecc7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 529
zcmV+s0`C2ZP)<h;3K|Lk000e1NJLTq001Qb001Qj0{{R3@<7lr00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#Y*0*8MMrQ<DU{18l*}rX$|;r2D3#49mCY!Z%qf-4
zDVEMCm(M7b&MB46r`q&iu-cT$<|mB7lf~aqwdpXK&&cHSnaky_*z8uS)wJ92JfYS{
zrPXY<-7AsBdb{0q#O+G4<)hK*U%Tpt!{chN)Vd!nRR91040KXXQviaZFyC-sAn(5r
z&?WCO#Q*>SD@jB_R5;7E)Z3PVAQXV%3d_?5L?q0^jLy9OJI)5Fv_QHU?p*6%esc0~
z_|K6ZKdBNR@#qXt#=Q&xqGk?ekf<j+fIRB;y#zS#RVM(=dkv7K;pl?i5AWG+&rB2a
zI96=Wv>sO@V>{;J@%GAC*mU01v>Y=Cn2X1oroE!s`OUj$s-XGsY=x%w%@e&2=hrM%
zz+8D$smX5|kJ<TAN|g{|@|lbGMeQ(^5L&;Q=)pMGn`*3vPHs$d^uFubWwsiJs;bO^
ze7-C#@v*ySY87Rd)pr&6VQ_O9R=<^t$lH3^Y&Mm4QS!D&N0-%9g`;OSn`pp?G7a1x
zkT_MjM0pW7hMCQzjZVRXPi!WK$n`e+DP{B@U^0kYT9<7W+&_vkBcJ@{JS*@AeQ6(s
TO0_no00000NkvXXu0mjf9OV7a

diff --git a/wearos/src/main/res/drawable-xhdpi/magic.webp b/wearos/src/main/res/drawable-xhdpi/magic.webp
new file mode 100644
index 0000000000000000000000000000000000000000..c0528a52b4b9f6ae3a84c9e54e84cebef8600ce9
GIT binary patch
literal 602
zcmV-g0;T;@Nk&Fe0ssJ4MM6+kP&iCQ0ssInBftm{hvPbuWT)9P1;6B<9LR*=rDG=z
zSCJ$sRvk0?H}pQAf@gsFEloR!BuSB~d!NC-!#BV%GmWT?q!a}#3ON6-lXfT|1n!6X
z$KVh$!^07H*a3q>IDqcQYF4XKs#=s;Wbr%~isG+1fHclHFp*p4CGr;9nD4NU(}g2!
z!)Z9h#PV~06WZTCh#(76$jlltu?@i}13*edSPdWo0)`nPP;_HLx|V9JvZW{KY%A(8
zqib7ql!at%kwsP(8P<8}y;Wn~SeE9~)qcDo1>k$ZLv?h=20kqjRRfeM1&|_qBO}Uz
z^)d)ZpdCONkV+(o2h$-Y3L?^JJ%DA~cG|`%hndRE?Jc9r9A;+bbpD@~WLsSwKt%r;
zxosQCPM6_zW<DYO-<C^%kX-L1!=EP5<~IN+a2rW4!)=LOpvG$l-tQxcI4$7x#rdcT
zB%Ds4kBjmEyd*r7?Eybdr#<MSNww`doz6+4pC%r&YHV%}Voam4+0;{oF%s33V~vE+
z7bH?`nklo5q9h@8HZeV`jYLfrLi-Y_F~iK9R;!IfB2kBjAtiIoFKVeqsJ_1u>dM>R
z!s=Q~KA+;_%Q-NT{aUfTwzd|N%ZDh6HvpP4M}wIq9i8y2w5|cv1-TBGS=N(;o~3mK
z$`ofuniah^5_%HF`%7vmbqFA}PKH_+0Lp@Li>JWhhBOcKI#c&`k9+jct2gHO)ebk;
o#5=Nnx&FuFt=n^Ysh=*W_Ok*{(;bqQ+9m(0n*x6aBSA3&01AK<NdN!<

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/watch_habit_negative.png b/wearos/src/main/res/drawable-xhdpi/watch_habit_negative.png
deleted file mode 100644
index 31487cdf00f01ed859dfcd043bdb8b56ed8f595a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 156
zcmeAS@N?(olHy`uVBq!ia0vp^B0$W-!VDy93YnIIIO&eQjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaOi1AIbU|D%G5<-wvLeI-GD!S~-M#D6rd2U#HP>Eal|aXs0fq>(9&O-$nQ
jL`RlmB?$oyhOG=2q&OS+rx)G@Dr4|;^>bP0l+XkK-+nUm

diff --git a/wearos/src/main/res/drawable-xhdpi/watch_habit_negative.webp b/wearos/src/main/res/drawable-xhdpi/watch_habit_negative.webp
new file mode 100644
index 0000000000000000000000000000000000000000..95a5d46d6920b56503f6194f9b29644628ed5ed6
GIT binary patch
literal 70
zcmWIYbaS&~U|<M$bqWXzu<$Vivh{@zFbJp{{QqqKpGioG-^S$V*9rz_j@BL(!;{)J
Zj?61qj^2MIqx8$3@#6%svx?$J7y!Gs7N!6I

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/watch_habit_positive.png b/wearos/src/main/res/drawable-xhdpi/watch_habit_positive.png
deleted file mode 100644
index e762dacd5b33175994d5eb89fae46ca87989ede4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 186
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAd3?%E9GuQzsmUKs7M+SzC{oH>NS%G}U;vjb?
zhIQv;UIIBn0X`wF?gc*oQ9*~KO+8SSwIs+dnBo5Wg!qQj@`^wKQ%@Ji5RU7~2@Fi?
zf@~53yiLZ=&YFo<txk;`%^E$DM;34;vl&SonsF**120Pm^Ftr!4Ko=$ev2;u+gJYx
PXaIw!tDnm{r-UW|*&IBV

diff --git a/wearos/src/main/res/drawable-xhdpi/watch_habit_positive.webp b/wearos/src/main/res/drawable-xhdpi/watch_habit_positive.webp
new file mode 100644
index 0000000000000000000000000000000000000000..5c81f93f7e837ec2245541d16f3bde4e382921f9
GIT binary patch
literal 90
zcmV-g0Hyy@Nk&Fe00012MM6+kP&iCR0000l6Tk!zFEIb}KmP>THk-i=k8<?@AH)%Y
wqDYdO@o*MUkOV{pu>QqR`@%p(|0e*T2li|y{nBOQxP4vAE&)i`A8vCwJ*8_S@c;k-

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/watch_habit_posneg.png b/wearos/src/main/res/drawable-xhdpi/watch_habit_posneg.png
deleted file mode 100644
index 79f6256310174db6b16a665c1115161944b132af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1417
zcmeAS@N?(olHy`uVBq!ia0vp^IzX(&!3HEx+}$Yyq!^2X+?^QKos)S9<Sa{#@J#dd
zWzYh$IT+X&g&3GYN`R1oQHp^T%w}K+W0Z!o;}|udYM6j(3>knVgD4QEwP!N0K-Jd(
zX%O%LVxUP7Iv}$mH77T*B)>=@peSF#NY6yi1SrS6fDvKm0w%Z_It!TLY>?|1^gL^&
zfD~teM`SSr1Gg{;GcwGYBLOrcCo?3XB*NFnDmgz_FEJ%QDOIl`w*aJz!KT6r$jnVG
zNmQuF&B-gas<2f8tFQvHLBje<3ScEA*|tg%z5xo(`9-M;W_kvC21<5Z3JMA~MJZ`k
zK`w4k?LeNbQbtKhft9{~d3m{Bxv^e;QM$gNrKP35fswwEkuFe$ZgFK^Nn(X=Ua>O7
z5STeGsl~}fnFS@8`FRQ;a}$&DOG|8(lt3220mPlD6`2T|@`|C}0(wv%B%^PrXP}Qw
z8_=_G_o3*jNG!mqsU$NEhg~2Uh&FIwK-_2pa)A{%LL*%=b5rw*f&Q^GF|q+W4MPIq
zIV6n{NE%I$H6lqMX#{%9%DE^Nlzc++^K<O5r6wDFbX8~u_yVIlC9x#YC9x#c&d2~5
zR|aOfMwTIlMpmYVR;Cu(21Zr}1`uOV)FPP!3J|M^pw#00oKjFU+L;>}0D-<Ch_uni
zkVe;v&>5PSSz-qaGq4skVRT)Q2zhK4B1@xd^)Jdy1tvzYTMePMA&WuP+vtPRBU1W=
zBz~|cF!kGU0fPmWlkB+U1u}uf2P2E8i(^Ox=iBLwT+IeNuB+8=<ZYOJRr?Kxb>`m2
zdkcQwbm`*Y?2R(3Q`~a(NX@)SHw30kEbiODIV~ZuFu%T9u<NDqvTI#dz6~dIYOQ*T
z>c8&VZ?(`|p0%1Y>!ZpV!B6+z2eK&nyn6HQhT4tNUvWM&{MKKVoutxHmD3vfE<I##
zb?O>TpM4K!pS=9c<o2CcdtE*Vn_aU{>J{0zzO?+3)7z*|mD6_KeCZ|CX8L*q<D}EA
zEwMj%4vHO0&6VXnpYytDm6?Zmi|22-TdNYwgcKMdNS$%Z=N(&0eb!ABkiDurDLCI@
zlC%HQY5PsrKLgU?9RF4Z@BIGOU>=J{1Ixd;2c$(@uWbL!BJB(+Z9HB5T-G@yGywpz
CW3Ffb

diff --git a/wearos/src/main/res/drawable-xhdpi/watch_habit_posneg.webp b/wearos/src/main/res/drawable-xhdpi/watch_habit_posneg.webp
new file mode 100644
index 0000000000000000000000000000000000000000..8407ed9c6606a1a1f3f39d75b72284b32a51de39
GIT binary patch
literal 110
zcmV-!0FnPvNk&Fy00012MM6+kP&iCk0000lD?kbmFEIb}KmP>THk-i=k8<?@AH)#?
zt4NYsjR!2CAPI;H;QXs0zwjH;e*#Gx*Wf$_Ku|1I%Nmil3(}<~8}-Uq>-jO$)8Dfx
QK=W&i<~Muz&%QPQ0BgN14gdfE

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/watch_task_add.png b/wearos/src/main/res/drawable-xhdpi/watch_task_add.png
deleted file mode 100644
index cc747492591fe47a9d79df5b804606fa2a544e5d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 220
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|l3?zm1T2})pmUKs7M+SzC{oH>NS%G}U;vjb?
zhIQv;UIID%0X`wF?gc*ok$~_6Ln)BHk|4iehW85FFRuCA1>{G2x;TbtoKH?@U{G^T
zXJrdn@ZynDi(1N~M~`~co&d=X%_l}ItuuIH0~ib(L}D*A2xxFzm}0n~n}OMd#hGWe
zo6a%gg_^=)5|0*gu`11QiVzZ>rgA)miJysK*+Kh*-ohISfz~j1y85}Sb4q9e0LtD;
A^8f$<

diff --git a/wearos/src/main/res/drawable-xhdpi/watch_task_add.webp b/wearos/src/main/res/drawable-xhdpi/watch_task_add.webp
new file mode 100644
index 0000000000000000000000000000000000000000..9ec1f55d8c50c5750f80f72a129e7c644e5d8565
GIT binary patch
literal 116
zcmV-)0E_=pNk&F&00012MM6+kP&iCr0000lBftm{Couo>KmP>THbWS~Fm8I?01w9?
z7)6rR3LGQ}JOcy;kMVEnhvmdMqW=>R-qWxc#12()Fa=l#xTrJ`Eq3JUnxU_);hJ@=
WCRbVv?~fqf&_3W`N{6Z>Z}9^-R4y6-

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/watch_task_minus.png b/wearos/src/main/res/drawable-xhdpi/watch_task_minus.png
deleted file mode 100644
index d8f4536a5a5148a884eb04d00cadd37b82c8dd07..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^DnQJ^!VDyn9UPtkDVB6cUq=Rpjs4tz5?O(K#^NA%
zCx&(BWL^R}LIFM@uI>ds|4~7Qq)k0gmbE0vFPK5${f7PZf9$pc1q?i0978y+CnuC}
zxiTJP;&ED-;V|)_NUTN+W2}lvhoh)-&q2{x6^Yp&dorG_=3romU#9c)Xvv#)pk4+~
LS3j3^P6<r_jY&PC

diff --git a/wearos/src/main/res/drawable-xhdpi/watch_task_minus.webp b/wearos/src/main/res/drawable-xhdpi/watch_task_minus.webp
new file mode 100644
index 0000000000000000000000000000000000000000..8e5489d461c0c46e6254c6d9d2d46fd9b6cd3895
GIT binary patch
literal 86
zcmWIYbaV4#U|<M$bqWXzu<&sNvh|e@Fbe1!{QqqKpM_CH(&P}w;y#%NM-|%~6jeO^
q<{ngUHU7cg!6g2t&`ojCf8l^Ur>S!*B%)8&Zzx$dyEiF?iva+I-5x>!

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/broken_heart.png b/wearos/src/main/res/drawable-xxhdpi/broken_heart.png
deleted file mode 100644
index 8793117b6745363ea3ba2b92fccb46c9a56ddc18..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6104
zcmV;}7bob6P)<h;3K|Lk000e1NJLTq004*p004*x1^@s6Ji4P&00009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH7i~#IK~#7F?VVe2
z8`pWqzXd>mSCAAbQ4%SIlGB)?;Fz*}k?gdkowSLY#<7w<I4?Do`k^y@uszdyrqc&e
zPwt!LG*4|(D~UawY24b=I_*qjM~oavv1DCbQKVvB2wf;jB1M1%3F5x_z9pAhf_pn>
z&jJfbzZniGTtpK5<NN;qbIzUvaG(3!=RUkhP-2et^z{4u{<rWONAoo`dv~8X6NUR&
zLa&?O@82f_bc4_L>Jw+rz7Hj!WCA(X*VpaK<=y~UejZl-00&Vh`|k@yALVt+W(V=h
z7qz#S>UArLKu+}b?ko6wub?<u!1xEbFBA=@`}$gPnas-;uUp(F%Lg7C8QBjm;i^E?
zb^=ru?GeRa_@JA=u-CCEjAEj0wH;RkV$@C;h)S}&|M8KLgK!UVthaZ-=kvY6AdD5b
zQH6yI#7;Y5;GPi5Ql&kBUp@@Z5!!Zy3527a*am;dp{y*w`qaqC8K@#O$)q2|Bc$y(
z76|psOfL79gLYz@YB93Zg8kX-TP_J>1x{ZxM*=w>iM))z<e;E-Vw*}8it=X4X7}Nj
zuRv*u%7wz4yGBP3Fg}k@AcA`)H`r?jbHU(Gye<^ZWa0+VoGkBQY1K>uS$YSMFkS@j
z;AtaUt}1H=O9i$q5HJ3sMR-amZkl#M*lIhL0&%0ANIoCn4+kz0E#&iicb`8$1ZBW&
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

diff --git a/wearos/src/main/res/drawable-xxhdpi/broken_heart.webp b/wearos/src/main/res/drawable-xxhdpi/broken_heart.webp
new file mode 100644
index 0000000000000000000000000000000000000000..03a3575ae883bff5ba8680f8f04e7ba798848848
GIT binary patch
literal 2780
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

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/checkmark.png b/wearos/src/main/res/drawable-xxhdpi/checkmark.png
deleted file mode 100644
index d5a4ec6fffc2d4f16838fcef1489000420d5da46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 685
zcmV;e0#f~nP)<h;3K|Lk000e1NJLTq001Tc0012b1^@s6#(*Bc00009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0zyedK~#7F&6Z7W
z6G0G#Uv-RGAS5p_0?D~SJDDIm5z^!a<OCs0RwO6D?ARr_fjNQA3G9`F1juuQNFX`v
zvVeur#6{OQR-9zI=f}x7Z()tAdU`%}cfBs)fr{_|<mrYFDBr-GehUU|i7g$>Tig5q
zMr$q<gk0WU!4ee%C3>b1{$3i`#(MKTm_Ehj2<mJpTe+b(H4}!mJTdkP2W#j?EhHsS
zmAHIV0K>tmLV*&f3!<J2YQ-G<%jaU`YrpcB#zO|xEJMyqT&{l&`ls@zgo5;k#vRz9
z<XmmfphSgirMI?qXg=**2QVKPV-4m*_YOAoD&DsaV0`=@oE+T@M`uhtg(uW9j}<0r
zUrZhy1VR5C3+i&-BP$c*_(w2^g(gpL?VAlgyb+JCg+<_^`;Sx)cBrm_+Og%8S+m`k
zxGvGZo;H<)91>eFP#s%dY~d-&d#*VYV`BSwF1WN_)lb+BWy<u}k<SDtUL{aAubM&4
z+kzELDuV9_PQ1!tpi+T5X`mu7`H{+C@MkOlm&dCT!6LZf$=hVOaVH)spI5nbtsfhm
z{pwb$FIEYp<A+nN`ut^WH2V2v7IF1eS5Si%GU`^Nm;`4Iu%5xa(y!l`Rc^z^H1(=?
z$RTTYv0iVs4cxBd&8}Gu9}Zi1V!DNXPLp=FJ&ADkNmJW`V-B~xdb8)OwtIjQC3Y7f
zKbHF}b(v@JDwh($<RTBJ?QSw$Mz6vmV4_rTIlRiHOg+CizuW-wh+9zEy~?Hk@Rtzt
T#6&uC00000NkvXXu0mjfJSi)q

diff --git a/wearos/src/main/res/drawable-xxhdpi/checkmark.webp b/wearos/src/main/res/drawable-xxhdpi/checkmark.webp
new file mode 100644
index 0000000000000000000000000000000000000000..38aacdf9533d6f613bc1a7d08ab4780607bf08fa
GIT binary patch
literal 264
zcmV+j0r&n=Nk&Eh0RRA3MM6+kP&iEV0000lB>)Ey?_iK^q+X8b{N4UF6trz4dG`Z4
z{+JHIRZ-hUk~^=(wESVsfvAzxEDmsh75u-zK_zSz5McKoROIlXB7rrckf6wUgh*7}
z|5hiKMMaEk8Xgaa9<1r63l7^zQl#lUX6C#616}y()dvvKe@1TGMpEVTEb1%dU(V5Q
zG3Wr~Pm}>G%Lj*<WQWVfaT=F|T<YzjxV;%}Qo?2D)_PmXK;C*Ug+cS^17Q${1-kTy
zw^3XQxM~C49vM8zKr0m9s)|EEGSC!I5lCnGJCN4e1`3Vw4FzJXLV-Bxn_R}3Jb8#+
OgfeuKIRg)5)lUFt(Rfz?

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/experience.png b/wearos/src/main/res/drawable-xxhdpi/experience.png
deleted file mode 100644
index 47d16b80f5c077532eae96039339fd6057289f9a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 569
zcmV-90>=G`P)<h;3K|Lk000e1NJLTq001`t001`#0{{R3p9Lax00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#PEbr#MMrQ<|ED4Uqa^>MApf5r|E44Vrz8KRBmbr%
z|E41UrX&BRBLAi%|GZlN(vkn&tNyl3?wcV0%YfgJAOGjW|E@Om&6NDWY3rae_Mjro
zNW+f+000bhQchC<BS1h9@4sN*fS}J|<P~TD00D7HL_t(Y$DP*OmVz)0KvBROj)fvf
z8~*=CCuvi>L2Z&Z)U!6wCA6yc=TfQWayqKI)?8JbF)FY%Mgt<J0*O<Afm48y6NAi&
z!NAR8FmQtxgMk~p6pUQ&J0Tc3>|`Kw*vUZVsFQ$+qplo0UQf)0E`YZ~VHLQ3>=-oW
zd?=|RXKk0jZ27Dr_pk&G>9d{krJ9EhJ^LVVSnf-ve6MiE{(;?y8O~n$RpDTVA>89^
zm0Q(lEoIL6y>hGacrP);%<Y!f^=KY>=oD$34bu-i^ZL`auB!TPJsfD+Xe?#OQRVq0
zo>|K;j_s1J&Sk2d(uWRm)mDiMfgMbct-eaSsn+>vnjl|&lwsu^X4Cyw^;XhKdg7+#
zclBBl2rJhXyt3<C0wHl_511x_z+7ASJUcT8%$4pd5(qMG1wqEGAPBhxf{;rfNI3?L
zluMwPdxFwEVWZ;`DBprMIxd2m9dD!K2-Iz`8y$!L{LFX%nu<1L$v7~+00000NkvXX
Hu0mjfm!${H

diff --git a/wearos/src/main/res/drawable-xxhdpi/experience.webp b/wearos/src/main/res/drawable-xxhdpi/experience.webp
new file mode 100644
index 0000000000000000000000000000000000000000..f2db68b30ef93576560bccd6c26e5316976d0808
GIT binary patch
literal 492
zcmV<I0TcdGNk&HG0RRA3MM6+kP&iE20RR9mH9!pzufd>gBu8_d!1L$#47SZI4Tfza
zDe}QH^<O9RGm0cBQcdt5Q<%pH2w?BC2m~RT#xm0d;Q!mxqCrj#AbHRQL^nO)qgmeu
zl#8CA8y$Xm$jk1w0Rmm<(q3hk79g7y|D+GduU&@m6{uGYY0{_uP?vatk8IJ4>BaP7
zs%{w5R(Ne?-&*6VZcKn6+jiPUX12rd!_0~7wEN$iDANBMi0D5fw{62D7^vHBTi(DN
zw&jduyN+bq(}|OKI(0M(NEA@0K%fG?8t7`^dpIhfJ6kHC+kgtT4X9w-fCjP+Xdv5w
z4z3Mg(ssHH=yWYc=~hz}HJr;}RIBLWT&KfaOztI;-T7n)$65kRnkMiP!Txr;8pEmN
zPBPC+lBsxZzrwzhnZ|N@tJ}>YT&hYE-%E<YV6?Uh`;zMy1G(RiRdCbH8g;AClk1m>
z+-eHyE)Is_j9En<h$k7A4#k*dq;ZlAhkg69j`38^dt+JlF$SoU;s4{Yu_=d`%l9P1
z*W>Zn{w$|B0to&dVlF?*H5QVmn7g^$!hoV$C|@2O-HxFw*U{ySF-%P2ViFgF$QVRM
i7aLWwKRYto$wGFqkif|<F%mf0g-HS@yPQdIkpTc?*zaHf

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/gold.webp b/wearos/src/main/res/drawable-xxhdpi/gold.webp
new file mode 100644
index 0000000000000000000000000000000000000000..b7fb68f8e8317c6e2fc0020a1de6505dc80d4a66
GIT binary patch
literal 1098
zcmV-Q1hxB8Nk&FO1ONb6MM6+kP&iCA1ONapH9!pzKjkKpBuA?1lh%WH^3U<awDlYu
zHj?BhrNMhbApiJ0+zpN+Nph6x={Yn!dE*lPTcP393_?h@vY+6;3_d~z<xi7AbpU?<
z+dLQ~u~Ebqg-`?~_|Oyux~QP50|Eg7X;DCH(V{@nqJTzGfV8c}pHZMFv}l1=pn@Pt
zgfu0ILW{&?kgzP9!B`le2?XyKlTm`rg#sj!!TSZ%3fp4KU`bMvt!p6*mqilEpbA+T
zSz=+bHYB0LsM(Dyiwu%(yrWGqT|B-Fp1iDUfn0qf1??T6p~bX}g+Vi#(a!Cj_p5nr
zKrRne?iV1>9F5Uy#9~pHxw>8@wr)@B_2YBX0@?Yhu5?DculsH>#SDZcN!H>Si}M&_
zLwE;d>oQqOl0l+v+lkvum=nVo!_3SnGbUvYCuInfnYpfImzg{NDLp;C@fS!D{deF-
zlGIc&nq`*&N%ne!MKV3J(EBdH)t=(abSpKQLOY;P7rL)V6xach{x|N(2BlONlAeHU
zI9gL%XKE|T!dM~cwzjOXgCUy6sQkDb5(NQhbsJOKS#6*N1PY}qIvJN<C?rO>nUQUZ
zz=PBpm1~E_7SDYA{qy75rO{5gGD2v~hWG4ZfYHzY9K>HIH!xsN1$a5^W=Zg%N(S8Z
z$x(WGJp)#O=Okr(0Zs&zyA~XZ{|><-`0qUuZ$N+_Zsk{p=n3#vogq+#<|Yt-9J0rU
z8Mg&gC6HXrIQ`$~@nL>^fN{$L+<YW=3Krai);B;ENMal#d7rz`dM)FE&Y5B9A|(HD
z8Tw)`r%mdaqK`yH>~|58JLP5@p4SV$AUt@i^?msT9?i=f6EuL+EI~VGm4oo)wbqZN
z7l^$?&?91;gRWA-2{O(BBC$Bi7~_USgC}52ncy6aSRCiNpp@hFamoc>RXqK{eHK@+
zERP+(;nWKL<3M9^6?1~xfMlJ(L6Jj=7Sy>w3O5i><ZyA~<J5qDtm64$?kg1&f=Y48
zd$}W@hbTJL3l-PouIza$_pW<5u{ez#a_=fZdh!~SSe(c((vvfgQS%+);Y+P|3-*W?
zKsbtx8q1cu@<D7!Qr!+ZGMq$2gK6XR{iTJnA9qT#K?XAO>~$G>9X|7D8<~18xQm-e
z_FJ5MBR8-3<|f8_kqj331V~`*TYZWi%R^utgc+DA2*S1CE|m!ooe`L!VD}L1X2LtO
zv`@elD+04bnhkFV+<HaL<Q4|31QULmr8Qb*%3)D&yE=n0dt@Wipj-uBF4w}$18)*R
zmhnxuFHKF)OkKXUc~E{8xN*s|aEsv4#K<<oZBmh?Nr$PX?pVqU9*RbKp|#o=sg+`;
zZJ^P{b_~-fU1988i)NY++x3-|i(Ow$6x;QA(k!xXd;ztJ+Ef?pyoBY}j3UC$Im1eg
QCbQTBcj?~3Oj?Zw05%y0_5c6?

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/habit_diagonal.png b/wearos/src/main/res/drawable-xxhdpi/habit_diagonal.png
deleted file mode 100644
index bbd54c3c11b6b71f35bb7bdb879c1a0e96f55631..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1626
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
A>i_@%

diff --git a/wearos/src/main/res/drawable-xxhdpi/habit_diagonal.webp b/wearos/src/main/res/drawable-xxhdpi/habit_diagonal.webp
new file mode 100644
index 0000000000000000000000000000000000000000..a9a8c8f18fc6352f56151ad508907f44b3885e5c
GIT binary patch
literal 678
zcmV;X0$Kf1Nk&GV0ssJ4MM6+kP&iDH0ssInWk4Aah1^DxBuPsBmA1WqDk7FUB0>&i
z+oo-;YwH=QZA3QG_ifv@ZQHhO+qP}voHHii<UjiK-vgi1%Dw|$=i!H}eLT(q@Lu#f
z9%u2Zr-HU|JA>cbN572ADg4=hVO&n)FDde7aXNv&_L6TDhhz9hi#BmMihowHh}~iQ
zyK4-4*d4+rwVA`_AU^6P>lils@nK!Ju-b=Dd%?7X#U6ZKqaiGI<Dm;XnC-+<sVkW6
zz+2NtFx!U5-Y`sHvK7x2E?}}5?@b!OXd?pM?qjq8k;2;;twW|-WenCL)RZm;tC8wx
z6@!(C^{I*8as&(Rp|=dla%$);LA2T}bQU37#}YaV5N>D(o%u*NrGm~}#GBnfXEyRJ
zY%mjr<`<ZbMl<qEL!}9Erl3>5G?P%ORhS8ARh?xVY9&M&gIXF#l2PdO=p@((6x$MH
z7@7^pF%;DbVhl#Le;g?WpxdF7Q2kJ@XNW#%7m=YC+Fd+})D!i(N9c}ve+4G!ihgTO
z0(Hhf*#SCYpyMa+wZ}pw@3h52$4;JWLt8+T^Gqum7Fu!gS_>K$`XcO=W;9IH`sA^u
zR7|v&?vch+O!P|N$y*Jnm`IU#@>YE+HX3;HRy_(fT2KE*9SSx&#B%afEebZe#C`Hq
zjsMu_zTlI$s{GvGlHilqvb|s65ckP@Q6BeM&vKF|*ugT2f%GSt^afIzypng4E7yx2
zdj*{&^O;TU@I`C7lW-Z%7SOB^c9Ku8rB`W=$vNp{)78r)$CaG)GHc{wh`-jzJ}H-K
zhBxnA)Lr1oKn4XSyZyjFhx8P2vQxNPra0=;KhZq0#XyA|Cwm3UQClZNO)=X-^UX9t
MKdn?t;5bPJ0M!vm9RL6T

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/handoff.png b/wearos/src/main/res/drawable-xxhdpi/handoff.png
deleted file mode 100644
index 7e1c33b492fdea4be0c23a3f3f2b6fcd1eae65a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 731
zcmV<10wn#3P)<h;3K|Lk000e1NJLTq001)p002k`1^@s6TSUz$00009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0&q!0K~#7F?VEvd
zf-n?7KVAoLgmi-135pxIfo@=(Ks!P01lkSi1lS4MPCz!$PLTe8Bpy`)@jSwh=G}b-
z3<vK5f&9b-j!;VV@oS1P!VnmJ=$<{s7Gskn$=YcT6q#b|6mN12QFZ=FNo0jz69@x|
zF~nMu<&8c1K#@6wBSHv_Ocl4pfkanX4q>vy+L@UZs+k3Z%cNX8B=Z2_LL#YIA(;V$
zjW7#62%mqK+0_tbxDsW!a#b>S4rTT_x<a@Xbdi}k_aRz<UiraM=;ki7uK9tY|6=3t
z8+#eN#7C}WW7Eu)D8rQ~;{$wH4lurSt}L_V%8qwxVgjC_B!y1)IVJxLTx*8%65?nZ
zt!H&YTxGtY`sG$YjSx#2eCm_P%<{7Un^5yD<Nuy1o!g}5yz&zv&NBM^nuG@B!mMTV
zIZ`ui8*14ZAun&uc(4?|#&8+bD5MqJDG8Y2F&<l&(KWk*b|ImakJjwc8gXUdL*^Ge
z;X`H#e)wqpp1}v;7Vn#TxO|wAy3e+;B#H47O4B@6_0Jk%3bK}Q7SV;-%HXl*&LVmT
zmNI9H=$+Wf(21Tc0(|>3w)r{|DrROFxXMU4P03Q4_R%InaPFK9p_s`eG1eHV-fo3$
zu36W>@SJ^O-i#|zhAVLx&?l;xZYgStyqf{!5XLl9sF(RP3paO}y{ckDYF7x?f-W+B
z;4x9Vk=QhICCYFm%5dcxWDdPgl93QL(kzh72Et}*7D&cdmc9+v<s?T>Ck|#19ug??
zUj@EQE>$?>s%b6_7Fa0$WUA>8bR{7w_>A!ceEwS_p%`s`qrod%p+6pq^u@^6XB+?k
N002ovPDHLkV1i%MK3)I-

diff --git a/wearos/src/main/res/drawable-xxhdpi/heart.webp b/wearos/src/main/res/drawable-xxhdpi/heart.webp
new file mode 100644
index 0000000000000000000000000000000000000000..e454c57a11265d4d0597ff13e2b47559f3100a4a
GIT binary patch
literal 1102
zcmV-U1hM;4Nk&FS1ONb6MM6+kP&iCF1ONapH9!pzmj<DcBu7%#%$|Ku;`zgQApU2%
zlLjQWksL{itgiLDNBjTZ?aiC6N<oYy$&pfhuLaTv{I>@`H0*RCh-4e9!Pnq76Ilff
zJP8Eg!}q@(rn;+YEdFK1?!{7fA-IgD5KR#k#YS5kXp4omve3#yZ8cRr5b3B4f~MMH
zp)y1SY=}ezwm5KPFNAmMh^7Di$4hJ$(dekZ!5RJ+;+!KUNPPB(HUIS<bzP~jR18}x
z{^5@n|3D;c_+S71Czr8U>T2v>T*}6FaEV+;F$jvKti?Z3Q`-fB02zcNzycEGjpP#0
zgcu4+kOzDUm<$|93Lq71LfN2QF=z;AAP^u<2oMMwqE^{(OT~o9Au1B2A{7J~k&2U<
zOqxLfhe0tpd>xv1cL>gCDh*I~A%5zYmI}duOK%UaGBDQ;VvbG5CMzN!vXC7i{{8d#
z`XC8{gS{g=oEW_mA``QAraP&~8S`Ru&&|P}Tfc8V-XGs2F|#w-8EghS0hgZ>gS2hi
z4!PN_ZQE{R*NvUjjov!8ZQD+*ptc#c(NCIr-ko>nQ$OAl(SHYS+eVVy!5VX^dv*Sx
z`~OT^XjHoxoiU*u;<QIH;AVWgK#RN10MYjWGA96`$x0;f^GOlAiUHt@@O(Oit^%4%
zP6pC>wQ((+Oe5q%|5XNoi^!Y5R@Vz(Qx|4nUR_-K<aoXq`J{vzh5=}J)C<63%=9}~
z(izDI$3f>}0EO8MfFcdOB(KL{pvVL`4Qkr+Vv-yY>M5`t17LHBYrh7id@WXiyQ31o
za3DhvX`0q&H1E9c!F>$0d>*9nFYfVpX(R{ieJVz|!EMgZJPw+iGZw(!PKo0OO`rzA
z+$DyvUTFfg*sPzvf?_?fV5@pyjvlin$K<B1GEtEo)AYcse+#5+Qxi-{K;G7ws6ypo
z%ARSI#oH-Io*Ma^e9OJ8rED;v_!SEi^zB7?FW}9M*)of{&8-+Ht$L85NIC;P4r;&8
z+^%$>Y?j%|?dvJ4e%Omf21FaCC6oa_2Bo;Tn$R&{&ntG{dfW@3mI0xiO3M`kLYxNW
zm@QhpWv^_I6^C~3-{;c{08iw7%Ijk)0|Ev~CKhPg@=ZIZ)*afl4+k*POK4(1tWG%*
z4ERhKTDm~a`ZdJlaGy}mfH0x8`-ZgZ4;fYx%Ql+mXKa>uL-#QtRBZiDlvR#oSgzb?
z0_cHx``+~uG9;38e1ue*=6HJG7-i<<i92MUl1o7KYtYfZyBP42SvUrmd-kG6(Iub?
z`ogVgua1&Gw_MIDx`b3$@``B&#>Xf&fl4kx6|#!xpzZHZMqEbG9?ImM1q1_ofrxgU
zk%?shki$dvB1LC>TDhGvrWd)#p&DsVV*oDa7LT0@W&lz<bt)z41_O}!o&mV7^qf~i
UCT25UCT3GbCSp@bCfWXL1N~kCga7~l

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_avatar.png b/wearos/src/main/res/drawable-xxhdpi/icon_avatar.png
deleted file mode 100644
index 2387e92aab5bb055799157c175a8ad810af5a419..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 773
zcmV+g1N!`lP)<h;3K|Lk000e1NJLTq002k;002%10{{R3v}&Me00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#Gf+%aMMrQ<l3etaUiFh*^paillU($aUiFk+^r341
zlU($cU-*|}`;uMslU?<bUG$S(^pafjSY(*90000GbW%=J0PQZD$gV+b2>2ir-dc%!
zxyOAn00071Nkl<ZSi`+o*>dC{3>@zJ`2Vj>HkrcUF{rUqt5;KP9WANh_4-d{y-vm?
z?d=m3USw@13%}`$iS=aB-0&-X!2Cd^-JoQhnA{35xjHqs;Z&&$bG4v2q7o)B98*a%
z2#!8QB2~^xo|2|%9M6Uz^qV<W4*@ez0;%q}8jkzn6G@;|oqJYLbUKL0E{^geZi!~v
zUFK6eFyDfzumQ=$NY7jB42w)ZIPz_|jf?r2HeND9q73|OMWqP1tpTrJt+<O0@Qomg
zG2IerpB=Km&pNjke``Mr^E06xLiosmwq{7nE(Ux;+ExG@QAo43zqx6Wf&;wn5}8S2
zuL{y7$xSHf9X8pHaU(BTVkNke0$Y#wWB#)MZ)^48lkN5hwYP1jX5xvKy#GcjrBo-2
zZCGm+kR)o9Lq+otxGtk$QZ!Cqn5juf0{Ted!~p6(0x81kFD#>z;RTyrh&BOAWUEuj
zLMV0(!;}!YBu$`&B3*^d$uf_S3lQavC9achbKSOVceMVpf_$OHw(P9y^i7;^Bt6%}
zn@E1IPoWMT>g7~6gk?4GB!6xO_>wqWFWbfu`;9cVqd4!*r7T>m%J*JIr86nY+mL3P
zcWBFo5pLbqb?$O6J3A=wunQCh@m|3D&Qfy}P^3fRJ#H+|=~|AxZ1(#=zSG<ux;BwA
z*dIlccYx$kHvY(?cnI@Q|03D{IM~8;W;5NvxIP?F|G>oOTgW}r<D0?#vHiQ!+*2IK
z;Rhq|IjKCuDcIv28P~u+f13p2Og?W^++5r&s)NH{^0<<pkuty600000NkvXXu0mjf
D)V*tl

diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_avatar.webp b/wearos/src/main/res/drawable-xxhdpi/icon_avatar.webp
new file mode 100644
index 0000000000000000000000000000000000000000..e42a581fb40ebb83914a7079a7b29fcb9908c16c
GIT binary patch
literal 640
zcmV-`0)PEdNk&F^0ssJ4MM6+kP&iC$0ssInM?e!0hoGQsBPTa;9)AeypN4|AZJ12s
zk6}D-6t->K$p1f_)k<k3Now>Q-#w%I06zezlCrV>vgZr5{m+3sFhuJMnvjc3ApJm5
zB>9jf0BGGdptpnsy8m?>u#mR@i2hFi{4X))vUkZ5pGuX)NHslzd&=jz@qses=q$G-
zlH-)FDlCp%E~?_nQm^Ua-Y?m5;l3ivN2bx*ApRivg1BrwBmBhNZ7cc>v5pAlI4m;U
zk{G$b=fVa_USwDa4yI)wrz|>WIGS0L?9&Y!4sS#ESsKA{(w0jWJ)g^(WRIpzaGYB6
z7+Uja+VGfK_Q=}wU@dw?jU7;Q^gvDU0tQ#U05l06L3D6jTJlKR@*u5v6pcK(Hav#b
zJ&MNRTwtwu1WnqxCVKDy(m0-qtP!|wO$g5*iN1Zp(qx<&qOafs)gS}E;Sgg5XPgF^
z=}VeooahC`A~K>S4lx(-A0`p1IfamNC9w~<5Xp9$@CJy}Zw9zCO|O~Y)<8ZK;9l$=
z9pO&QrMBM3I<-dct(J^Vp%TlbOf{TKo#kro=?pe`u;GD3@+75CY00B2eaK6mUD*_u
zJiMX-NuDOunwWXC?cN5Pq$!atb0b`dds;aD>SF8&*J3wF{}I^G;Ob`J@MnwO;qtD@
z{xh_Nx8c$T03d4{uHPCXKo&jR7c|KLRU>$iv<fh^_CnJJz|_hMMVo-4#}}d|7_|jY
zE-hw_-XJX}ZM`wI6f`L>6ww1Ljd#2)Y}OV)*WT^``QMNMfc^yp0Fd}SPJdv(x8Zkv
at%6?oB`#o%{hc1+W87n|+twUAf(iiVY%w7K

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_dailies.png b/wearos/src/main/res/drawable-xxhdpi/icon_dailies.png
deleted file mode 100644
index eeb44de96a380a3e7855ba52d0ca94e09cec8bd2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 356
zcmeAS@N?(olHy`uVBq!ia0vp^_CV~!!VDyZ&I*49QY`6?zK#qG8~eHcB(ehejKx9j
zP7LeL$-D$|<N|y`T-^(NrYC=!9P?!g5XF53F@R+3=SeXj#IHYf7EmQ;NswPKgY^4C
zpDp$`XBQ~Ad;toc_jGX#@i_i=>PD_Z4gxOUFC6;BHM@k%?7HLyrMWk5F8!+SvSGuP
zEthXt)W3e_<gn+>x`f4(UOxM#T5!hD`^&Op-0LG2B_8nEwuYxcTsQl)`qGTZMt`+M
zsUI2j7X6heIBgpg+P-J*e8m@67_u|_vO>?ZPbgj8*vr&V|FDV8r_=40%y%_$*LhsB
zGmbx)P;R3rZm;|D#yz#bJ^%I8s^7B6B)!Ni(4Y91XTb{gd5!-&cC+teHjqB{Mq~5S
wGxJPlUwf0a`R&=-#C)0J^qbNC_h<88=vblfxZ~<gpw}2YUHx3vIVCg!0Kr$8T>t<8

diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_dailies.webp b/wearos/src/main/res/drawable-xxhdpi/icon_dailies.webp
new file mode 100644
index 0000000000000000000000000000000000000000..8630568e2c431bdbc560d296ed519f42aa1ca368
GIT binary patch
literal 252
zcmV<Y00aM0Nk&HW00012MM6+kP&iEJ0000lK0pu<M?jEm(~I8UVj2XJHe3GyPdiQ~
zZL|9KyEjT2Nn&#+;Zet(ePH+=@+r$P8!}=?fNI;evTWl-m*`N5L?YcD#Hr4DZuD;K
zmlV-|MQ+<RGI}hK(b|8|vs7zDtTI$R(Q(R<HbBHELplHnqYUW;q>M5ofb_#M-iXX_
zNr={y{LR@Dtilyj!dXYpbaB)>v$Y_q%*msyJ{|*YOo;4UVh4b{LX^3>pEv?Ng{cdW
zJOPzJG61QEPbA>6d_f%j{P^$Yp9J5xeBbkZ)AwE9w{73|bHmRaJGcDYvvczaxhnzh
CIe1P0

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_habits.png b/wearos/src/main/res/drawable-xxhdpi/icon_habits.png
deleted file mode 100644
index 5bfd5a88af254e63a28068b641065d626dbbcc16..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 692
zcmV;l0!#ggP)<h;3K|Lk000e1NJLTq003P8002S=0{{R30xv4R00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#Hc(7dMMrQ<mR|RhT=bJ&^OIcklw9?bUG$S(^p|7z
zl3etgXaA~h|CC+zlU?+aUiFh*^pjlkl3eqrbbyBd000qmQchC<D9Y{lPnv)k;tU6G
zr8<hRderM^00061Nkl<ZSi`kg+p>co4CD?$MEU=pJ)LO_0nsDU?2|LKk?bxZgt0R?
zZC3$OrE@3=Vzt__F)YzQx(_h%er&gmg#LVByO#ksDm{TR{NLDqOV6?S>);yF3_xFr
zY0@mra;m0C^AIQMa!9`bbj6LbHNhS<cgq!%j_a_u7Ly(G^E$XR+TYwBUYq8>ht<1^
z7G?d=-uAXi02=O>N>DReIbN%)>?UeH@ox~>6GWW7sW#CKOZ~rmoIl!D9({IQ*i$Sk
zBA^I|YRk%IfWmLtjHhx8uO5-Z50Zjob3n%a2<x&}Rb;b>WzV>Vb;IUi8s?$-8lo`>
zCBh&#nF*+KvF)30jl@`Zo8v{Cifn63`1~-odM`22aLW4EUg9D1FKS$G^S<$AP>n?|
zWyO_ebtt;|t+D7{mGx#3cJ`y_Y%ey+rJ>S}2WyM?ujjz)<H%w($5<#uOY~~y+BuC^
zf8O=feM}}>6wB~#sY{*m$&am|!m06M8d(JH)XWOJ<rM*|mTf4r?b34Ot-)8BUf%<_
zfaHvbqth}&t17J{X?GKCC7`Whv=x~4^dLU@Xix2nj)Tp29K_vH`C20A^k}<O;trek
zc0hcyp}mz6-ze+bu=@3FnD!=5JcS^hpb$@gh$mOXQ#ay?A@#JAcv4F}WqzBVZbJUM
a>HZ&orKx-IsMps30000<MNUMnLSTYe|4}jk

diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_habits.webp b/wearos/src/main/res/drawable-xxhdpi/icon_habits.webp
new file mode 100644
index 0000000000000000000000000000000000000000..c4beb1c05ca4580bde681951330050b91232dedd
GIT binary patch
literal 598
zcmV-c0;&B{Nk&Fa0ssJ4MM6+kP&iCN0ssInTtE;IkD#D!8zvdw@s~ag1#KHSxxpXK
z(K#SLqPA@t#_j)eGdYRcNVd}W{~vckmy9CF2>|50+J%^&P$b>yJ$Z=h`WfiXcfuwp
z#Jh(MU!h;*e!!9>yKVD`L{NA{xc_y{eF*FSi2gfp+s2XXtv5aE$&~wn%+ts56n$%3
zVSTkcBYN4)t7mOHskv{2zqReB-kXw#T-zDe9M<9Pc9OSSMAUYc8kh8w+j-_|UO=TW
zu=v^1v~f_w6#8q+?w4Zl*IGC9A*P=#>bK84Tj!gjlU;N%n{~Dyy%Ac6lf87K8i7`V
z%g8Nz*-xL1%r1<K+uP*~JGOboeb&<OGWYbLh(47fJeQo~^+2<`FK&3sS;FJ~mSrp8
z<Rc6Wb{h3^nqJK$9`udc<vcs;quvV7!oX|=D{7<t=~AgBZT!i!zZwP{Vxs&N*Y0Dq
zFFUl~>rABfm%AU`3%{-|gn#v1js>fD<SA^_uLgD_wl94Iv7L?f<!(3-IgT%WLIe2$
zWj<|AE+LJ9<Tl1g!5Z`iW^|JRY)_dAaZj7!<5p%>8Ycq^s2?;5KBpXYn3-o*Y|sGO
z`T|M8O3gBWZ;3di6eN5!??+BPnXuI`H?LCct$-cLLH<G>g*+qj&P(og$Q>rRtLGl1
z$cI<*iNWHOMov#@{=sC-BQL@>jpUvHlTY2b7aiowCGLeD_Y!qsaa}1E*WB9z+#4F)
kTQS_5NZi|B+#7e)TaMhDrPSNJ%p24@y$Q|MI`^Lf0$v6#hX4Qo

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_plus.png b/wearos/src/main/res/drawable-xxhdpi/icon_plus.png
deleted file mode 100644
index da83946522e73e2b500f4357e7362cf567c0eaed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 426
zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL1|)l2v+e>Z&H|6fVg?393lL^>oo1K-6l5$8
za(7}_cTVOdki(Mh=<CS9u(6-}Pa-Q&&fe3-F{Fa=?W~KwhaCi5jxTJSQc&XH<)OY%
z$cc01iDgWe8rQSb{ftVplvZLq#CPZToNu0!EjmSip4_)Juhzl!OwMT=gT1w%&d4m_
z;<qzg{I}=-v<1iXgQgcnuXr$hmhN*7(Pf2OrpSrD2w=3oW%|3E<^LJBUZJF{mKjot
z%iKCv3PPF3+Go_>uh_}8=E%Qu)7b*e{}w))eLh8a%gHnIK3}ux?!7R5*2y#P(yUt9
zw=|dUjkDfwx3jQ)o5Zecw%ts=(|<F*EiBupzUBDI<1@kq^%XdCCsfMszWd>6tNb^O
zukmwx9tCwB|2=osv^#s!&s|7PkefMo_Yd)lyTg@_T;VV@b@J&I2!=DGk`8y(uJ*~v
z?p&KGFn2-IRCV*mP0Ll3uWSgLe(qdEWNy_?gU#uEVU;J}NPjo@=5$7;ZzC{h89ZJ6
KT-G@yGywqm3$-l(

diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_plus.webp b/wearos/src/main/res/drawable-xxhdpi/icon_plus.webp
new file mode 100644
index 0000000000000000000000000000000000000000..848f9f89f15a739881cb09ebccf59dde28c949f5
GIT binary patch
literal 174
zcmV;f08#%^Nk&Gd00012MM6+kP&iDQ0000lH9!pzPcZ-UKmP;*ltCW!fF}fW0FJ;I
z04SVl+x8?MxZ56)NThigJp<Efd$pBlO8c8z-{WPy-({jj^nU^*X?2C3umb=t>j%JC
z91r0F=MYik+#)L3$KV65pA+W?wy`hZcb^K=ufiUG`cd%T3jM1>+4<3oE#8;3Z%NWy
cL`A3>#Vn%48Ajwd)gJ&O<N$!nk~2nDBI8O-Bme*a

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_settings.png b/wearos/src/main/res/drawable-xxhdpi/icon_settings.png
deleted file mode 100644
index 47de4c72576b236085c09c2d055941403ecbd064..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 907
zcmV;619bd}P)<h;3K|Lk000e1NJLTq00372002}70{{R3z=B)w00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#Gf+%aMMrQ<lU($aUG<b+_LE%nmR|RhT=bG$^pafk
zlU($fWc!m{^pjlllU?<bUG$S(^pafjxJg9m0000GbW%=J0M=AF$R*F{;J^{|uV|Ko
z(JEHK0008oNkl<ZSi|jE+mfUp3^fo!qG0>~Upw}W7tnw`cC)oLwY+sT9Ai#6x!85T
zYMH=ZTO7<gup`khX=@-F->{aZ@}m0|2dLmexQ)wGZSiefU&Zym8rK?o!o@6h@r0Y6
zDWDPxLOkG-OSU*V;6|9wP!-wnGqQNy^$PB6$un$#T?H4HGeE(0R<MeTVmlXTiE+X*
zY{ZQeWP$CMjyoX;CnsVFw&x@O228H3jyq!|>fyOBsf?7QpoE((8B3&1Z{ZFF>I4fq
zAVY>bNWlOURTOnt1dO@k`iM~2Yc$eUD};7=BnVo-+W@;afL2~uq3*H&X+XXMV-PAu
zyCeCI1utNBlOAW%hU8@;KTm<L<(kpM^T`|&7oMpLm^r^68O7H#jq!p!_8H|EN|_9n
zC%S;{LZlpqbu$#Q9>7I#UnTC99RQWI@@1^AT>?_-64K($)Dku7!fGzj?VLp`L$Xn4
zH?M=ejjMpXOWKjT<)zI=ny--N;$wWoO6c|8=Q1IyxgN3Phq&HUE)i=HeO_TDCF3kJ
znnf<H(?H#k3ef<$y?<QHkCQWOUaJnLm+Bv!rWz1McxNR!$bvhTJ^o;^VHq?T9x*$4
z)Q+=;V?nbPmd2fx^nnKvHA-SIx^z#gaH<ZH{FIiY^F(H(Oiw~+o+ElSll7gJq1AA*
zTli&%tcsh3M891Ct4f_(*BTYqs3%pC-T(b5Zdb)^<A*l9HHx!F_oC4~ZlycdI++9e
zE1jfo_d_FH4|^VxH}a4i^U%lh<{GG59gQE&^Udm#R&~@YWo_!dR&{E#x;pIx?2SIa
zmihp#Z$ZB3Tb^5%zJ&^!rS@42)jkXOg+5E|3#V#dIK9#rHtS<s_1(?p1POJYoolq3
z!!(;4y*KBQ_@TKRy*!tjQ##$8Ba(M@)dxZT;oOr^;4;&+nbZECga6I%46VM4wEB+I
h>bq03?_~ep`T|KPp=tZ2Dt7<?002ovPDHLkV1oL5t<?Yk

diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_settings.webp b/wearos/src/main/res/drawable-xxhdpi/icon_settings.webp
new file mode 100644
index 0000000000000000000000000000000000000000..46f32a9ee8af18ca52f1068519ab43ed5db49c15
GIT binary patch
literal 780
zcmV+n1M~b+Nk&El0{{S5MM6+kP&iEZ0ssInR=^YxhhUIxq&~nqzCXlILv7nOj0E`q
z*~g|BZQI5h-v74_wQAc)QiGTA-807@0N4LN>GZmG=DBT|gDF6OfSv%2tgmja!j)}X
zO(P}p8shw?oA8RhwelO$e+F*bHu7!Yd`Oow?gz(T+1ill+hnv?aS~n2w_QZ%oA<OL
z8@+ftI0PQ=K~`*&_b`K){|vQN2XN{e?$B)w-w^_GH$g=;t&oY%2uQJ;BK)0NNcBNf
z!tX?7DG}giD$^)O1q=eA9%T@3wqXDr*S?_u;|gLSgQ%8vH*T4#+TdDYtc9vlO}X8I
z28QfJ;N9SKbJokayc9sU=D=m(0(ZL+eCq2xkg;2Xb$4X9jm^c8eQb!e@9^-guR2)!
z3={1A>7jfyn;OIX9VH<D;wl8cU!1^A>xqwpbE!Sp<!da@m_s`!e;X|QJ8pi;Kx4e`
zQxIm<owW%l=WWa~9ByyPW$U(q<%n(t$8IEhJuC0_K-`gsS1_}WGv$5>w@iiN<MiXL
zt-B~=zY-nqZAANJr&Lxr^$oa;cXM8+{C0IyI5Wg4{d0bL2~p-WBnfy2qW_`GE-Bsr
zfH;ltjV@i$eEm@L7?7Qo>6&-3cG};OkAqY%%S}`V>m#5y7(4=hfi$xR?4W9zw@u)3
z$^D6j!DvRd9#?@*c~oY`K9BovGreNnmS=0Gi!eI5dj|!Y0q{9@tHEGQ3HKDTJkh;;
zn`JYFCU8}zyJ2f}!uZIoEV$~^RA;>0oM=vq<qkof$Dt$fL*7^NekkuUOe-2`CGIIf
zw)PnpWcnF$&gwpf=Ir2AX9udY%jTM`l|lOj(*zP}!=B_p+Hq$KDYFK^S;KXAa#0^n
zE^H39cq)VvPK5-OREQLLd?IlZ4km6azQpa3G;;;h%;ifn(<a4PQ~2Bk2M6W-@<`TV
zPTJB_&O#aVEM+}<uB>;INv{<lX_laGVL*AjWGV>EHEDtOj~CC={+LMn8zt>epRB*A
K(*98UC))vYNP<ED

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_stats.png b/wearos/src/main/res/drawable-xxhdpi/icon_stats.png
deleted file mode 100644
index eec092c2b83f87e5e3dad5b07fdd8191e78cdb71..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 906
zcmV;519kj~P)<h;3K|Lk000e1NJLTq002|~002}70{{R3E4ASB00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#Gf+%aMMrQ<lwI|cT=bM)^^;xnlU?<zasQKC^qXb;
zlU?<bT=bG$^p;@wlU($YT=bM(^^#ok)i<Uz0000GbW%=J09E@kmVXBC5^LP1BDBjw
zv72I(0008nNkl<ZSi{9x*>b}$2#jQ1=(7L+YnwK$b%15-n5o|4Bn*OOS@7%ipJxLJ
zjO}KjN#l;+qoZJpET1+%CrZEI?gu&%)TB{3h@+)hZ}i)&T6_J^vHQA2WyhHXkiyPx
zQ{WdaSdOi7m<5;GAn4kxSWpRyh00;4R#cc5rP-j?uz@IjUBz2*bzFa9TR01=7!k6_
z@@<vXJ%g8BM&RDgB+D=f`-YwInXkR<0{ZxgpOy7L_Y_y#hgQ}g=ZtJ+mr+}ibJ<D~
zvUE?bOq1_a9CFoQzGGx#&}#Vl$SE;YS35!ZS+$!J0kIQO=m6!a?*zZ7IG-oTdOn7#
zPfA2?H$zYux<5(If~bx$T4BjqenwE857{8)Yl4`<YzxRZ#3KfXqbw?M37l1>hr5$S
zekopMY6IwOFhsI#LDe7e)u-NwWQXF38|g3(1=Zz7&j@!#01$#iP6;ri2F{=cga}!G
z=ojpfGzvqdfQ{1E7jxGy5{17WOH=`=vs2hPNEP5eJ0({$;IGP54*(UHX+<cpAE*SO
zRMaP~Gi9DrUq#aFLSA^M4+{@Tx(;&EG>j0Q#4tm(6BJ}i-v94D(LZT?s6|Wso813W
zIMOW|iwRH3BcBUL@Hb+DkUf!*9IBiXtrHE|LkTpXTor`S;}-&rl9CAzSydT(w2!zE
zy$Q@QJvFguQ{KsQqp1KWacwe}=U0P7LRB$gQBoHT5|<-SVu(X;MX7RXAC)7wF`Q-7
zm-Vlv*>X5*j*;%l>RXt*^v8OPY!AFSg7B)z?+mDc_ii-bvTN#xa`=9UP;3dGtOg&g
zJBr`L+m7{cF;gz|gjupeQlYFG;a4oXlq)%j2c{OR<xsin0Gpa!AOf|_wBgOsGpo++
zjz@=<vW>0o%=&nL>}=1XTS@)IWbaDe+?ySFd7z-#qlRB|czI!W@`a3HA{K#I_Ug#&
g?9I{3Uvl-GFLi&7vA&>qj{pDw07*qoM6N<$g7&AUh5!Hn

diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_stats.webp b/wearos/src/main/res/drawable-xxhdpi/icon_stats.webp
new file mode 100644
index 0000000000000000000000000000000000000000..6600fd0ea34a93d81ea63a84726f43b5e8ee63bb
GIT binary patch
literal 788
zcmV+v1MB=!Nk&Et0{{S5MM6+kP&iEg0ssInQ@|7uhoF#=B&pVA&DLMwyVFq6wvCjs
z82BN5?xMJD+eksa*?-romBO}-)YLP>@dXIg(w~O@55f;f7VV3K_(u>PaS4PB4lP;L
zAxQv`NNmOpap(WfO;SLi_lW*GkR&y3z;<+n(zSrl55E7J6I3WA2Tv5*`G?oQ;-zUj
z0*@L!)E)&7AZvo7;#Gq=X%l3dQS;2UP4wJ?si2F(WQ#RyeQwRO;j?B+(3hOR&jC~E
zTNFVq@ElP}baJA3P)fSdkVE)`mxqKx_`EQ%B6o80<i&z6xOw6<6%a~=oPy?Ilg||y
zth4`2Y|V1z=8EVo70CwZm3n<kQ?db)y+W=-;c25w#Y%(wF{QJM()=v4$tb4+ZBU$#
zhLN2=M&NiYNWq}{iLbGSqGj2cLmcx{E%Yk>6zH~WXR`J-099Z#(qM%v+>yb?`j?88
zVd0*}Wz7vu-kR+NT!j@^4si+$FFOl36|+HGYM20C8L_+VHF=8=+DpIiYI}9QC(Xu+
zHAO{Zh+WiV<gued)d1ToFskT^Jy`iZ7@Y!!hWOdDqRR|gWi(CrURgKkEM>+9TM5!&
zjkU#_jIgHE2~4+=kxo$RuE7AqMt5m-EZ#H>FLbQd78JGf65Bcx?rni)VI_yDs2ti(
zmo`hkuv5s&lQ`m?ZPoh#mFpTSgZD@;e1HpICF)$S$a|y^)xOG&Pc?XlhQ$tF&`{-5
zUHN{X`$3fpDUA<wJ}QfF4Ti%!w~V*GbY*A|_l!%b*FJw(x+20G+U4qOA`2D{Y_KkZ
zFE7qe#4XxNf?n9Vcoxu`vtD7x9>2@Ps^Qt0wCSHOl(x7&)%^189Ohl9D&_(eatg1{
z_-V7#THM4UK-l%<C1xUYZ6q(TohD&E_=rJKmoSRaMXZd3<UYF>@(|NQ1y(yGGLJoi
zE($t(!)h8MP4hhFne1Z04r0z(QRpHzPIXD-B!(ZPgqyntg29oeJCRtK0$+DGq2Ty4
S`~L2jLM{dBKX+mOD}MmcTY;MZ

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_todos.png b/wearos/src/main/res/drawable-xxhdpi/icon_todos.png
deleted file mode 100644
index b37ffcc61a07bacc57fff12077f71dd72f70bfa6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 940
zcmV;d15^BoP)<h;3K|Lk000e1NJLTq003+N003zO0{{R3Err`n00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#Do{*RMMrQ<lU?+cU-pw-^pjlllU($dVfd0=^pjon
zlwS6rXaAF3^^;xol3eo)cUlJk000eiQchC<=q#YR*c$a)JPK}$aq(7*0009ANkl<Z
zSi|j@&ubG=5XWD#$r_U!tf;p@JgA3K=q2i9p_h6P3h~E9ArQg#CI~$VE(APyv5;Q$
zAcehpD+Lh`1#gN_FuHMD)AzsF_iOj<zM1`n;AQ91O}5|tyq%dhZzhCPR#|2L(AryD
zUQtc`&ALlz@bFu|2<TOhN(*l1MxMV#HQS!%Q?*7kX7foI6{UWTb=EhiVPCRkUriPL
zlc{<NsOZm3C-$O$zP#khtKV6&9i@5jc}$4CJm4RO8LE!*`GNXonfWy<a);96(^%{u
z@e6x!36Zy?Dwc@t>*DV&r3+a0PNd;J=q#4nU}D?CjrZ|Kf)8wP)v1TUC|$)JGD%rK
zM62@$!mll0;JY<a(pJD0Xoj4^+rq^k$@keBD7!(?NAg(D#vrVR!<y{QF$lYg!^j@G
z#xxjl*sXq1SerS^FAU=zIVlPw7PgHgY!#NB!*Wi*ejyusCG?0_0LD{m&MrRAZsv!P
zBYE>Ip=W&<)&^u7GDjHoA_(h_w#Q&1pU9|3I9r3AJ@|?tb7l4A`yj+UiC``072E9g
zbCqKXr^DDT4vebBZeLItt#BGl?2s`g>(U5kkF=Q8P}wlt2?DpN$E=o06UoVO61Jwv
zJjf+KNDL=nzMixm7JvvBhmmKHC&O?@xXpN*u&0vNNUjCZaRPQ%&vhS7<p`JPNgQyC
z?`UhVB3TF{J+PXu=!MHMVRg9EsOd$)GGU!Cuqh?TF}kfLTpHp9&q~5Xichl2tCMW)
zSbzdAtC(8}SRE@wiKD}b!x~u8ZpM$<j!VBMkJ=%22xy1;hqp${GC>dF$8Z(pYn+pU
zM?TM3<fv`n-AtF_?LbO9bBH!GY9-LA*}|Kds8ur)=qP24VGX{M{QernTb3|U=q%xt
zj_90T;ByMp^r|srQmn<6szvdJ9_@FPy$;8R12#UqAE?jAd54u?>0VU8X44X*5fGGQ
zXg@)!m!-x&KgT?54w>bK(|oG312h}g-O%&-$Mv#54wU{WqO!{VoBajjhuYLg$`^eA
O0000<MNUMnLSTYpy1=vm

diff --git a/wearos/src/main/res/drawable-xxhdpi/icon_todos.webp b/wearos/src/main/res/drawable-xxhdpi/icon_todos.webp
new file mode 100644
index 0000000000000000000000000000000000000000..3801a6c57256fade05e20d0c28a28c27f0cac613
GIT binary patch
literal 800
zcmV+*1K<2oNk&E(0{{S5MM6+kP&iBs0{{RoYXBM$Z=fb%8YUnX|34iz)V6KIDDD3_
zuXeR<+b~S||J;nR+5jLMv&kdA_LYtFULFVl$>7vcKZ^J-4$nX`-T(RX6Cw(%TY{Wx
zyG`3!$GEX=yR%W*HY(dr=k%9d)Lq{@W82QZxqHsJzPWanG!gxW;I@q<$w7_w=)0X%
zYM$W!2SvL90}{dY=+ep>qRBgMwF<iZiCPjd`DP-RK8+_e4z>=Ysygz-x?(JYXlEkC
z@#_hQd;m=#L_O`=N|4^#k6x>3`J5V|k!CfM(Ba=n=lYecV#-)`L%!tKPDEK<i&|UN
zBwlfAkJY}j3+T6Mdu!ApVzlzudX!^YKvW89Dz|(Ad_PeZwSv^Img%|WP707VvvE0r
zlPG7{x(Gis_~Q|~jZ$af<W~6ac@s-<KVC)?u*PsFET6NWrttTJTWektWUYaVBi#i#
z-#~Yt{T`gIAyTX0Y*!QIi;?)2e}mKQW5vS49H?<Dmkd1VK;2WeOyGolyw0^~&Ag!j
z=^Di~Z6=!63S~P)^^qgRX`X>RS9dUp<;-7ZG9CQ{#r+KOt47rJI?^#qV-<9ccGRL2
zGc<#bvRF*^*TqO_mOKm|YPpz%b&fRjt5ZEP16PLSoQ9>sBUYtZA_yqVs!BkclsFZV
zJM{!ffCtjyqpOZ~L*1oAklmJesp~K&mpUDsUG%itiDr#}r^it*<}#Y0I(&4sL{y4a
z0||tWz}963t2`12Z!jZSt6YQLxoP&#Su5&3A7wTb;p*+d&V<hqlN08dVxORA%aZ|S
zr3N22!&Aay@)+Sp4RzBeaCl0n^7aXzN9ze(i?=1r@0}eOn~CL2=q|!F8Yb|~mgeZ3
z%<#b7Q4@dGmfNR1-g%bdj~e}VyGHbPPlX@i*Lt$FKuW!zSM=#d4bxZWoV9bt7BR)Z
zUAh>hF{}u9gJFqD%If2FwE8GtMI!D7Tj@-mGnbT@*E;yB3UUGBq=}d=#<N=7*(%V=
eG^Pcuf5f!n4!F9nQO<fZ5zjXX@qBCX&odl>ijTMe

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/magic.png b/wearos/src/main/res/drawable-xxhdpi/magic.png
deleted file mode 100644
index aeec05d7874762490aef51c5e2b15dcf3a5a87e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 647
zcmV;20(kw2P)<h;3K|Lk000e1NJLTq001`t001`#0{{R3p9Lax00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#V^B;~MMrQ<DV5DAmCGcR&ncD7D3;AAmCh)a%qf%0
zDV5DBl*}oW&0nzDr`q&Twdp5}!IaA8lf~c2<nyoC>^z>)h{NKU%H%GY(6-$0aJb!6
zsns=?$fwlmoX_fX!|Xhz+lI{Wx<;1L0000BbW%=J0Pi>ug=feh`rn{n4%trt00FB>
zL_t(Y$JN%`vVtHKfZ^2CDKrz$$9n&#4Aw%$LJnT+nax!*^$%Z&;^p%1M;xB(?!-Tn
zg@oLK6UrMQ<a$QQhkruJhpQBn#9a!?##su=GI5onvg%4l>6QOJd3K4L)Cc90bv^$S
zS!Mw$d6&3Ig%Uak>7vBWUb-l;vzD&P=UDI#rLpnSt;&hERbnmOlr3$GO&VG#dr(r=
zjjPm)%}PF9O?g*XN<rD75;{BSPKlk3bW=`r>1?EXrRdDkFC}fKu~?<#P`Y1B+NNop
z*Yzl*<)KtovMA*p8?4kyH|2zt=vX<y(x}&TRnBvo?z=qihW<#3%4&W*-oITwWJ9Tx
z;)Cx2<F`vPJ_f~_!oO=?7*1bZ4_OA!Z!c6V3wiBktQDEBTu;(q_?9|3yTwN*kR0-^
zDh(M6J@^vCS#*PxMF)3;@9k%-^Gam!Y>EQIskh8niwsY~yZN}pWu2=`LSAjoSq$ab
zOi$h*+Cs8rq3w&rOU$R-B%1r4Z`R>(ljy>Rb(*WK2^+_3ee2O}65ZC(ZW8T<y#Lwz
hAP>)EZ0qQ*_6IGpKFm|S&))z5002ovPDHLkV1n>HKC1u#

diff --git a/wearos/src/main/res/drawable-xxhdpi/magic.webp b/wearos/src/main/res/drawable-xxhdpi/magic.webp
new file mode 100644
index 0000000000000000000000000000000000000000..c4f8f7a810e300c0a6bd18c6304d70106b525c6e
GIT binary patch
literal 818
zcmV-21I_$WNk&F00{{S5MM6+kP&iB-0{{RoH9!pzSLCRXBuC2XY3=tse@X}9Ab8VN
zG+afJ?J9G^ixTjFb$noi&z!mMo^{+vk|JgGEWFo$_s#=`nN9|gYz0{oa5TUKRxygv
zX+QvO$NNpeO;qt0{=z?`K*}GuVgCBR+V=%FNt%YgeN9ctrI)BIGO=xHZLx_#m1Xsv
z8$SJQer^73E}Lok+DA`i&O;QbmJJb73QZCI0mA%!^`rm5f8(wmi{7VyTdZj`xhq|k
zsGy=EDu%n};)*?Z&jfS-0hShk>`)hxjBupZFc2g%1u&o#2n+~AfJ8wcYY6}afrbSX
zsWK`8qQ_WMSvD|gPCoV#<a0sd$m#_C%kFx&@lX*JrMy%Ei#39=6+^GZ@weMUXl#;4
z`%c;9=-gmZ3^H90H;{I1n;}OX4`SQt*tTsamG#a#cCzN+XIDS<cGcVG?B|I7J8&b(
zQL6h=kzo#agY{p}#eyfy?Cno^!G;i9UN|8$=YezBo8otnRWBSUem6YIu2zJkzL#6g
z3dvxZJ;<x3;U4qL>_$|)uB^<qQSmwlR)r2}7Hn!69b$KLsTtLkeXnsk1d7p>CH$}{
z#pfb%(L74=xwyFKKT@$dNfcC@!!Db1K-D8;PMI8ls$p2joUk~=MX@-<O&Pf&a1_yM
zRqY=exLno6C#97B3QK+yYDeESDK0VD=kt}6l>Gb~jTR7U(ag!~`+P`AN$H<3sSI49
zKgH)mloWU9t0f_6FDuXfoaytqQWAUD)vBjv4jq^C?f&jAs6%Ba^yXuWj@l8Df!jNo
z$5eN!-iBmekATwoj-R-3`jF;E9WGDcsa?1no*W37ap+w-O>Kx;4(Bv}yvSxy#K>ju
zMEf^y?3yaIygGvA*x;v9TtTytPFP;5i(V#op?%P=0bfbQCs<y<)480sEZuI9{SvJF
z0LycDG8@yDLDtDWzK7)*Je4)eENAfC`eDxCA)gB6+sd@moWV>fi+Rq4IxyrQa%BEM
wDK&^ZIoX3=D>HS%{MTrVm?`F}3ukwQI*7cP+;-U1UJS=`!}20$CNpIL0KXKGLI3~&

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/watch_habit_negative.png b/wearos/src/main/res/drawable-xxhdpi/watch_habit_negative.png
deleted file mode 100644
index 76b1ac67d5a9752e25c290b50f3daa9116af318a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^azM<+!VDzUW*esiDVB6cUq=Rpjs4tz5?O(K#^NA%
zCx&(BWL^R}`~f~8uI>ds|B-<314Aj0zLFrnV21Y%6K*a1#R252db&7<a9mGL5Gr(J
xaA#%{7EgI_M4{<W`H=^!7krp2IV12)Fi@3}n0{bRV=YhvgQu&X%Q~loCICplHCq4x

diff --git a/wearos/src/main/res/drawable-xxhdpi/watch_habit_negative.webp b/wearos/src/main/res/drawable-xxhdpi/watch_habit_negative.webp
new file mode 100644
index 0000000000000000000000000000000000000000..3dacbc28fe3339a5de22429e8ce0d7d12c50ada4
GIT binary patch
literal 76
zcmWIYbaQiIU|<M$bqWXzu<)?}vh`&h7zNY~{(rXr&&24|<g9&(xu!!w#A(u#EB1~o
f9UR&P2j#QF6&L*%zMvEt;$PRwaI$58vlAl#KFt`{

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/watch_habit_positive.png b/wearos/src/main/res/drawable-xxhdpi/watch_habit_positive.png
deleted file mode 100644
index c87abb893e106662be929f31815beefa75b08d07..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 203
zcmeAS@N?(olHy`uVBq!ia0vp^av;pY3?xs=ZJr3ESkfJR9T^xl_H+M9WCijWi-X*q
z7}lMWc?sn32l#}zx)=ETM*_kR45dK&N`m}?8QwQcxV7*X2axaO>Eak7aXC4GfmzLw
znJp#Z(W90_;)R7S4|ng_!6Rfhxr3X@LW&`_k7tgAOTdpli5gLnea6hjU6owT=l0)t
k?9BS2DCK|-N2w))iM;w$bK?~vKvNk!UHx3vIVCg!0J}*;EdT%j

diff --git a/wearos/src/main/res/drawable-xxhdpi/watch_habit_positive.webp b/wearos/src/main/res/drawable-xxhdpi/watch_habit_positive.webp
new file mode 100644
index 0000000000000000000000000000000000000000..406a9ccbeac13288781646c4357b138cb169f01c
GIT binary patch
literal 104
zcmV-u0GIz#Nk&Fs00012MM6+kP&iCf0000l9Y6;VCouo>KmP&&LV`mp(gS>mAQ(lG
z6lp-gUII=Bi~*SPuWF)s@sH^L1X#MYYVzRH0@r}mZGq}_pkFcJQ+?vUL-JxNVDh>G
K*E+v;w~_&894nLn

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/watch_habit_posneg.png b/wearos/src/main/res/drawable-xxhdpi/watch_habit_posneg.png
deleted file mode 100644
index 52dec330e52070057f8769bef0d747e77b6df988..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1529
zcmeAS@N?(olHy`uVBq!ia0vp^PC#tW!3HElUdVk1QjEnx?oJHr&dIz4a+ak=c&7RK
zGH3zW91LuXLJZ6xB|yl)D8;}EW-~B^F-pVPaf}*JHB3M?h73TGK@^D7+A|qgpz3RY
zGzfSAG0-Fk9gta(nv<JYl3%0{P?WD=q-UaM0+eH3z=*JO0TbK|rv=P#wmncC!<LRy
z1we|kz$3Dlfq`2Xgc%uT&5;0_k&_t`Q4-<nW0jnrtCyIPpOmUskqc7Iz+h8h1!U%?
zmLw`v<mTiRTUFR9fmK)m*&tzkB?YjOl5AV02;Tq&=lr5n1v5PZJp&~>E(HYzo1&C7
zs~{IQsCFRFRw<*Tq`*pFzr4I$uiRKKzbIYb(9+UU-@r)U$VeBcLbtdwuOzWTH?LS3
zVhGF}m(=3qqRfJl%=|nBkhzIT`K2YcN=hJ$-~i&z)QU`mO?kyoZvj2150cS0)HBe>
zrVZ#>xcg9aRU{VR)Krq0hQlt93`83^Fd%NU0lB~m9HEgenYpQX#X$eqnHk%ForWQS
z@EnrH2qcYW$QqF(kTe3lW#wFy3Q9g9`T03^*iw^?KDsJ21AKweosw9R=#p5HYG-5s
zj4J~(T_ej7LnA9wBP&BwZ381K0|SULC~A?+0R@OvL{MsReoiSU8tu%D41hr25JcMO
zV@RWGMd%F8%Pg@of@(n%M%NXIkjG{rvNXC@|Dw!PU}6Nj)eveMvKUmojXo$nBBf7A
z;s=WYQ@<S-Fj!zY$&Tw@S9%#RZ<lzwIEGX(zMa*`%cRJ|P^*5yGxp(K2loP}yAN{h
zC78|JDptGpx439cDZ1wMdVLsg?yO~jzbwBxH+TJ;e&QkjrPF5L>NlMd=3xBVvT3gN
z)t1?ISE81%tTAmi@xIrcbGLipy)q^xK{ghJPx{hwjqVQwEg5Z;o*N$L*r|NCsQuHi
z9|q^9-*@L1&TYKsmHbRCYew$o)g^nBdp>4Oc$_tF!_N(t;yWki+wXaP`R$LNJ{2NI
zK5A;sH}|*863_B2Jmj_hzN|(`f8oNNdZ$+hr>iDMI!WaPz6@~N;3F@kz%a4C{v(GC
zQ~wE0puPRmBnnT4o>BHr^Xb;kVoZFhW?0Og|E}otHL12|yoo?I+lzJv76k@I4hIG%
zfd(k^!FCRhxsRW+ho`)owCwAYp9iPD`fs;)qWa;od%s0~eHV1Bd3tc_v{|W)pUv9@
z9V3n==HD{xJ};%dBwOKgp2+;Yu{?j_W&w@;QOp!xquy9p687E>RJwV(`njxgN@xNA
D>&n-f

diff --git a/wearos/src/main/res/drawable-xxhdpi/watch_habit_posneg.webp b/wearos/src/main/res/drawable-xxhdpi/watch_habit_posneg.webp
new file mode 100644
index 0000000000000000000000000000000000000000..cce655d7fbb18fdc0aef057ed0beffa6a359d57a
GIT binary patch
literal 128
zcmV-`0Du2dNk&F^00012MM6+kP&iC$0000lL4XesCouo>KmP&&LV`mp(gS>mAXr6`
z)#!nOC?GoE8GyI`Rb9^a7tw!(ZQCHp-~c*;CYq*crvqUx0^SRN?}HI6$$H!Lmkpby
izXG2^U!iUx%5qnqXw6PP*p9lF*cAPLU*?tl2?+ozQZ_vR

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/watch_task_add.png b/wearos/src/main/res/drawable-xxhdpi/watch_task_add.png
deleted file mode 100644
index a65f54d00b0be3508708d6e266b3a9594444a093..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 279
zcmeAS@N?(olHy`uVBq!ia0vp^W+2SM3?%Ea%ijShmUKs7M+SzC{oH>NS%G}U;vjb?
zhIQv;UIIB10X`wF?gc*ou>o1{(0xEP>?J{d!3@XmCnyLse6!{80}6F{x;TbdoK8+~
zV7PXqD3ML(z{)*)Vp!YfSOu)pU|20uY{{XLFg2OwG$)W`KP}pGidT21!N;PU1s56`
z8(sIxSZfp|BxoIH4Us%kcxtL)$Kxs5DH_LlKb(4KY%IGx#?V>7&ysadU3$VX!L*f&
zU*`Nc@lgBqjRQq&5l<ryrfN&38Z{^Glqj0W!w}s4`{L`5%eMht#o+1c=d#Wzp$PyE
C!Ebf|

diff --git a/wearos/src/main/res/drawable-xxhdpi/watch_task_add.webp b/wearos/src/main/res/drawable-xxhdpi/watch_task_add.webp
new file mode 100644
index 0000000000000000000000000000000000000000..8e9956baf82436e9f9629346e19ae56dd1449ed0
GIT binary patch
literal 168
zcmV;Z09XG~Nk&GX00012MM6+kP&iDJ0000lH9!pzKQRCEKmSAmq)8_bjZCo_$N?C{
zQ3xm3wynuKuXtWs#;Fd~p*qz0^Z(E6`3`9<qW=>hWgBNqg#85Iu~Gm(jnhZg<m_`S
zj-TVyABzOsn;~ur_D{cq--{IN5(PK>X`<j3E0{eL*ltSu>C#U~w~mzca~z@86#E>D
WGtV(NjTFF7$WH(sOHSBmr2qgW=1OM(

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/watch_task_minus.png b/wearos/src/main/res/drawable-xxhdpi/watch_task_minus.png
deleted file mode 100644
index ade3510a0c50aba3775bd980247adfac970471a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 209
zcmeAS@N?(olHy`uVBq!ia0vp^W<bot!VDyDcLl2gDVB6cUq=Rpjs4tz5?O(K#^NA%
zCx&(BWL^R}5&=FTuI>ds|FHpC@6dffHS8rpe!&dK?<Xh-G<>t=@dFCEc)B=-NL)@%
z;1Je7&c?+nArW!q^u}f-cD7|jF%DA?$}EqOY_{;*>C{$qhhe>po$=+uQ=-N!52pkl
jcwNqxCX+br6azzgf8Wxgwu}Wp^B6o`{an^LB{Ts5qESoi

diff --git a/wearos/src/main/res/drawable-xxhdpi/watch_task_minus.webp b/wearos/src/main/res/drawable-xxhdpi/watch_task_minus.webp
new file mode 100644
index 0000000000000000000000000000000000000000..cca5e5d7eb167bcdc00a67584e82b0d824f0bda1
GIT binary patch
literal 108
zcmV-y0F(bxNk&Fw00012MM6+kP&iCj0000lHNXN8KQRCEKmSAmq)8_bjZCo_$N?C{
zQ3$57Z8iGD3K%pc;Ls>a_;y!OK<wZB&_G20Cjk0+wCJGRM?LNL=<{M2hXJ3`!+@Ki
O{S2{OvT30nB1`~+3oa%A

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxxhdpi/experience.png b/wearos/src/main/res/drawable-xxxhdpi/experience.png
deleted file mode 100644
index a69d690d97337119264f5ba9a77e5723cf6e0157..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 707
zcmeAS@N?(olHy`uVBq!ia0vp^o*>M@3?$vw{(c9fSkfJR9T^xl_H+M9WCijWi-X*q
z7}lMWc?slr1o(uwx)=ETU#k3n83ZZ)U##?hx$^%d3Lp|Fz9;Jc<w@`7DE_~@>i$Ie
zznk6uoo@VccFMoihX0@J`hTS0|I6cV7FqmQq}0oN1!Ox{NswPKL&N+3_Z{}jEJ(O&
z-~|+9V)k@#42d|r_QvgPO$q`HiKm@A7A^32|9{!+$yU3xFU)+oF7*B{-^~j&jGhGw
z_(t#RSh6Z5#8WjeBvsXIs*7-FWoMvjpi5|AQi$h|6<L!dLWRs$F$pPq%=!?hnEB|%
ziWx^tt+doUZIu>ZTjE!oa%EPEYRr{sVB(32&y{%)V(ITdg_GXf7e`GHSt1d7wS3MD
zktL?9a$ddm^Lb^(x9HPau{)kllV<b>R*IEeTas$$zI1JKa9@mdMqHZUxw!x5ww&ve
zb=M6OlG`*nxwgQ@wAzzR<M6LHHzsyZKXN1g^XXr&3N)Q2Puk-jy<f)qo$&i9K}9|h
zoW}z<H&438Y-gCcvtLx~e}R1Pb9tw}-##Da`g`xau~4(l{?FFEEi<Qb6@KKF&<p0U
zm47HUaYNcdo2ey1)2s`_P8HQfMOAptvU$FH>0QY!lO%nXeLh;${zS!=XWpqIyGW~;
zFujw3H_z2;%S;Hk<LF#}&@%dA*Ys1)hks8h-t_3DmD*D)c5N5Q86`(QhOsW<@kp9p
zZ<Q^O>Ts#op6#q0h_07VIJIC>!W2i<gBs1=Oo43ESr+jaW%e7{mQCE?Hq*T7q0nNU
zI>XSz(L8yL*8|qR=L<a1THw5uk1g;8Z*yDL{)BF&8xff+zJ(@<oMa1e-unN^;tsP{
nQmbmMq+Pd`M{Kdw|HYiaX3kSs^<NyA9vD1b{an^LB{Ts5wcR|L

diff --git a/wearos/src/main/res/drawable-xxxhdpi/experience.webp b/wearos/src/main/res/drawable-xxxhdpi/experience.webp
new file mode 100644
index 0000000000000000000000000000000000000000..9624da9ac827b4aa5644be8bd8b7b153c7f8b3f0
GIT binary patch
literal 528
zcmV+r0`L7&Nk&Ep0ssJ4MM6+kP&iEd0RR9mNB|NLzn~D3Bxerc{Rto7a^O(hHj<M0
z9`xTPGbw5t$(dOe%OA{AxnBP}3fi`j%pc?KZV!PmxB&P+e)A=VQB*Z&rqmWR{)SN3
zdH@SrfeEOC3Ce>hAa3SV7Y*ro2M4n4G!@eA{-W%Es}dfXWC0QVhu}t%BB{E29J|L1
zPcSU&Fk04U{%M(Y-qkp3VZCS9VnvA+9a2<C(O`=LTjWKEi_qZIAn%kL<jtu?+?d7&
zaec}y(%#b|?L7cl>i}e}gOHRALQ*o4d|K%s)-QXt(t*s|m$_QW$_*eGtE00mFqo?A
zU;#K7YaVl|V+ZT#6QBQH@YTIi^&UsgdG>>==(c1cIgjFfffWZbZamNPX)slej$T5{
z=ZoN}d)a$@2qBJdf}_Z`^}LS*zaCSHXgO;Ka<$GmPp&SGXiYO*%h&w&&Lw)V+(4HN
z!I9-t2CH+Hqkc1bAJ&BsSn7RPSBIe(A~`a#yey7LIg%+?c~dNra?W+qbzS9g@kFAZ
z#?`u?6<1`kT*z0Q^GWf=m<iz`^Y0f&bZP7sS9B=UPBF#`DbSt&C-WClh;qMlY={Ci
z#z;~+ic+w$6s#--DolY2Q;^aWq%;NmStg2_KNPp#--%lI86yi;7_2l%agg$~Dxg&Z
SR25K_up6U=pPv6)8jdk2HTBZ~

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxxhdpi/icon_avatar.png b/wearos/src/main/res/drawable-xxxhdpi/icon_avatar.png
deleted file mode 100644
index 77ff583c11629a27c2be7c6258046e523b93f229..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1048
zcmV+z1n2vSP)<h;3K|Lk000e1NJLTq003YB003wN0{{R3{N?Co00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#Fi=cXMMrQ<lU($udjFGM^_gM%lU?+aUG$Y-_LE)p
zlU?<bT=bJ%^pjlllU?+bUiOk)^H^bqGynhq4|GyaQvl}$R28<|Dr<kB^2(7v#M9^6
z000APNkl<ZSi{9v&1+LZ5Kog=(iW}t<KRJwqE;!TM5(<9CerFb4+iz32$fdQgOJdJ
zAR>((1W)!NiV7*B2k}rrLG<#fpx`O><WZ@AfW~J&U*p<l=WX75JF~kvIhXd$&M&(&
zvorJCNaVlB_`^?$(v|0<hUW3d4CHgp#C}(i30XOyx8Ij#KB?T&+4mP&Kvur1?W5mV
zNSZs8fTK*3Gs*yEWk5w0szVHsR|=0ADzx9%aljkO-pb;DN}2%d5hmLY&+Ps2MSPwj
z0A3E<ud4}J{k~y)xzM=$)YBYSyS)xpFSS)yLA8hiQhc%ObJ3dQItK+njGp*)Ll7s-
zJ_gq_aM_}8d6NjBn=f4qYL9Vk1_7Kz0|KG@g8=TfRvKaTLQ7pk06ZYouzHq<4gn-u
zEAwG>A5T6~J484jcsU}fu2jKMn}};Kbyn`%Tm(OBle)w61fWKRd!9(NL*2;?0r)Ee
zekuXvkuro2bs10~d|0oJ(vqa_;ng4mctzx?79h1Ci)sU~kjHmsX{w|b@m^9P+n9sr
ztx0y7O6a;qvt*yyi8=u;Y(fA$5#h_hF9wnZQF3mew&FHbaH2o>TdQcU4YXCx!WO=2
zjKKy~6aY@JdRm&=OZdb}!17iIZS*E6O2o`ciHWtm_BkSEmP3rJUNO|%a}Vx3v&H8e
zHAWZkDcT_C^e_(i5b11ClVchuGio{`(<L2Y>X89?mAy4F7Pg<BAYB-__a2YZwzJFF
z@ekUJ6!)||H*PbfTn;1lGmUIENPr?8v4kE_N@5pVC5|#(nB+q<Ln}26U8M=^5mUgH
z!02v8Vk08$2$lnEg0Xj_=uM7}zwj)0WCugt1%Y_|W-7=g=}Ot{XO}Pmi0&5bimmAZ
zF4Wa;okH7*KAJbmoOA6MUA#onYJkPdYe01Qy6(MJ5PhHj_gV)yA%1t##0AfZvY?+y
z9e|fWNl*suyEg7oh!{m=!{X6Vl73QjwA(DIUNkenRvbMb1#G8_d>^1=d?2!+_4l_P
zz#k;PV27&d4llt6W2Y}blw57%`fZ33O!K!hnnXYHW_+A=BsuXwG?R*XV{NzB!A<~E
z{>En_Nd<?YdCjmnfb$xwXln1h&4)|@;%z==W<PCA0}wKB?Yw4Emp<O-mj3_)^AB)|
SRLl<m0000<MNUMnLSTabCgJM<

diff --git a/wearos/src/main/res/drawable-xxxhdpi/icon_avatar.webp b/wearos/src/main/res/drawable-xxxhdpi/icon_avatar.webp
new file mode 100644
index 0000000000000000000000000000000000000000..6e693b8012524eb5f2be3985c92c50cfab4dc21e
GIT binary patch
literal 894
zcmV-^1A+WfNk&F?0{{S5MM6+kP&iC!0{{RoU%(j<f1sdkBgeOZK7R<4hJv<jn56tM
zjObO^wrxY?|BKThrI92>=daFv>Id>yghLL55CE%^X@CEob6;YTpX@(I4eBvDp^L(K
z>_QT@e}?4L^sE`%wrw75+qP}nwr$(V+L@_|?c|tePh0=0-@l$G_lW*Ga2rXHQpW=e
zjrRrdU#iWbFP<AGCug@sr9+Zvs@n=}Ur3Ek6t_TMpVaDm2{w&hNP|xJF)8#?8kO$w
zSR(=D=I!o7`0nQLKtk%yStCI)mfS<B2b0N%^4*29R#N^oFIuJjElE`x<s~7ip%8_H
z5P!YY_T1UI1koJk<lTe@LZi2Y5R4?19WL#iPgCiEK~|R%TFoVkAzG6_a14G=!o(k8
zwMqeD&})@oggDRyja2d@BrB{CMx`o@Ku}Fk-%NsPECi22keS)4t05su3;>(Ujh;`G
z17s2}dj6x;`-9)lK=l5k<Ixg?G6J$M%4*f2arX~KX@QUk!}y|t{yYOA1^xLKcUh#F
z-fGk#yif>$vy2N!hH$3IB+>KlP0k-q8zE@6`i|ev9;ln7<NovAF@}W?_qVfT030cc
z@JpqI*$au;@xYF98&1Yc!x~YlCT#<Wdxd~VAaDNK<lvPwTQLUY3>VM^M1p0|BUKG^
z$n&C9xq%kKBuyDCmO&FuA?zVQMoX%wC4(kz_DV{iK$R*%tq?GKQOXF*h5x&Y(-vXm
z=C)my8?W970jy`H%<s+g%#4pT*>n|Mc5F&9XpaqE$xu`m$Nc;tnHuSsxFFf;#xpqI
z{H;AUxZ$slAS>#j^$tiZk4d)02u{1pY=F<$BQNO$boc%mB#(w2q%$Eb&+dT1)#kAz
z^3ULnA$@@#E)psj`cY0mX3_Sig?z@`$;!Fk9nHuL!BmQ7U^eMIxvbV){Ao23U0gDG
z6+(qbpx^C$txr!NAD=t)a?<FCoq-*+fA#0nTXj^C2`r?HGVCJ#tFR!_&%*sHqn}+(
z_p-HB@NTFwvZ`u`>Q?#rP=5-IRVZ(RIE8TarM|tFu-&$&M64#=5T8a~bs1?6rWa+q
z)g#g}RFanE7CyUt*CcI=sr!vxDhScqF8+8o#OjdtVz4@-OfPI;_zOSR9;Jk;_qOP1
UZYpfH7UPb1*j0aPO_3o10HvR~_5c6?

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxxhdpi/icon_dailies.png b/wearos/src/main/res/drawable-xxxhdpi/icon_dailies.png
deleted file mode 100644
index 8f1333f686b0e75e43c64a8c8824c7177f2efdec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 402
zcmeAS@N?(olHy`uVBq!ia0vp^AwV3#!VDy5wx8_;QY`6?zK#qG8~eHcB(ehejKx9j
zP7LeL$-D$|qyv0HT-^(NrYC=!9P<T;CIQLV&y(W5PL2h#KXdK<90gRyQ4-`A%piXF
z^Mn3)J71;mhk?d0db&7<cpQH_-H^Y@fv2^bEjB+OT{!tsMi2Aq!U=+NWeST+3JTb+
z{LA5HPn?)-Eg`(ud|yq0<*lOk40fvz=1ldnX-H_CA$d>v>jaahwwHEpk>BGUHKpuW
z^^z4^iti~Ws^0r;Wo47IG5Gb*rK-mTt){-0HcIhGn!N4OoL7E37CG#GwR9tkuFqw=
zJ*U{LPhGHHD}VCB9fuAl)eF-XdGGMNn7()Qqbs(jChxd6UH9rS({IYr1{?a9oU?C<
zy>X6TN?hv3`m0x8zK^=II4eY{|DV~b<p&na{Y?)kl+os^bS(*B5pq2f*rM*L63k-j
uT63i($n{DnONOsbcuVbBQKt&SO2*4)rIK@FEf|3T#Ng@b=d#Wzp$PzS4W}Rg

diff --git a/wearos/src/main/res/drawable-xxxhdpi/icon_dailies.webp b/wearos/src/main/res/drawable-xxxhdpi/icon_dailies.webp
new file mode 100644
index 0000000000000000000000000000000000000000..1624a728cb6cd3cf072a19d49e4db3080deffa66
GIT binary patch
literal 318
zcmV-E0m1%KNk&FC0RRA3MM6+kP&iB~0RR9mQ@|AvN1&i>8z$`@$?>OA8e|(5WplrK
z1(~!>>tFBQ)kpv&T;Tx&K=1j}Z1O+=`0jZJF5G20lTo@jfMeU%vgYEHIsu2$q5ght
zu>rW0E~S%!|N7l{(nR#1fg?$YnsdczzJQM%M(J9V6Bk@mO>4#(aRI8DrfDHYTmZvj
z#)u1`S~MAP0fa?{5f?zS1%Gk*Qs{P4nncL%A}*YTCK)ns4%R}G4w;y<R!IkEtt)Dj
z(6{yqhe8~vYNQYXOcr}w1dB|3t<gd(!6Tsa7}}pKydV))iv2;=#tl-TVy_;Gji_V~
zWdF9X5trj)|CGP><hOPGfcUisW~=;PhB>k`ZGmYZOsip<64SnzM#r>7qIoiHmTAaD
Q>t>ofadtqQagb**05?sLE&u=k

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxxhdpi/icon_habits.png b/wearos/src/main/res/drawable-xxxhdpi/icon_habits.png
deleted file mode 100644
index 88dd1137f1799e7d8d3225e7adddf8b9b0be63e5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 842
zcmV-Q1GW5#P)<h;3K|Lk000e1NJLTq004Xd003A70{{R3#SM<F00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#Fi=cXMMrQ<mR|OgUG<Y(^pjomlU?+aUG$x9|CnO>
zsDb~JT=bG%^OIcjlV0|dUG<V&^N}l5*#H0l4|GyaQvfJq!FtQ33Ka$5?(<5GSHb0K
z0007=Nkl<ZSi_}QJxE(o6h8SOydahY-5d;599$ARly*w(Dw4ejDRwFj**XWD1cwKL
zlnxyV9Xi=UaTBM4lV)&pNY_H47#oKeea3fx-@7mG-pBV%xhMC#@80j6bAJv|9Jz~k
zZ%zUOw_l%cRLF+haspKjv1J)x{xC?zXf2KXG_c~CKaE^o2^{cc8sCXM;U}}_0!OSS
zu|EgS_><tVwmW@j`tLHxfa5s37-Yh$n9u%Yqu)pA2ijjpudBPJHXo}?+ghjhk&kzj
zEGc0*ujIYa?N6lnEHx=|e`Uwtnz<#6KfCEE<*kdJ|CMo8PN{24XiqM)Cv6KN9edXO
zfM!KX|B%87MP85tc7(=$Ot>50g)Y4$#9K@brD+fWdd1sK*1RJ}^jZIF*2-u5xcYo8
zY<)_Iqjd1qe+wIR)_Cbo-)D?Ls3ddbsOwJmIK@{>zoQK3tHl@C&$n6VCB|t;uit8O
z&u{*!S!RDCJ>QBakT;2gYl{+!#AG;Ce-*^MQn1Igo9qBa_SdCTrh}(RMF_8LGGYD=
zE$6t9o{6aUK7TZfE!wxayJq6b5gV9XwENEec9oSbXnj6RM*0j7)s_)+PV^FAb0?DP
z`Av0@$k0<p6^%un<V`K}!+=xZp{E;VH0Jq+)7ITyh#rIu)7XeOe#m3CLi)}jFffgS
z2z^8>ce;8osN>Q!ium$ao^qXiE#MT!rcp#=nfvD)p^wqYgVKSH1H%RkS}<k6gax+?
zaI*rpN^qkFj|uRQLXSxBfCjGz;N=9o8i5xx^jZjBO2I2JdLaj&1K?u>d<vltG4L6P
zK0?7KFnxd?;6&K-zl;?h(9#E5cmc~kXweBRd7%Y2DnsQyxY&r6I*I(WLaQ<H2g;w;
U>63;QmjD0&07*qoM6N<$f*|CDv;Y7A

diff --git a/wearos/src/main/res/drawable-xxxhdpi/icon_habits.webp b/wearos/src/main/res/drawable-xxxhdpi/icon_habits.webp
new file mode 100644
index 0000000000000000000000000000000000000000..27830af77e75782c872eb03d743ab8a900236837
GIT binary patch
literal 724
zcmV;_0xSJeNk&G@0ssJ4MM6+kP&iD$0ssInd%zVCf1sd|6lag(3N!e30AFk<YTE|#
zUgJ+-L{9~6+b{-D{$O|2Mv~ePGh`m*)qih_lm|f9YqmdX-k!_L{~XT>@#z9Tif0~)
zR~d&K$+lIyxnkD)sbrc0Ge*t?k(nW+0WdQ&55QlcnIm>2eoyzCnIp{f58Qk91S0zH
zz-=2xl6S9e31-t~p5SziTzUFt!3XHu<vp{?T(m~+DEJ6{n_Cviip)pq&iE)!cmvH#
zg86yHn`lAsHn<yYfgJN@niRw)Z>ZlPcTFwnDARfCP1UNh)Elc(yH~F@8x#(CiG#Dp
z{Bi*rF=o|AFX@l`-X}eY@lo-U3LFqw=Q-=kB4hWV=c<zE;jAffk;=X2tQMFljKkm_
zy$NGm&UwS*zT6pTX2zJ#k4_m)&O}G}V@<T94<t7H?9&eJ6dcz`OBvHB{gf7GrY_0_
zLc8>C{Z>)r9`{;9vA_Qp>8AX(<Pv33@!4h6$4V^8F;f%apB87TF5!>ElxkZxQ);-E
zeG|X8Kgm}_e=TrN>rq41<@&w95IOpyu^C|~hYev(EDz{`ZlscA1kYI%juMh(?94KW
zltgZHgTPMQ>~$jtiad9*N~wdq)Q@zY$k`m&*h!<@9(KJhdO3Su(!l7U9&XQOdXqjS
zr?fxug7Oss#^fus+;V^>v<kt!MO`Ri#srwcWBNiWyV+r{s3ydi8pY8%GMR3TMIpv4
zQn*tfuz^U`-b67*apxS(2%eBI_ttnGV$5^KPin>hmgnd%=tIyKLVGDXLeSBP&J5_R
zgwBZQY>ci1=qd!RfavOruKeh(1KshUyDf01hwd`b9WJ=LMtAn;Sp|AV1D;KxXL8_K
zBzgvmo;{1&ik-PT2VOP!X}@9tUM)ed)PPrsz$;YX)iL<WT<~VJDu`W?M6ZU%Dv4W(
G)em!mT4gQ(

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxxhdpi/icon_settings.png b/wearos/src/main/res/drawable-xxxhdpi/icon_settings.png
deleted file mode 100644
index c09a30bb96d11a794cef7c6e07f2251a4852e2e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1235
zcmV;^1T6cBP)<h;3K|Lk000e1NJLTq0049V003|Z0{{R3_|>EX00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#Gf+%aMMrQ<lU($ZT=bJ&^^;xnlU($bU-pw+^pjll
zlU($ZT=bJ&^p;`wn`Zx%UG<Y)^pafjhvPfI0000GbW%=J0OQ$c_wF&k$A{3P8x2ac
z=*BY5000CcNkl<ZXx{BxX?H6j2#qU>v-tmi?K4X!?mDT7edmOa?Nn6YazT2zd?k@Z
zR%LmE%8lBF&~3C%!-4XeN=|{Bu{xO`wkbrgq2}buc8KC54a<n_5;F3rTJ<Sa`m6M-
zv`;ByWQfvL@36Bqt5l(hgsQC4mAOUq+8vb+(g1vX(W-Ko{4X7bxkZq7M(*~29}owG
zpH{k20S}Pc`XKMeMglm<`x3oM@7t8_5BVu*+&xbv%9=%jJ9M8?cRY}bvC4x@wf9_Z
zfU}6g?Y|loK|HxT5r_dEcU&-qIQFm+ict__9MeFX5lQ&j_-`QxZ{?mvC_7rIRif@o
z2JLvI7OOl)+6Mg+KvJc|bM8E4v$CQTp?*qbsZOqH(e(P8ngG`5m$&8QqJaus*s;_i
z@p^v&QKoE*@cs~j2zN_3m1`|W2pWc`vi@pCUoyeo^v<8Qa){VU7^@Dy-*s?rrsPGQ
zQUC`|C>{`s1Z5k{r2FjWVCZ1TOSEq3`~oWdhLIc8gY8Vt`gWy?-r*oTg=%||IqnP*
zM0b_42|zq7p=raHRub6#FrdpBRQ8h&NnKvbdnQSpqP(kfMc^V!w?}o|i*OX9!>TWV
z>P4+n65#4JB8sUS2iBQ>>__Q5@S;{GI#*=+xia)6KXvn=^_~lLe`#H)dE4ybocNi*
zr-lIm<b(SafxA4ZVd2LOd|#H%k|BR2ADETxu;{|}ThNQ0b@&{!Dh->}#|8ew>MJUZ
zpEpfIt<Uyv2ywrk#Re3|MNf4h7ID;SiR3m20T&Q<d7L!rolq=i?A4?U$gJhOjuF!%
zkCSHTm?EWM-E+KaFNG*kMT)ki?J&nYl+0%7tmJaMR04R~R67FFh?HZCT)b{2j+y(G
zr)(I7@eiQl!xEeErXv5(<if=!ORDfnq)+`GX3a%hQ8F$N8T3jJV~bs>UtsaQ(~F9}
zw1?~62x5kr`E(gl=U6LMB+n2a2&g(M)8$%AXseYgTebOAqw3y`AUk8yoKYE8ZS`bI
zPo?ztN@<ZDolvT4O7+W1>(_hIrhV5t!;!*}QJ)Bzqnr0Oa7Z4DqWu0Q7z{bd48VU+
zYO~eUHYJJE33Mex%)}^S7PVoY#B34;oj|sylofLds41o5oT7M2`9G)8F{P#RndX&>
znUdu1Z_{!47aEdpX}zwk)@!sYugOf$HJQEUfoV0FtL=2&+fL^v+v({y&+75DhXd8|
za4_YGB(nS9$Ds8uJ$tnu_>kux`1mg#_~txiPI<JQ^E@5o+)q8k&lx$GGh8ucjKrgc
zM>p^Ez>J5WowJ1O7!AVLM}zPf4eI2UjN`|Lpsv6MIAYujLH~lyeqylgavtfvO210G
x>b(g=#Z$(orwoeE8Ht}W{C}D9Zw~*x`~wqaC*WD#b9ev%002ovPDHLkV1f<OX2}2m

diff --git a/wearos/src/main/res/drawable-xxxhdpi/icon_settings.webp b/wearos/src/main/res/drawable-xxxhdpi/icon_settings.webp
new file mode 100644
index 0000000000000000000000000000000000000000..90efa4309f18c0e6ecd2faacd168cd4da39d0990
GIT binary patch
literal 1072
zcmV-01kd|YNk&E}1ONb6MM6+kP&iB+1ONapbHE!AhoGQs8^)zt{t$L(C}`V;F@Fvv
zx=SW)lld3CvufK&Qe&4fMb8j`CZBpx`!&5s|2d%^Cu9tUKm-3rpk>=iB*6-sPyt2e
zKipcG3Z&L+z9RbXz-`+|a`xWsOs{dBH2Z<)Ux>wIw0I(N7qj(z9O{HVZI~TqJq#}o
zaj?PfS;v?tE`~E6^*qGM#!*iNy@2I^5`fCiKqw8`8<aq*TkEJqcpJ15{8(Ui02ur#
zQ52o8#LEK!XnHY4{vtczo_~kj8NMhnJMruHykMA+K5OoW&)!KeVfylL!zG8J)R;hk
zy}%%lVijC+G&YydHk?kxf?dQ5A{~W^Hr(&=QHTAtP9mNVp*@E{w==+)cDnH=s%c*3
zBBPuKK{ghtBqu_snvkSh!7wx!z-Cn_$pQlFFHm|>j880G(E0-)lfvWWKqxBQxg_<t
z6#l->loe-w4P}<~1;HIbbha%Np>W^P0m`}+96ib~mo|ZAMZfl?DU@A3TVZx6l4J>h
zKU7HkMb|VaJr0&=(06yzAJT*66KRW}rfTo#_%Xh28lZfPBlhuXIu9Mn)Wtv%0Xup?
znSp3A{H0rqgt3`wi%Ao!^z=Ad>QbZjVi?PbXzvSe?=mL+nDt^TL(efrwjzKVigbn_
zi33;^0v+YQR@$freHrAVJjuwYE>gx^FYSkU>6<1Mtt$=vIn4Tc=w?((%z0c0B+rfb
z)Yit$uZhv@j~IIr*1aw+-^aJ{2WPc6x_m9DI73*|(1Z!e{Hn^*s_DhTmsk^0_^7+^
zW|0SL{okz!p0BlEU?VwL;^)KIN;R?wgHT0bHCW^WZN=n}pjLc1^yJV)Wlc{B1NAB}
zYl3SN7?V;AD6QyDf(!~@WGo~=WsQVq9Y17Io34(NHKLyDvfFU~;Sklq4BiE)jwXtx
z;AS9Fo50)O=&o?R>DXlZBZk@1b_j?!Cxd1v<5r~Y+QF1{;;+*ZMRUoS+|#K!LxGJa
z@aomLF~pR`WZ4$XvUvh+1$uSg_<r%yW`gJeEA$i4mkR86C^i&3oZh&9?C|E+pV$wC
zR~#t!^SP*Jm5Ml?b3c{OrEAOKYp7_~(3`bFzfBXVwI83O{g`O0{chE`cWU`7eU>|Y
zvnzejJALgdV+wc1POgj*T^I{P*j8%Z5c8Yq%Gl-|G2Ebx;Trm48LRHzvFc?+qV8hV
z-ZA-EyilfVOkP#BFSqoEdk>1v`+MxMJmKuUq;Tb)*$?*yX=?Wdr^DXhoqM2H?)CnC
z_Oze((7pRBa}@5(#rVtQoM^-+!)(9Gt!We3IoI%A<Pgy>bBKuH>;AgsO3@9uQW_Qo
qIwL2Hpu}@?-|oz1{7;KJbB*uJslGCI{K_2pEB^~{<$oUjeb@t);Tw$r

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxxhdpi/icon_stats.png b/wearos/src/main/res/drawable-xxxhdpi/icon_stats.png
deleted file mode 100644
index 8e687378262d274845fa1db82c56dc29959e7013..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1270
zcmV<S1PS|zP)<h;3K|Lk000e1NJLTq003|R003|V0{{R3G|uUG00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#Fi=cXMMrQ<lwS3dT=bJ&^pjonlU?+aT=b)E|CV3(
znqvHuT=bG$^pjomlV0_cUG<V&^IwHgBLDyZ4|GyaQvf{gj%CZY1|bvQ_@q#HbH*-f
z000C@Nkl<ZSi{X&OK1~87*1%~O=??$C=`n=;v1E=A}T1x){_rt?LkG5h*A`VCMt>w
zmM92CL4$}2^<b$l5UFiZ5Y!a$A}EoH7x8)U;-#3Tr6kd{*_oaBXLffU!Gm+kF8gKv
z`RDt;|KaofM=Q`VbZ5t^T5Vh~W?JjX_qZOg!nD_-&04@V0yOh)bvBKfV9ige0~;YQ
zHJm67Xqv;xl1!am3rcVfTHCd+!}jeOHDD;lBPY}xWCS{R<O<bep6Z#kdH^DuRFTFs
zWw!z7GcDTsUsB`&E!G-a2=H-IFH$}b<W4=HF=_)RHKRHdv5_O1NWbmdVO=G;X>a*X
z7deK3OLT$NDa_coE^?+W?}&e}Cj63q`Tos@7RZ!3Y^w}+-ukK;oD$o*QKID7vi=0`
z*rkfnQ6R`F^kQ5LY#_uQw+|XZ^vNfbE*wfmgUW>fp!p5ID?^V@m36g%*%E40IOIjB
zQoHcWuh!F$kaaZ>n8W@lSBMaU5o9bGXH=rO8|JG5emS7v9p8~J>!ZA5k;}633gU+i
z#4&MHS+YLb?ui4|WmJNBD-*wd^bppFU*r&DfT5CbU0`A&Z9VK&DzVU(`6O`bBPFq^
zgMok9`aPut>_)(L>!DInuz*9RfG}j$gb~uEjCv~2u~4F0rvY69ggV8tWKx`H(Jnc_
zfC<}Z@x5R{wRjdJz&80|jYi6|AlW^tAnQ>Y_aVe`yS&VZficPe1JP*uSBl#2xzcVx
zWWU(05gHQIR78t}>W-XqB)}MT&Pj3|QH78mpg>B1m^@jcb0MoJ<s$L~6d<02ByW>z
zK?TVDG^|h_xg`Sj0@0y?te^$xG`~6Nm>~`6U<&9X6{`v+saQ3<dl@mp$zu(OQj3f~
z&HlKHr8p^4LFPrhsK0$KVVvVrfRSQzWsymlurqmN9Z3gKXEAfxe|W($&3leC$L31x
ziGw8P#F)w$e%#A=rxJg+7GFi0E&pLEuV5;Pa=Yp4DsuV~$>sN<qekFEJ5%TtJ#e@4
z0c{?`&T<8dA3mhtbX{4P4D3uk#?(M*S74J{N!H8MgeTl^1=k|5j44QrnCFIk*@@Y2
z+gg)y;GTOFx)HWQo5SOBVTK&E>bznyJahEpuf2--0M~E%*{MUHcl&@p9Q3&%_Xrvm
z>@6Biw4u&4^Ci}xOEo-?zN$ZDxuq*CY|0F5S{~NSH|Bn>jmz4=bNJt0a5@#2HJ;VH
z=N;>sN2@!=-L+?P&G#Htjz&tgohNL0=mu;h0|ZC0aNK#})ajy;1&F5GanB*ig!3Q<
z2;k*mow1AoG$Z$lgd8&nDhO&s8@j)x=ep|XY1EV~uVGg(D#m$_*N%ySf`Q&_5l%Ql
zZ1u*8hnAsrUO3s9H0Xhp4`xFv-Eb<SVB?cR$yJBXSNE|v^>MdRf0)8F2kd7zb?#nP
g+DPB2bN^=j1wJR&q(V)8RR91007*qoM6N<$g5|MT%K!iX

diff --git a/wearos/src/main/res/drawable-xxxhdpi/icon_stats.webp b/wearos/src/main/res/drawable-xxxhdpi/icon_stats.webp
new file mode 100644
index 0000000000000000000000000000000000000000..e3d5caf887462291532568fcbc77ca2f445d83d1
GIT binary patch
literal 1120
zcmV-m1fTm-Nk&Fk1ONb6MM6+kP&iCW1ONapZ@?Q6e_)Vpqz&e@-k;*9VIXarb|S9)
zdN-qO+jw~Y|2nj&i6lw6jGmcN^6%)S1c3WeJ8P`(XQyZ>R8*^^a@Y(*Smy8cffBY&
zh6E|Ad#viQZQHhO+qP}boNRM#+haDW*H-Px-iSXkV{wk?KLj_D6iHEa&>Eg8euDWQ
zkzP+dbKm}fW%Vf)4~QIW;48B$;Bp|pF1G=}<xajPi2%w{Pmv@hwJf5EAj>?(g(O22
zcM+wD+KFT?f3HL=F6*U;4q>mSWbLZ9PsuWU_oT6AR@2a!QtQ)*ZMrT}>j|Vk8dV8D
z23+)vuABt=lQQ8WoI^%gVt2V_(bigN?pH=zR`Wj@)b$RdsyeMw%sYH_eHa+I`XNb5
zb9d%#nphv(<;!g8%yDva4dG_C%;=gY*y~skkxx=oD?V)px{9*gk(&XR<sP^4G!1YO
zNBe?tNqmOPY6O`Wvna*%;`Vl*Et47>UJ9U8F;s35p7EU+h56c}9M$l}Fpl*nN>7!b
zF*Aub8!Bmy9Zkz|8x!ax_$v)pC`wLqnp2+Fi;5rdoqcHH&-xnrst_h>(VK|sgb8e%
zVVW7PhI}A+-#tQBoq~=2x$MCMa~KtQ8Hbk}gz7rXq+}z!rxX*}H-OK!OUdADjB^(F
zIK7^_kkOTIp=<P_hDz(4L!KkEsHIYa<FR{}{dFw@woj~qb6ewbVG<d2DgMj}m7I}4
z(IrM5iq)ylx)MhQ7gD1&CPm+wBloOG5<ExlQs)yEX+lKjm$ZutakNWKdLmBLku;(f
zC+?bq(Yp*Hf_>k0O>O8NFH8P(J5Vt2UG$w`|K%wvmm4qAz=q?6Qoy-O=q|;l7Xo*O
zDwU!E7{^2YqPF8Uz_v2UBE{cPG#DUf{Uli7OKY5LS-eLX1Bdq(QnUbJ2H$0v!YP>A
z?Xyvv#57#UXTa!x7Hn%e4r-L&aQ=iTSbF)DK{|_r`dYln7lj?)3#e3Nm$=6p2#fk)
zmr$D=Wn7*d`HL~2K&XMgO%`|$*<j5`U;5#5S5VU#wWxo>B;HUfkOkk>ZCoDQ5lX6i
zmSnc7?_LzD%OiGdx2q>-2^CHlxBF{Xzm`e~%TXx{y4lvtccp6YLz%Cm+!m$s^+C#X
z`wqU4bwAKcY}INd1X?)s9|=k`W2aqQ`kkB1GNU#<__Gb=f~}cNP2JQ08T&ao|KzA!
zKNlvL_2a_3blY}iedqr1p@7OXBZ=?aueL&;+FEwo_Q!XCX*u`f%Z<P))P!mG|G+kT
z*zqWsH~1p=Ti6%;%$D;F3%4ENJIqrqc^1Gpu{EkXzX|U_haD85i1VWD*3~BbXL0>9
z->J=~9tlKIn}?N3NGQ(VR=VOc?>m9foi9EL(Vb_;UPma;PfJ;=!n`*2I7fXx9Ij(|
m;vbkt_kNP_Pt3o=v2Xs(KQnKyGymKdZ!6FDEh6c^Obh@MhbIL9

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxxhdpi/icon_todos.png b/wearos/src/main/res/drawable-xxxhdpi/icon_todos.png
deleted file mode 100644
index ad8fbc38e69b1b871ce0400a007a6b5a9b09f43f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1172
zcmV;F1Z(?=P)<h;3K|Lk000e1NJLTq0058x004{x0{{R3VSGJn00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#Do{*RMMrQ<l3etYUG$h@_>*1rlU?+aUG<h<_mf=o
zlU($ZUG<x0|CC<#l3ep>1=UFa000eiQchC<>C_lgpl2q!^@s~P?Chxu000B;Nkl<Z
zXx{Ca&1(}u6u_t5BrQ!3;`hOT)Qg~n_ytxFDuN&yh$x~)AqNjtDYU&54?-36pacZP
zQx^hS^`KBhi}jR(UJ4$zG@6vm|6<#n$$retdvB85+;>Vh)0f}QyzgNwkwg+nB#}g7
z;#^pGGBR@b*4?SD)O`Jz<3haWmpZ4JaCu0Y&+?t=NmY1E8snYlIg{gxcyBw<<8qBO
ztG&^~`I_ZEWpdmgMJqi66_Xy`vQl)<sE7Zt(eur$hu3XhY!pzmVWH?^_#gMbzdSqp
z^ZsM`_qv5eht%vjFQ1;g;y*b;S2P(I^6l{R)h&}~(xX5oFun)TZ<aRq?x_4@V&^p~
z(3;|+!wc`^$C=FqB~Z_>^bM~J9c&J@glP$M6<<|@f|<0T-3$Zb90~=4a)YJ_*mH!f
zE)jqrMUG4HsA)W;$TzD}fS}Euq<H2u9tg7d%ZGpfw;K{iwnzbj!uOcJWETnO5U}Wu
zzXZ&K#|S{;@WHcpC_qDmH=Cg(xITYPnc|BO5G(k<1uZ#F%D5FYywiXjf6c+Jfimb8
z(SU@<dW+oxv1QC*i9q7eT3rLN&)chZbPXg<-w%7MPd^xeJgjQV1s=Ou*fh%~pnX_1
z<1fogxVi~QB$yL$72*XJRfK??n|v>5kBzO5{hDy{B?`1+j<rL987-^nCL03+l7BiV
zHqWYQA_kNOLg`@O`+Z6Vi~$K|eTM803_Go4t{4z|1Oy6S(ceg5mOq)T#B7MDNVr{q
z^gRYdR+Ngi9tsfq4P@l7q8O3_L{QXXDv}BWDjJN0{xFgXB)*=*3^IzO0TT635p$6!
zQX8liuM(=5(?*a=66k;u1jn&35<&7bKx`DK{hUx>i+4#|G7qdZhS~^{=+tY<HZ%#r
zUqzZ%Pq;x%M+Fm*h%+111er1c3BzuIDZ9>eNKqhRMlZ=lM9Kh^b-@-wQ`QvpKu7_k
zDYQ~rAQ32d-lFs?=zzr2hD|Y=(g6tvS+^>W3mTvdR&44D_Tg}|AMGNlb}huxjqCcB
zrJ2WSHa<=oo<J?j7^#vHZ}tlBYT(9CmH|~l4^_m=aj+h5H^+6n_(g_ogmzuLKHNaF
z0T=DpMZ1bkq~u8B1vU}H#)xU8OK497=MY8h67RMC`*Y-(?L%-7b&3<K|4?+*jmCmm
za1EdO70koB)TqtG79JmRyrb6*G(Ux(|8gxy$Qc(Ju~OoUloe>`3z&x87#f`jhUGM@
zsMM2DJ?C#MM&pk8@_;v{EEECP8D5!L$q&N?OVj$&=akzUJ-xex>fN<i?=I?C&#n%)
m-9=tz=2;?%B$CK~CjS7-3*$52Ds{{N0000<MNUMnLSTYSnHm%T

diff --git a/wearos/src/main/res/drawable-xxxhdpi/icon_todos.webp b/wearos/src/main/res/drawable-xxxhdpi/icon_todos.webp
new file mode 100644
index 0000000000000000000000000000000000000000..c95435e2de98e848d9044d743810aceece92a353
GIT binary patch
literal 986
zcmV<0110=YNk&G}0{{S5MM6+kP&iD*0{{RokH8`jZ=j%U8^${{$Dc(<!$8_LE%$HY
z5-;FY(6$ZZ@kjipv~43eS==7{@6ZL{_Enb`&%Np15g)H%3;PK&J$GUtTefY}cGhuh
zzS*{I+qP}nH+-^f+di17vXigLT64`Y_jydJBKq%8lB7Br${OD$5su^d1M|N?dp}^&
zzWw{RPVN{EmbRPH<g`muiUs(NjTvIwqapbNqD_*#EhicXGt(q!m%avZ%aEu&if74<
z=um!T`lLzR61tR0lAIR0+$Mk#s>~&X6{^prAZBQCi&(Y|YEZ6R`-$gVdT5Rx;#l_C
zJ(`|pZAvThnj1Ea`QsU%CZb1S#V*VB_2RxG>YE~JY8*Bm=&a^Lf@n}@Q77ZDmxxMY
z)XBK7#;~rG#=G7L*WWabE&|2OltVXzn<$R3#(h&*<znU1cy~$EIPWt$qxXaxyA&SB
zbxaZb@eI@oA*Yag!C~V=e2nugA<!CA#ABPEO8$Wy+gqC`#$^q^&uDz}dlipSdAwI;
z0zGCE!<=G_@X9_z%!hU6^Q1k41n>7`kvn+zabD3f9`i1R0=Kzt#|AAce6mIGHg7EQ
z1aFgMgX{Pul>lGLkCL{7gOf2mipgCKPLs$Yzk5km$Q`!%1LilExE`Fq{QfQt!@7UY
zUv?7-w8!U@KtLbEb=&JCP$938#9|JYzrG_|i02>ydkq(5j*%m|&2?k~-pvi8Ipj!g
z^TG~E2sP~B@5*(O>9e|+S6;1UtW6toCAE2J&-WNUd96qb<CV`|urKmTX!FVj>;HbS
z_9s>eY&`nKIpWVi;#hp}tEB5@f>;~H;+0>QL^k&Dj6l<Ge!+Unp}FW7v3SnO!=s4c
z+CM_)7e+oy`cw`&-*FO}3urUY`InR2<|Q^&Uw48pE1&({HZPi=uoAma#$J!0`4TV2
z!psWJ-&nbpg(S)k=aak`OO7T7&u@8g7L3Loy7~4i+p<@3>*oJ;QbbLqOOm+qdZh2>
z!N$v5`_IY`XMz;P3orQc=dm<FlRo}s0$M)`QjEC9Vl08C_e_3|udi2t=`>fM3wFIf
zhIH288JigjYu-m;rK(dYyoNZ!fXsoH9A#4AV@clFUCJrF`tA*|eznp)s%nbW#!E4*
zY#cFodxg~Z+N7B3Zs7GsmzZ|_vk}kyjCQfPPX?;Tx&ck6os`yxIl2d4ujXoqT5ShP
zNzHmb#&Ff0pd><0IN<#bc6jNwu^B0k^ml|-W~8^Q*`Laq{j#jtzsv6ZM76Q$?r-Kd
I|Hw5103UDrLI3~&

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxxhdpi/magic.png b/wearos/src/main/res/drawable-xxxhdpi/magic.png
deleted file mode 100644
index 09645056c24ada52fc3e5032afe11490dc0c2bc7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 743
zcmV<D0vP>?P)<h;3K|Lk000e1NJLTq002n<002n{0{{R3My>nq00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#S5Qn;MMrQ<DV5D4md_}Z%P5u2D3r`7mCh)a%qf-4
zDV5DBmCawU*_6uWr`q&Twds?^-zSW~uh{I#<nuY6(w)!fg~jGfr`EjR@^ri3T&&hC
zk;P!U>TI^%Rh<^^0000AbW%=J0Phe%W`M{d-<tX9vWx%#0vJg|K~z}7?buhggCG!q
z;b@E)>;YTM{?~aeLlG<pJl<KrfASqi4L%<K<7>jVuhJVwenJT2AoNm7FvebdFFeoF
zi)|hczGN-A`(BvM(~E7MB=ll)_JNH!`@q)r#MQUjNYl5DKCu0=K6UdkTQ-#jr|ZXT
zb18N4aobXI@Cn;mO09h{w?WC)7YQ4bEPW^tHdeCp$+nEvYstp9v1MJ?q?SIE$hP{^
z)f-=Y=e4v9*gjK<ZhS9G+gz%*K4fQGN>)DAwwCJqKCq?S2BnQJK*lyAY*4!G(`~G@
zy?&8}jg{)`j&IM#OW+%fe0#Rf2SRszd$z92X-RMTc5Gcf4K2%((mOuwep@<gX^t8D
z6dPnjsVp<I{S0MWL-SlOO_L7SKFQXMV}4L7zofnJJ-MwfiXuNO4OR7RhZ7&OHDfVP
zb5@#$w1+;hkpiYUD76&~KJrEEuiH*aDiI~L$BTl)6fZSj=zQ6qPjvFO6sb`wnT7bx
zGCjhT6g~JwF}k?#M5>TWy%q{DZ((r>M^XBzq4T$T7%QoQLTOMg+V$(@jrGN%HX(6R
zky2C-8J$93+Ky6nu>-^7td=ra?9)dcPZ6_yJYDxzD%ph89VKRqZLp)naIvp{6%kk8
z=C~oPJE<JcoqXNNjm5q?m^+5ll+$+_DHS+=FyQN+poil;15Y7XEFYmI75n*;^+0cv
Z&>#H}WEj3b%?tnl002ovPDHLkV1mpJU#b8A

diff --git a/wearos/src/main/res/drawable-xxxhdpi/magic.webp b/wearos/src/main/res/drawable-xxxhdpi/magic.webp
new file mode 100644
index 0000000000000000000000000000000000000000..4e886aa2119f4464afa83bdd983b8ebe9e48a8a9
GIT binary patch
literal 606
zcmV-k0-^m<Nk&Fi0ssJ4MM6+kP&iCV0ssInNB|NL=b)gCBxN3@ynj(|fsbq`Xe6om
z2LvDm{|*q-dq1^}BsKf^jGX>E^d6+Ot>mu2f~>-VB&*42k_`+9)8;Sbdu7QpSiO+(
z2qv<(!zA<h<<NIY#Bs-o8^k~iP#1nHfe!qg@Q(@7)han#Suuu5uWJEWw(X`36>=JM
zm^1%@!j)yo4?ZLM55bKjMN(GPf)@{J;S16KVx3bknYuZUtX<ciVPxpKE)3ebx0WF6
zNf<P|c_|G0lDZKY&HxN41hYW;)|M7X+iX#`K-yO2WsRh4`IDvt(zQ1=lCFJ1kfuRu
zJsQCviZr7^^l0tDFf{2|ZqmA@Nzd{mDQYcR2inp&NgXtbzVCek7C$i#+O+IV>Y`Q2
zK5>$cK~fh<S`7wqQoqWXMT0O%-pCjS&C*6E&0QpHL`Z6YWDSz0DUZZ0Niy>@Op>)E
z%d#iGpD`Sg-0kNS<^=``*+(!?xzIYCv=t`H$WT=`H2GU`-x)i<-L}585LRB-m3gE&
zj=gON^04B*-YUHEmTiIfW-q9Mo%Vq0*fe)gL^ETl;h&v*cXLwgaB9a7w7ffA-F-8{
z8Nbc!x)vM5K0Q8LF4Y&Ek}+o#`M1TBR4QU*KBk|evo8Z_sE3q#1Do7kJW-h_+Bj`E
zGs}K|BHFmusGp-qr@3n+^Cpjt5&HL!{FbZzMr4Fm!n)T;r|lcY8Y!Lp#QR&P*m7C_
sky|cHtdaUxdvcVUT*olFUn1R_JL=zGyO!Q#6#kK6g6Pj0h0&A9L>T8I4FCWD

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxxhdpi/watch_habit_negative.png b/wearos/src/main/res/drawable-xxxhdpi/watch_habit_negative.png
deleted file mode 100644
index 31aeb3813cfb5def74c3f4d8b64c47f0a0e161d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^8bHj!!VDxUYZhbxDVB6cUq=Rpjs4tz5?O(K#^NA%
zCx&(BWL^R}LIFM@uI>ds|4~7Qq)k0gmbE0vFPK5${f7PZf9$pc1q?i0978y+CnuC}
zxiTMQ;&ECi;V|)_NU%W*W3Y}%hofk>Mzi*^2!pb23B#NqK?a7lKqFIUe@zvjUItHB
KKbLh*2~7Y?8aXro

diff --git a/wearos/src/main/res/drawable-xxxhdpi/watch_habit_negative.webp b/wearos/src/main/res/drawable-xxxhdpi/watch_habit_negative.webp
new file mode 100644
index 0000000000000000000000000000000000000000..e7c4013c953b105f1df74e07a1f3ae1536c54e86
GIT binary patch
literal 88
zcmWIYbaM+}U|<M$bqWXzu<&sPvh~#uFbe1!{QqqKpM_CH(&P}w;y#%NM-|%~98<I}
sUSPPwWpaTbow4s<;SWKjU-pbOo7Zd+w&2+)^pkmF--TX@oUNV=0Nh$1q5uE@

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxxhdpi/watch_habit_positive.png b/wearos/src/main/res/drawable-xxxhdpi/watch_habit_positive.png
deleted file mode 100644
index d02d3382862c1779e1cf78c8d3a5cf3b932b8ade..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 220
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NV3?%C=ER6$FEa{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaOi1AIbU-3xsFBLU$DhEgDXB|(0{4DS`TUtIIK3&@Z5ba4#PIRA9=MNS7r
z9%gU%0QL)lEaC#2|NES0?@HLz_`PzA$favJ4@*;aYdR?0Y;Y8E2p3xKxqiotonitH
z&rkH~y?e%#bM@_~3d=9en1Ao0nx^LYXuGEElOMAyz4dTp@{{@nw1&ac)z4*}Q$iB}
Dlzvj*

diff --git a/wearos/src/main/res/drawable-xxxhdpi/watch_habit_positive.webp b/wearos/src/main/res/drawable-xxxhdpi/watch_habit_positive.webp
new file mode 100644
index 0000000000000000000000000000000000000000..a0e8ffa4a776fe733af60fdb91070a32fa1e922d
GIT binary patch
literal 118
zcmV-+0Ez!nNk&F)00012MM6+kP&iCt0000lC%_31Couo>KmP>THbWS~Fm8I?01w9?
z7)6rR>fs<s;29t&c&vX@KkVMPM)ZFI>@!bKMh~EI0XPR>OK?Ydg7!2ZY@u){_fa4e
YJ`^nn*OPrdjJ}&A3Bb7lG%iO^U#R#iga7~l

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxxhdpi/watch_habit_posneg.png b/wearos/src/main/res/drawable-xxxhdpi/watch_habit_posneg.png
deleted file mode 100644
index e7e98a26f5f97ed47879039dfa2676dcc2e34b4b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1685
zcmeAS@N?(olHy`uVBq!ia0vp^5kMTm!3HGR!aw)}DaPU;cPEB*=VV?2Im=QbJkxxA
z8MJ_G4hA+xAqHlU5+Gz?lwx27vl$q|7^UItI7SVq8YZ9`Lk1wpAPU53?U@WLQ1vxH
z8U#Fm7-$lN4#=!X&B;wH$uCj}D9Tqb(lgOB0m?BiU_{utfC+9!!~$kGI|QhXp<etH
z2aw_{@Q5sCVBi)8VMc~ob0mOf<Yb0KltlRYSS9D@>LsS+C#C9D<Q9N*G1ydC0hzg}
zC5Z|ZxjA{oRu#5NU=>zCHb_`sNdc^+B->Ug!Z$#{Ilm}X!A#FU&p^qJOF==wrYI%N
zD#*nRsvXF)RmvzSDX`MlFE20GD>v55FG|-pw6wI;H!#vSGSUUA&@HaaD@m--%_~-h
z7y>iLCAB!YD6^m>Ge1uOWNu<oerbuVk`l-wIDoh_wIUN?Q(iIDTR;!$gJkp#^$hf}
zX#;u|?miS<6^R8nHI-zh;jjxN1JMQ!42T<TKrXNXM`)x=W^QU;G0;DD7A7`er(sAS
zJcpz)0!gC<vPL8cB#l6CSveP_f|5^2etwP}w$x;!kFE;M0AFBqrzDmnx+IpQ+8G%D
z<I2EH*T^!&(8$Wv$jaDI+rY@mzyM+lidrOdKmlSE5tLe-pHm8oMmuvO10c{h1d%rS
z7}Drk5jsQjGE3}?pjyy`(RD>4<gr<ZERC+!zbG>mm>9usHH6xRECy9?qYp}tNa+)j
z_`#yU)NjWH3>H{Uvg5jNJK`Jz1CxNKi(^Oy<J&ubeGeN5v_D)TJcW0Y)Aj^sw@mj3
z_F)OkyBv2kZ)5WMtoZx+oVC{{E!C1we}2+bv&`vws>WjrzOeo<`!!V`&pWqWXesbm
z9Uk$!LVF+2lPe;IF6XbgKb;}9|J&c+SC|WKc1k?o_kO<GHS_&mymurEilj~Fx5l2G
zyMEz&hVJu12N=3pk32k?&~TLL(T5a+14)d96-E*X8yhTaBx9Iv9LxUK_uNiOc6YSh
z_5HhLr|D*-+3ei@SeEDI*;jRZt3UkOytRD8#zo%`y-mwKr!S}<w)o*M$Ex{z@<YYX
zKUn$k&RYI;zdoj%Px!CprYpEVa`hUSAEj62QqAqA=IYgF-+A(B_P?$jyYDRJ-)7>q
z?T6~=-$8%%Ii~x~)1STD(@6dK8IhR`^;)Mh_A@i{Y>04>na9Hxp`*a(&&I4HCeW_l
z%qYg)ad`4UQ3iK8f3eSJ+s{ut82tETpxcXQs*Ca-PF@yP$>~<vq<7-_^hBB6Gc(JV
zN^cZ&U|?hsz(X|ZH_A_5_y26(?N^VUn!TL;N9fG8=Qm!ky>`A+zIHpCSML3WzyFi%
zmLC&*Tc4%a?7TmF?&FJ^7f;5^n0?w@_*<-D`MlofnrSZ5W`&&+JnC<J*Ztyo7Mp#s
kynh3SLIVR6Hexl49iss6m3a$;62Jwvr>mdKI;Vst0R0srBLDyZ

diff --git a/wearos/src/main/res/drawable-xxxhdpi/watch_habit_posneg.webp b/wearos/src/main/res/drawable-xxxhdpi/watch_habit_posneg.webp
new file mode 100644
index 0000000000000000000000000000000000000000..10c3d8ed3e19effb36ea365aa0883e3aee495d38
GIT binary patch
literal 146
zcmV;D0B!$LNk&GB00012MM6+kP&iC|0000lSHKhyCouo>KmP>THbWS~Fm8I?01w9?
zSk<<b=+R&#0u-<WkJG;uHZDIA{a56+Z6kHJ*Cc&|6i&ez*-Q`Xb||>*0Me%L4KM|o
zj>M0r=}`P=o1yrjhtyA|$89&qcrtZN)@&OK-vD`26x=au+N9RVZ|H;mAAG$E0JF$I
AUjP6A

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxxhdpi/watch_task_add.png b/wearos/src/main/res/drawable-xxxhdpi/watch_task_add.png
deleted file mode 100644
index ac116bdff91a7f5b931806f39b14ce6cc20fcee7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 292
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xZ3?!EyURMI7SkfJR9T^xl_H+M9WCijWi-X*q
z7}lMWc?skQ1^9%xx)=ETM+F^{HuXSR){-E<V1_B8R~-_}6NP~S^F3W0Lp+YZo#x2b
zY{0|f8{ZI6-R?a90eis%Mu9*7*NbrM3&`BN=y=t+#VTH#u64yoY%LKoxZ##yTQc2?
zf9Wy4D2=_Vw>Z5FT`K7nwUkNK+Ea7s{>g5p4s&^$Sxe^C?Ff7S(tXRkx+AY%x}RCJ
zG2{q`Mdz(Ps~;lX+~qT`Y!2Yx6ZvDcjd76X(vsb60j+7DzWk5bv|^W==>A%xn&tnQ
Y|Mxq5$muO>0y>q!)78&qol`;+00u*MG5`Po

diff --git a/wearos/src/main/res/drawable-xxxhdpi/watch_task_add.webp b/wearos/src/main/res/drawable-xxxhdpi/watch_task_add.webp
new file mode 100644
index 0000000000000000000000000000000000000000..1832821e220d08119777b8d930b4422a7ff29566
GIT binary patch
literal 180
zcmV;l089T;Nk&Gj00012MM6+kP&iDV0000lN5ByfFEIb}KmP;)q`@STc#0hka8VpX
zz&4U3C;RmYAS0mg{}CZv0PuJD2ZP)zEUbwBPXHcIDlORA%&a9<dXT_Lb{aX`*~lqp
zD@V_SW0(K8NsTHkfNb;@mGUGca~L-dWAU)62eHpo4^lj=yN5n`h?VjrAoE%PSvfM`
i@fE25Gd&YdIa@jVS<gvlkyGhG0tflff}K?cJO%&@6G}J$

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxxhdpi/watch_task_minus.png b/wearos/src/main/res/drawable-xxxhdpi/watch_task_minus.png
deleted file mode 100644
index 283caf99b0619a3f4700afb11b306b74fc721f64..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 230
zcmeAS@N?(olHy`uVBq!ia0vp^9zZO>!VDzc<y77QDVB6cUq=Rpjs4tz5?O(K#^NA%
zCx&(BWL^R}5&=FTuI>ds|FHpC@6dffHS8rpe!&bAt_nCTP}uX=%LgbF>FMGaqH(_W
z(m~D!2OgJ;`eq6m5r^WoviO%R5ba2Bp7m{O)7+oW*&9_31Z@h+`EyqD)k0maqb`#-
z^#w1U9lN-DQQ!nOxlPA<rEJ$o?Y(ETc5?)K+v0y(%r#%^{t1`pF7O3f!r<xZ=d#Wz
Gp$Py)-&@}R

diff --git a/wearos/src/main/res/drawable-xxxhdpi/watch_task_minus.webp b/wearos/src/main/res/drawable-xxxhdpi/watch_task_minus.webp
new file mode 100644
index 0000000000000000000000000000000000000000..c59da49f586d68a0af4e02f7d9008f08318a318f
GIT binary patch
literal 124
zcmV-?0E7QhNk&F=00012MM6+kP&iCy0000lN5BIRKQRCEKmTL_rpX};p}Rki0$hmT
z5JSN>vTY?7DL`9bXuwj3+)H>l@_zr}yF&pH{ht6}P-iMRfX<m`h}2HJ))9s`L-R2#
e${_AHl|f#H>tQHbhA>h)@zB|209Lh;5&!@~4Kcm|

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable/cancel.xml b/wearos/src/main/res/drawable/cancel.xml
index c13da3188..ce53ea724 100644
--- a/wearos/src/main/res/drawable/cancel.xml
+++ b/wearos/src/main/res/drawable/cancel.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="16"
     android:viewportHeight="16">
   <path
diff --git a/wearos/src/main/res/drawable/google_icon.xml b/wearos/src/main/res/drawable/google_icon.xml
index 806237378..25d3aa10c 100644
--- a/wearos/src/main/res/drawable/google_icon.xml
+++ b/wearos/src/main/res/drawable/google_icon.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="48"
     android:viewportHeight="48">
   <path
diff --git a/wearos/src/main/res/drawable/handoff.xml b/wearos/src/main/res/drawable/handoff.xml
new file mode 100644
index 000000000..3cd107879
--- /dev/null
+++ b/wearos/src/main/res/drawable/handoff.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M17,16 L15.6,14.6 17.15,13H12V11H17.15L15.6,9.4L17,8L21,12ZM7,23Q6.175,23 5.588,22.413Q5,21.825 5,21V3Q5,2.175 5.588,1.587Q6.175,1 7,1H17Q17.825,1 18.413,1.587Q19,2.175 19,3V7H17V6H7V18H17V17H19V21Q19,21.825 18.413,22.413Q17.825,23 17,23Z"/>
+</vector>
diff --git a/wearos/src/main/res/drawable/logout.xml b/wearos/src/main/res/drawable/logout.xml
index 0673850d0..1d6f5b75b 100644
--- a/wearos/src/main/res/drawable/logout.xml
+++ b/wearos/src/main/res/drawable/logout.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="22dp"
-    android:height="20dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="22"
     android:viewportHeight="20">
   <path

From d38ff7d602349697b01c326a15c0c93062886b24 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 30 Jun 2022 15:09:27 +0200
Subject: [PATCH 04/39] fix settings clipping

---
 wearos/src/main/res/layout/row_settings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wearos/src/main/res/layout/row_settings.xml b/wearos/src/main/res/layout/row_settings.xml
index ed906b849..b8e9d84c5 100644
--- a/wearos/src/main/res/layout/row_settings.xml
+++ b/wearos/src/main/res/layout/row_settings.xml
@@ -10,7 +10,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         style="@style/Chip"
-        android:paddingHorizontal="20dp">
+        android:paddingHorizontal="20dp"
+        android:clipToPadding="false">
         <TextView
             android:id="@+id/title_view"
             android:layout_width="wrap_content"

From 978e2070964b2ad748b1c4910b5b21e404bbb56a Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 30 Jun 2022 15:09:42 +0200
Subject: [PATCH 05/39] refactor some code

---
 Habitica/proguard-rules.pro                   | 14 ----
 .../android/habitica/models/tasks/Task.kt     | 66 ++--------------
 .../common/habitica/models/tasks/BaseTask.kt  | 30 ++++++++
 .../wearos/habitica/models/tasks/Task.kt      | 76 ++-----------------
 .../ui/activities/TaskDetailActivity.kt       |  3 +-
 wearos/src/main/res/layout/activity_login.xml |  6 +-
 6 files changed, 52 insertions(+), 143 deletions(-)
 create mode 100644 common/src/main/java/com/habitrpg/common/habitica/models/tasks/BaseTask.kt

diff --git a/Habitica/proguard-rules.pro b/Habitica/proguard-rules.pro
index c511cae23..f57461c2a 100644
--- a/Habitica/proguard-rules.pro
+++ b/Habitica/proguard-rules.pro
@@ -123,20 +123,6 @@
     -dontwarn com.google.android.gms.**
 #end playservices
 
-#checkout
--keep class com.android.vending.billing.**
-
--assumenosideeffects class org.solovyev.android.checkout.Billing {
-    public static void debug(...);
-    public static void warning(...);
-    public static void error(...);
-}
-
--assumenosideeffects class org.solovyev.android.checkout.Check {
-    static *;
-}
-#end chekout
-
 #add warnings here, warnings in proguard is normal
 -dontwarn javax.annotation.**
 -dontwarn com.squareup.picasso.**
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 1e61f956b..fcabf7815 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
@@ -10,6 +10,7 @@ import com.habitrpg.android.habitica.models.BaseMainObject
 import com.habitrpg.android.habitica.models.Tag
 import com.habitrpg.common.habitica.helpers.MarkdownParser
 import com.habitrpg.common.habitica.models.tasks.Attribute
+import com.habitrpg.common.habitica.models.tasks.BaseTask
 import com.habitrpg.common.habitica.models.tasks.Frequency
 import com.habitrpg.common.habitica.models.tasks.TaskType
 import io.realm.RealmList
@@ -18,17 +19,9 @@ import io.realm.annotations.Ignore
 import io.realm.annotations.PrimaryKey
 import org.json.JSONArray
 import org.json.JSONException
-import java.time.LocalDateTime
-import java.time.ZoneId
-import java.time.ZonedDateTime
-import java.time.format.DateTimeFormatter
-import java.time.format.DateTimeFormatterBuilder
-import java.time.temporal.TemporalAccessor
-import java.util.Calendar
 import java.util.Date
-import java.util.GregorianCalendar
 
-open class Task : RealmObject, BaseMainObject, Parcelable {
+open class Task : RealmObject, BaseMainObject, Parcelable, BaseTask {
     override val realmClass: Class<Task>
         get() = Task::class.java
     override val primaryIdentifier: String?
@@ -43,7 +36,7 @@ open class Task : RealmObject, BaseMainObject, Parcelable {
     var priority: Float = 0.0f
     var text: String = ""
     var notes: String? = null
-    var type: TaskType?
+    override var type: TaskType?
         get() = TaskType.from(typeValue)
         set(value) { typeValue = value?.value }
     private var typeValue: String? = null
@@ -61,10 +54,10 @@ open class Task : RealmObject, BaseMainObject, Parcelable {
     // Habits
     var up: Boolean? = false
     var down: Boolean? = false
-    var counterUp: Int? = 0
-    var counterDown: Int? = 0
+    override var counterUp: Int? = 0
+    override var counterDown: Int? = 0
     // todos/dailies
-    var completed: Boolean = false
+    override var completed: Boolean = false
     var checklist: RealmList<ChecklistItem>? = RealmList()
     var reminders: RealmList<RemindersItem>? = RealmList()
     // dailies
@@ -73,7 +66,7 @@ open class Task : RealmObject, BaseMainObject, Parcelable {
         set(value) { frequencyValue = value?.value }
     var frequencyValue: String? = null
     var everyX: Int? = 0
-    var streak: Int? = 0
+    override var streak: Int? = 0
     var startDate: Date? = null
     var repeat: Days? = null
     // todos
@@ -86,7 +79,7 @@ open class Task : RealmObject, BaseMainObject, Parcelable {
     @Ignore
     var parsedNotes: Spanned? = null
 
-    var isDue: Boolean? = null
+    override var isDue: Boolean? = null
 
     var nextDue: RealmList<Date>? = null
 
@@ -188,9 +181,6 @@ open class Task : RealmObject, BaseMainObject, Parcelable {
             }
         }
 
-    val isDisplayedActive: Boolean
-        get() = ((isDue == true && type == TaskType.DAILY) || type == TaskType.TODO) && !completed
-
     val isChecklistDisplayActive: Boolean
         get() = this.checklist?.size != this.completedChecklistCount
 
@@ -204,46 +194,6 @@ open class Task : RealmObject, BaseMainObject, Parcelable {
 
     fun checkIfDue(): Boolean = isDue == true
 
-    fun getNextReminderOccurence(oldTime: String?): ZonedDateTime? {
-        if (oldTime == null) {
-            return null
-        }
-        val nextDate = nextDue?.firstOrNull()
-
-        return if (nextDate != null && !isDisplayedActive) {
-            val nextDueCalendar = GregorianCalendar()
-            nextDueCalendar.time = nextDate
-            parse(oldTime)
-                ?.withYear(nextDueCalendar.get(Calendar.YEAR))
-                ?.withMonth(nextDueCalendar.get(Calendar.MONTH))
-                ?.withDayOfMonth(nextDueCalendar.get(Calendar.DAY_OF_MONTH))
-        } else if (isDisplayedActive) {
-            parse(oldTime)
-        } else {
-            null
-        }
-    }
-
-    fun formatter(): DateTimeFormatter =
-        DateTimeFormatterBuilder().append(DateTimeFormatter.ISO_LOCAL_DATE)
-            .appendPattern("['T'][' ']")
-            .append(DateTimeFormatter.ISO_LOCAL_TIME)
-            .appendPattern("[XX]")
-            .toFormatter()
-
-    fun parse(dateTime: String): ZonedDateTime? {
-        val parsed: TemporalAccessor = formatter().parseBest(
-            dateTime,
-            ZonedDateTime::from, LocalDateTime::from
-        )
-        return if (parsed is ZonedDateTime) {
-            parsed
-        } else {
-            val defaultZone: ZoneId = ZoneId.of("UTC")
-            (parsed as LocalDateTime).atZone(defaultZone)
-        }
-    }
-
     fun parseMarkdown() {
         parsedText = MarkdownParser.parseMarkdown(text)
         parsedNotes = MarkdownParser.parseMarkdown(notes)
diff --git a/common/src/main/java/com/habitrpg/common/habitica/models/tasks/BaseTask.kt b/common/src/main/java/com/habitrpg/common/habitica/models/tasks/BaseTask.kt
new file mode 100644
index 000000000..0dfe3f0d3
--- /dev/null
+++ b/common/src/main/java/com/habitrpg/common/habitica/models/tasks/BaseTask.kt
@@ -0,0 +1,30 @@
+package com.habitrpg.common.habitica.models.tasks
+
+interface BaseTask {
+
+    val completed: Boolean
+    var type: TaskType?
+    var isDue: Boolean?
+    var streak: Int?
+    var counterDown: Int?
+    var counterUp: Int?
+
+    val isDisplayedActive: Boolean
+        get() = ((isDue == true && type == TaskType.DAILY) || type == TaskType.TODO) && !completed
+
+}
+
+val BaseTask.streakString: String?
+    get() {
+        return if ((counterUp ?: 0) > 0 && (counterDown ?: 0) > 0) {
+            "+" + counterUp.toString() + " | -" + counterDown?.toString()
+        } else if ((counterUp ?: 0) > 0) {
+            "+" + counterUp.toString()
+        } else if ((counterDown ?: 0) > 0) {
+            "-" + counterDown.toString()
+        } else if ((streak ?: 0) > 0) {
+            return streak.toString()
+        } else {
+            null
+        }
+    }
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/Task.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/Task.kt
index 580d3cc04..88f7765ab 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/Task.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/Task.kt
@@ -5,24 +5,17 @@ import android.os.Parcelable
 import android.text.Spanned
 import com.habitrpg.android.habitica.R
 import com.habitrpg.common.habitica.models.tasks.Attribute
+import com.habitrpg.common.habitica.models.tasks.BaseTask
 import com.habitrpg.common.habitica.models.tasks.Frequency
 import com.habitrpg.common.habitica.models.tasks.TaskType
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import org.json.JSONArray
 import org.json.JSONException
-import java.time.LocalDateTime
-import java.time.ZoneId
-import java.time.ZonedDateTime
-import java.time.format.DateTimeFormatter
-import java.time.format.DateTimeFormatterBuilder
-import java.time.temporal.TemporalAccessor
-import java.util.Calendar
 import java.util.Date
-import java.util.GregorianCalendar
 
 @JsonClass(generateAdapter = true)
-open class Task constructor(): Parcelable {
+open class Task constructor(): Parcelable, BaseTask {
 
     @Json(name="_id")
     var id: String? = null
@@ -30,7 +23,7 @@ open class Task constructor(): Parcelable {
     var priority: Float = 0.0f
     var text: String = ""
     var notes: String? = null
-    var type: TaskType?
+    override var type: TaskType?
         get() = TaskType.from(typeValue)
         set(value) { typeValue = value?.value }
     internal var typeValue: String? = null
@@ -46,16 +39,16 @@ open class Task constructor(): Parcelable {
     // Habits
     var up: Boolean? = false
     var down: Boolean? = false
-    var counterUp: Int? = 0
-    var counterDown: Int? = 0
+    override var counterUp: Int? = 0
+    override var counterDown: Int? = 0
     // todos/dailies
-    var completed: Boolean = false
+    override var completed: Boolean = false
     var checklist: List<ChecklistItem>? = listOf()
     var reminders: List<RemindersItem>? = listOf()
     // dailies
     var frequency: Frequency? = null
     var everyX: Int? = 0
-    var streak: Int? = 0
+    override var streak: Int? = 0
     var startDate: Date? = null
     var repeat: Days? = null
     // todos
@@ -69,7 +62,7 @@ open class Task constructor(): Parcelable {
     @Json(ignore = true)
     var parsedNotes: Spanned? = null
 
-    var isDue: Boolean? = null
+    override var isDue: Boolean? = null
 
     var nextDue: List<Date>? = null
 
@@ -91,21 +84,6 @@ open class Task constructor(): Parcelable {
     val completedChecklistCount: Int
         get() = checklist?.count { it.completed } ?: 0
 
-    val streakString: String?
-        get() {
-            return if ((counterUp ?: 0) > 0 && (counterDown ?: 0) > 0) {
-                "+" + counterUp.toString() + " | -" + counterDown?.toString()
-            } else if ((counterUp ?: 0) > 0) {
-                "+" + counterUp.toString()
-            } else if ((counterDown ?: 0) > 0) {
-                "-" + counterDown.toString()
-            } else if ((streak ?: 0) > 0) {
-                return streak.toString()
-            } else {
-                null
-            }
-        }
-
     val extraLightTaskColor: Int
         get() {
             return when {
@@ -145,48 +123,10 @@ open class Task constructor(): Parcelable {
             }
         }
 
-    val isDisplayedActive: Boolean
-        get() = ((isDue == true && type == TaskType.DAILY) || type == TaskType.TODO) && !completed
 
-    fun getNextReminderOccurence(oldTime: String?): ZonedDateTime? {
-        if (oldTime == null) {
-            return null
-        }
-        val nextDate = nextDue?.firstOrNull()
 
-        return if (nextDate != null && !isDisplayedActive) {
-            val nextDueCalendar = GregorianCalendar()
-            nextDueCalendar.time = nextDate
-            parse(oldTime)
-                ?.withYear(nextDueCalendar.get(Calendar.YEAR))
-                ?.withMonth(nextDueCalendar.get(Calendar.MONTH))
-                ?.withDayOfMonth(nextDueCalendar.get(Calendar.DAY_OF_MONTH))
-        } else if (isDisplayedActive) {
-            parse(oldTime)
-        } else {
-            null
-        }
-    }
 
-    fun formatter(): DateTimeFormatter =
-        DateTimeFormatterBuilder().append(DateTimeFormatter.ISO_LOCAL_DATE)
-            .appendPattern("['T'][' ']")
-            .append(DateTimeFormatter.ISO_LOCAL_TIME)
-            .appendPattern("[XX]")
-            .toFormatter()
 
-    fun parse(dateTime: String): ZonedDateTime? {
-        val parsed: TemporalAccessor = formatter().parseBest(
-            dateTime,
-            ZonedDateTime::from, LocalDateTime::from
-        )
-        return if (parsed is ZonedDateTime) {
-            parsed
-        } else {
-            val defaultZone: ZoneId = ZoneId.of("UTC")
-            (parsed as LocalDateTime).atZone(defaultZone)
-        }
-    }
     override fun equals(other: Any?): Boolean {
         if (other == null) {
             return false
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskDetailActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskDetailActivity.kt
index 76676574c..419db4aa2 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskDetailActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskDetailActivity.kt
@@ -6,6 +6,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ActivityTaskDetailBinding
+import com.habitrpg.common.habitica.models.tasks.streakString
 import com.habitrpg.wearos.habitica.ui.viewmodels.TaskDetailViewModel
 import dagger.hilt.android.AndroidEntryPoint
 import java.util.Locale
@@ -40,7 +41,7 @@ class TaskDetailActivity : BaseActivity<ActivityTaskDetailBinding, TaskDetailVie
             binding.taskTypeView.setTextColor(
                 ContextCompat.getColor(
                     this,
-                    task?.extraLightTaskColor ?: R.color.white
+                    task?.extraLightTaskColor ?: R.color.watch_white
                 )
             )
             binding.taskTextView.text = task?.text
diff --git a/wearos/src/main/res/layout/activity_login.xml b/wearos/src/main/res/layout/activity_login.xml
index f437ca18a..f717b4dc3 100644
--- a/wearos/src/main/res/layout/activity_login.xml
+++ b/wearos/src/main/res/layout/activity_login.xml
@@ -78,7 +78,8 @@
                 android:id="@+id/username_edit_text"
                 android:layout_width="match_parent"
                 android:layout_height="52dp"
-                android:inputType="textEmailAddress"
+                android:inputType="textEmailAddress|text"
+                android:imeOptions="actionNext"
                 android:hint="@string/email_username"
                 android:paddingHorizontal="16dp"
                 android:background="@drawable/row_background_outline"
@@ -95,8 +96,9 @@
                 android:paddingHorizontal="16dp"
                 android:autofillHints="password"
                 android:textColorHint="@color/watch_gray_200"
-                android:inputType="textPassword"
+                android:inputType="textPassword|text"
                 android:textSize="14sp"
+                android:imeOptions="actionDone"
                 android:layout_marginBottom="@dimen/spacing_small"/>
             <Button
                 android:id="@+id/login_button"

From ff24cd8d18c326b6bc7046b7241f80387e0aaf19 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 5 Jul 2022 15:16:37 +0200
Subject: [PATCH 06/39] idk

---
 .../android/habitica/models/tasks/Task.kt     | 48 +++++++++++++++++++
 common/src/main/res/values/colors.xml         |  2 +
 version.properties                            |  2 +-
 .../wearos/habitica/MainApplication.kt        | 10 ++++
 .../wearos/habitica/models/tasks/Task.kt      |  4 --
 wearos/src/main/res/values-w450dp/dimens.xml  |  4 ++
 6 files changed, 65 insertions(+), 5 deletions(-)
 create mode 100644 wearos/src/main/res/values-w450dp/dimens.xml

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 fcabf7815..0a2dbe487 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
@@ -19,7 +19,15 @@ import io.realm.annotations.Ignore
 import io.realm.annotations.PrimaryKey
 import org.json.JSONArray
 import org.json.JSONException
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.ZonedDateTime
+import java.time.format.DateTimeFormatter
+import java.time.format.DateTimeFormatterBuilder
+import java.time.temporal.TemporalAccessor
+import java.util.Calendar
 import java.util.Date
+import java.util.GregorianCalendar
 
 open class Task : RealmObject, BaseMainObject, Parcelable, BaseTask {
     override val realmClass: Class<Task>
@@ -194,6 +202,46 @@ open class Task : RealmObject, BaseMainObject, Parcelable, BaseTask {
 
     fun checkIfDue(): Boolean = isDue == true
 
+    fun getNextReminderOccurence(oldTime: String?): ZonedDateTime? {
+        if (oldTime == null) {
+            return null
+        }
+        val nextDate = nextDue?.firstOrNull()
+
+        return if (nextDate != null && !isDisplayedActive) {
+            val nextDueCalendar = GregorianCalendar()
+            nextDueCalendar.time = nextDate
+            parse(oldTime)
+                ?.withYear(nextDueCalendar.get(Calendar.YEAR))
+                ?.withMonth(nextDueCalendar.get(Calendar.MONTH))
+                ?.withDayOfMonth(nextDueCalendar.get(Calendar.DAY_OF_MONTH))
+        } else if (isDisplayedActive) {
+            parse(oldTime)
+        } else {
+            null
+        }
+    }
+
+    fun formatter(): DateTimeFormatter =
+        DateTimeFormatterBuilder().append(DateTimeFormatter.ISO_LOCAL_DATE)
+            .appendPattern("['T'][' ']")
+            .append(DateTimeFormatter.ISO_LOCAL_TIME)
+            .appendPattern("[XX]")
+            .toFormatter()
+
+    fun parse(dateTime: String): ZonedDateTime? {
+        val parsed: TemporalAccessor = formatter().parseBest(
+            dateTime,
+            ZonedDateTime::from, LocalDateTime::from
+        )
+        return if (parsed is ZonedDateTime) {
+            parsed
+        } else {
+            val defaultZone: ZoneId = ZoneId.of("UTC")
+            (parsed as LocalDateTime).atZone(defaultZone)
+        }
+    }
+
     fun parseMarkdown() {
         parsedText = MarkdownParser.parseMarkdown(text)
         parsedNotes = MarkdownParser.parseMarkdown(notes)
diff --git a/common/src/main/res/values/colors.xml b/common/src/main/res/values/colors.xml
index c4523e3ea..adef2cfa0 100644
--- a/common/src/main/res/values/colors.xml
+++ b/common/src/main/res/values/colors.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="white">#ffffff</color>
+    <color name="black">#000000</color>
     <color name="watch_white">#ffffff</color>
     <color name="watch_black">#000000</color>
 
diff --git a/version.properties b/version.properties
index c7da5e74c..836b20a4b 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
 NAME=4.0
-CODE=4040
\ No newline at end of file
+CODE=4050
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt
index 9b2689c61..7c8a4d8ae 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt
@@ -4,6 +4,7 @@ import android.app.Application
 import android.content.Intent
 import com.habitrpg.common.habitica.extensions.setupCoil
 import com.habitrpg.common.habitica.helpers.MarkdownParser
+import com.habitrpg.common.habitica.models.tasks.TaskType
 import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
 import com.habitrpg.wearos.habitica.data.repositories.UserRepository
 import com.habitrpg.wearos.habitica.ui.activities.BaseActivity
@@ -13,6 +14,8 @@ import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -35,6 +38,13 @@ class MainApplication : Application() {
                     intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                     startActivity(intent)
                 } else if (it.needsCron && BaseActivity.currentActivityClassName != RYAActivity::class.java.name) {
+                    val dueDailies = taskRepository.getTasks(TaskType.DAILY)
+                        .map { it.filter { task -> task.isDisplayedActive } }
+                        .first()
+                    if (dueDailies.isEmpty()) {
+                        userRepository.runCron()
+                        return@onEach
+                    }
                     val intent = Intent(this@MainApplication, RYAActivity::class.java)
                     intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                     startActivity(intent)
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/Task.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/Task.kt
index 88f7765ab..b545318ba 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/Task.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/tasks/Task.kt
@@ -123,10 +123,6 @@ open class Task constructor(): Parcelable, BaseTask {
             }
         }
 
-
-
-
-
     override fun equals(other: Any?): Boolean {
         if (other == null) {
             return false
diff --git a/wearos/src/main/res/values-w450dp/dimens.xml b/wearos/src/main/res/values-w450dp/dimens.xml
new file mode 100644
index 000000000..4c85590d2
--- /dev/null
+++ b/wearos/src/main/res/values-w450dp/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="row_padding_horizontal">12dp</dimen>
+</resources>
\ No newline at end of file

From 6cb4b90c4d683ae326acab02365d19d0ec8731f0 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 5 Jul 2022 12:27:44 +0200
Subject: [PATCH 07/39] fix stats animating twice

---
 .../common/habitica/views/HabiticaProgressBar.kt      | 11 ++++-------
 .../wearos/habitica/ui/activities/StatsActivity.kt    |  3 ---
 .../wearos/habitica/ui/viewmodels/StatsViewModel.kt   | 10 +++++++++-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/common/src/main/java/com/habitrpg/common/habitica/views/HabiticaProgressBar.kt b/common/src/main/java/com/habitrpg/common/habitica/views/HabiticaProgressBar.kt
index 5410701a2..e1b7c3acc 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/views/HabiticaProgressBar.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/views/HabiticaProgressBar.kt
@@ -1,22 +1,19 @@
 package com.habitrpg.common.habitica.views
 
 import android.content.Context
-import android.content.res.ColorStateList
-import android.graphics.PorterDuff
-import android.os.Build
 import android.util.AttributeSet
 import android.view.View
 import android.widget.FrameLayout
-import android.widget.ImageView
 import android.widget.LinearLayout
-import androidx.core.widget.ImageViewCompat
-import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.common.habitica.R
 import com.habitrpg.common.habitica.databinding.ProgressBarBinding
 import com.habitrpg.common.habitica.extensions.DataBindingUtils
+import com.habitrpg.common.habitica.extensions.layoutInflater
 import kotlin.math.min
 
-class HabiticaProgressBar(context: Context, attrs: AttributeSet?) : FrameLayout(context, attrs) {
+class HabiticaProgressBar @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null
+) : FrameLayout(context, attrs) {
     val binding = ProgressBarBinding.inflate(context.layoutInflater, this)
 
     var barForegroundColor: Int = 0
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/StatsActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/StatsActivity.kt
index fa9959a69..f7f5a1028 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/StatsActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/StatsActivity.kt
@@ -31,14 +31,12 @@ class StatsActivity : BaseActivity<ActivityStatsBinding, StatsViewModel>() {
     private fun setViews() {
         binding.statsImageview.setColorFilter(ContextCompat.getColor(this, R.color.watch_purple_200))
         binding.statsImageview.visibility = VISIBLE
-        loadingManager.startLoading()
         setBarViews()
         setStatViews()
     }
 
     private fun loadViews(user: User) {
         binding.statsImageview.visibility = GONE
-        loadingManager.endLoading()
         updateStats(user)
     }
 
@@ -102,7 +100,6 @@ class StatsActivity : BaseActivity<ActivityStatsBinding, StatsViewModel>() {
             binding.mpStatValue.setStatValues(stats.maxMP ?: 0, stats.mp?.toInt() ?: 0)
         }
     }
-
 }
 
 
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/StatsViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/StatsViewModel.kt
index 83d29bb8b..99f78b34f 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/StatsViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/StatsViewModel.kt
@@ -9,6 +9,7 @@ import com.habitrpg.wearos.habitica.managers.LoadingManager
 import com.habitrpg.wearos.habitica.models.user.User
 import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -23,6 +24,13 @@ class StatsViewModel @Inject constructor(userRepository: UserRepository,
         }
     }
 
-    var user: LiveData<User> = userRepository.getUser().asLiveData()
+    var user: LiveData<User> = userRepository.getUser()
+        .distinctUntilChanged { old, new ->
+            val oldStats = old.stats ?: return@distinctUntilChanged  false
+            val newStats = new.stats ?: return@distinctUntilChanged  false
+            return@distinctUntilChanged (oldStats.hp ?: 0.0) + (oldStats.exp ?: 0.0) + (oldStats.exp ?: 0.0) ==
+                (newStats.hp ?: 0.0) + (newStats.exp ?: 0.0) + (newStats.exp ?: 0.0)
+        }
+        .asLiveData()
 
 }
\ No newline at end of file

From 716544c9025202db641d34bb49b5e368150ae675 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 5 Jul 2022 13:21:59 +0200
Subject: [PATCH 08/39] Implement hand off view

---
 .../receivers/DeviceCommunicationService.kt   | 10 ++--
 .../habitica/helpers/DeviceCommunication.kt   | 11 ++++
 wearos/src/main/AndroidManifest.xml           |  1 +
 .../habitica/ui/activities/BaseActivity.kt    |  1 +
 .../ui/activities/ContinuePhoneActivity.kt    | 54 +++++++++++++++++++
 .../habitica/ui/activities/LoginActivity.kt   |  9 +++-
 .../habitica/ui/activities/RYAActivity.kt     |  3 +-
 .../habitica/ui/activities/StatsActivity.kt   |  7 +--
 .../ui/viewmodels/ContinuePhoneViewModel.kt   | 18 +++++++
 .../habitica/ui/viewmodels/LoginViewModel.kt  |  8 ++-
 .../res/layout/activity_continue_phone.xml    | 23 ++++++++
 wearos/src/main/res/values/strings.xml        |  1 +
 12 files changed, 131 insertions(+), 15 deletions(-)
 create mode 100644 common/src/main/java/com/habitrpg/common/habitica/helpers/DeviceCommunication.kt
 create mode 100644 wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/ContinuePhoneActivity.kt
 create mode 100644 wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ContinuePhoneViewModel.kt
 create mode 100644 wearos/src/main/res/layout/activity_continue_phone.xml

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/DeviceCommunicationService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/DeviceCommunicationService.kt
index 51d76226a..c8c14712e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/DeviceCommunicationService.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/DeviceCommunicationService.kt
@@ -9,6 +9,7 @@ import com.habitrpg.android.habitica.ui.activities.LoginActivity
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.activities.TaskFormActivity
 import com.habitrpg.common.habitica.api.HostConfig
+import com.habitrpg.common.habitica.helpers.DeviceCommunication
 import javax.inject.Inject
 
 class DeviceCommunicationService : WearableListenerService() {
@@ -24,10 +25,11 @@ class DeviceCommunicationService : WearableListenerService() {
     override fun onMessageReceived(event: MessageEvent) {
         super.onMessageReceived(event)
         when (event.path) {
-            "/request/auth" -> processAuthRequest(event)
-            "/show/register" -> openActivity(LoginActivity::class.java)
-            "/show/rya" -> openActivity(MainActivity::class.java)
-            "/tasks/edit" -> openTaskForm(event)
+            DeviceCommunication.REQUEST_AUTH -> processAuthRequest(event)
+            DeviceCommunication.SHOW_REGISTER -> openActivity(LoginActivity::class.java)
+            DeviceCommunication.SHOW_LOGIN -> openActivity(LoginActivity::class.java)
+            DeviceCommunication.SHOW_RYA -> openActivity(MainActivity::class.java)
+            DeviceCommunication.SHOW_TASK_EDIT -> openTaskForm(event)
         }
     }
 
diff --git a/common/src/main/java/com/habitrpg/common/habitica/helpers/DeviceCommunication.kt b/common/src/main/java/com/habitrpg/common/habitica/helpers/DeviceCommunication.kt
new file mode 100644
index 000000000..559b66735
--- /dev/null
+++ b/common/src/main/java/com/habitrpg/common/habitica/helpers/DeviceCommunication.kt
@@ -0,0 +1,11 @@
+package com.habitrpg.common.habitica.helpers
+
+class DeviceCommunication {
+    companion object {
+        const val REQUEST_AUTH = "/request/auth"
+        const val SHOW_REGISTER = "/show/register"
+        const val SHOW_LOGIN = "/show/login"
+        const val SHOW_RYA = "/show/rya"
+        const val SHOW_TASK_EDIT = "/tasks/edit"
+    }
+}
\ No newline at end of file
diff --git a/wearos/src/main/AndroidManifest.xml b/wearos/src/main/AndroidManifest.xml
index 943e9543a..6e8ac7642 100644
--- a/wearos/src/main/AndroidManifest.xml
+++ b/wearos/src/main/AndroidManifest.xml
@@ -48,6 +48,7 @@
         <activity android:name="com.habitrpg.wearos.habitica.ui.activities.FaintActivity" />
 
         <activity android:name="com.habitrpg.wearos.habitica.ui.activities.SettingsActivity" />
+        <activity android:name="com.habitrpg.wearos.habitica.ui.activities.ContinuePhoneActivity" />
 
         <activity android:name="androidx.wear.activity.ConfirmationActivity" />
     </application>
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt
index 918503ef3..109a2fe32 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt
@@ -90,6 +90,7 @@ abstract class BaseActivity<B: ViewBinding, VM: BaseViewModel> : ComponentActivi
 
     internal fun openRemoteActivity(url: String) {
         sendMessage("open_activity", url, null)
+        startActivity(Intent(this, ContinuePhoneActivity::class.java))
     }
 
     internal fun sendMessage(
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/ContinuePhoneActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/ContinuePhoneActivity.kt
new file mode 100644
index 000000000..210f10b56
--- /dev/null
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/ContinuePhoneActivity.kt
@@ -0,0 +1,54 @@
+package com.habitrpg.wearos.habitica.ui.activities
+
+import android.os.Bundle
+import android.view.animation.AlphaAnimation
+import android.view.animation.AnimationSet
+import android.view.animation.AnticipateOvershootInterpolator
+import android.view.animation.TranslateAnimation
+import androidx.activity.viewModels
+import androidx.lifecycle.lifecycleScope
+import com.habitrpg.android.habitica.databinding.ActivityContinuePhoneBinding
+import com.habitrpg.common.habitica.extensions.dpToPx
+import com.habitrpg.wearos.habitica.ui.viewmodels.ContinuePhoneViewModel
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
+
+@AndroidEntryPoint
+class ContinuePhoneActivity : BaseActivity<ActivityContinuePhoneBinding, ContinuePhoneViewModel>() {
+    override val viewModel: ContinuePhoneViewModel by viewModels()
+
+    private var secondsToShow = 2
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        binding = ActivityContinuePhoneBinding.inflate(layoutInflater)
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun onStart() {
+        super.onStart()
+
+        binding.root.setOnClickListener {
+            finish()
+        }
+
+        lifecycleScope.launch {
+            delay(secondsToShow.toDuration(DurationUnit.SECONDS))
+            finish()
+        }
+
+        val alphaAnimation = AlphaAnimation(0f, 1f)
+        val translateAnimation = TranslateAnimation((-20f).dpToPx(this), 0f, 0f, 0f)
+        val set = AnimationSet(true)
+        set.interpolator = AnticipateOvershootInterpolator()
+        set.duration = 600
+        set.startOffset = 200
+        set.fillBefore = true
+        set.fillAfter = true
+        set.addAnimation(alphaAnimation)
+        set.addAnimation(translateAnimation)
+        binding.iconView.startAnimation(set)
+    }
+}
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/LoginActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/LoginActivity.kt
index 9146972fb..7ac08bc65 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/LoginActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/LoginActivity.kt
@@ -11,6 +11,7 @@ import androidx.core.view.isVisible
 import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ActivityLoginBinding
+import com.habitrpg.common.habitica.helpers.DeviceCommunication
 import com.habitrpg.wearos.habitica.ui.viewmodels.LoginViewModel
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -72,7 +73,7 @@ class LoginActivity: BaseActivity<ActivityLoginBinding, LoginViewModel>() {
             startMainActivity()
         }
 
-        binding.signInOnPhoneButton.setOnClickListener { openRegisterOnPhone() }
+        binding.signInOnPhoneButton.setOnClickListener { openLoginOnPhone() }
         binding.otherButton.setOnClickListener { currentState = State.OTHER }
         binding.usernamePasswordButton.setOnClickListener { currentState = State.INPUT }
 
@@ -86,7 +87,11 @@ class LoginActivity: BaseActivity<ActivityLoginBinding, LoginViewModel>() {
     }
 
     private fun openRegisterOnPhone() {
-        openRemoteActivity("/show/register")
+        openRemoteActivity(DeviceCommunication.SHOW_REGISTER)
+    }
+
+    private fun openLoginOnPhone() {
+        openRemoteActivity(DeviceCommunication.SHOW_LOGIN)
     }
 
     private fun loginLocal() {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt
index d4206d6c0..8cf2b9868 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt
@@ -7,6 +7,7 @@ import androidx.core.view.isVisible
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ActivityRyaBinding
 import com.habitrpg.android.habitica.databinding.RowDailyBinding
+import com.habitrpg.common.habitica.helpers.DeviceCommunication
 import com.habitrpg.wearos.habitica.models.tasks.Task
 import com.habitrpg.wearos.habitica.ui.viewHolders.tasks.DailyViewHolder
 import com.habitrpg.wearos.habitica.ui.viewmodels.RYAViewModel
@@ -34,7 +35,7 @@ class RYAActivity : BaseActivity<ActivityRyaBinding, RYAViewModel>() {
         }
 
         binding.phoneButton.setOnClickListener {
-            openRemoteActivity("/show/rya")
+            openRemoteActivity(DeviceCommunication.SHOW_RYA)
         }
 
         binding.startDayButton.setOnClickListener {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/StatsActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/StatsActivity.kt
index f7f5a1028..b0b57737d 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/StatsActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/StatsActivity.kt
@@ -63,9 +63,10 @@ class StatsActivity : BaseActivity<ActivityStatsBinding, StatsViewModel>() {
     }
 
     private fun updateStats(user: User) {
-        val stats = user.stats
-        stats?.let { updateBarViews(it) }
-        stats?.let { updateStatViews(it) }
+        user.stats?.let {
+            updateBarViews(it)
+            updateStatViews(it)
+        }
     }
 
     private fun updateBarViews(stats: Stats) {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ContinuePhoneViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ContinuePhoneViewModel.kt
new file mode 100644
index 000000000..4ddd9c3c1
--- /dev/null
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ContinuePhoneViewModel.kt
@@ -0,0 +1,18 @@
+package com.habitrpg.wearos.habitica.ui.viewmodels
+
+import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
+import com.habitrpg.wearos.habitica.data.repositories.UserRepository
+import com.habitrpg.wearos.habitica.managers.LoadingManager
+import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+@HiltViewModel
+class ContinuePhoneViewModel @Inject constructor(
+    userRepository: UserRepository,
+    taskRepository: TaskRepository,
+    exceptionBuilder: ExceptionHandlerBuilder,
+    loadingManager: LoadingManager
+) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, loadingManager) {
+
+}
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt
index fd7c77694..d7a22e161 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt
@@ -33,14 +33,11 @@ import kotlinx.coroutines.launch
 import java.io.IOException
 import javax.inject.Inject
 
-
-
-
 @HiltViewModel
 class LoginViewModel @Inject constructor(userRepository: UserRepository,
     taskRepository: TaskRepository,
     exceptionBuilder: ExceptionHandlerBuilder,
-    val keyHelper: KeyHelper?,
+    private val keyHelper: KeyHelper?,
     val sharedPreferences: SharedPreferences,
     val apiClient: ApiClient, loadingManager: LoadingManager
 ) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, loadingManager) {
@@ -120,7 +117,8 @@ class LoginViewModel @Inject constructor(userRepository: UserRepository,
             saveTokens(userAuthResponse.apiToken, userAuthResponse.id)
         } catch (e: Exception) {
         }
-        userRepository.retrieveUser()
+        val user = userRepository.retrieveUser()
+        taskRepository.retrieveTasks(user?.tasksOrder)
         onLoginCompleted()
     }
 
diff --git a/wearos/src/main/res/layout/activity_continue_phone.xml b/wearos/src/main/res/layout/activity_continue_phone.xml
new file mode 100644
index 000000000..d5f49ab77
--- /dev/null
+++ b/wearos/src/main/res/layout/activity_continue_phone.xml
@@ -0,0 +1,23 @@
+<?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:gravity="center"
+    android:layout_gravity="center">
+    <ImageView
+        android:id="@+id/icon_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/handoff"
+        android:layout_marginBottom="12dp"
+        />
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/continue_on_your_phone"
+        style="@style/Text.SubHeader1"
+        android:gravity="center"
+        android:textColor="@color/watch_white"
+        android:layout_marginHorizontal="36dp"/>
+</LinearLayout>
diff --git a/wearos/src/main/res/values/strings.xml b/wearos/src/main/res/values/strings.xml
index 966733d94..b35ef0c0f 100644
--- a/wearos/src/main/res/values/strings.xml
+++ b/wearos/src/main/res/values/strings.xml
@@ -35,4 +35,5 @@
     <string name="an_egg">an Egg</string>
     <string name="a_potion">a Potion</string>
     <string name="some_food">Some Food</string>
+    <string name="continue_on_your_phone">Continue on your phone</string>
 </resources>
\ No newline at end of file

From 277ffe16261d69a96c40a9b9bba7a14dabd4aaf0 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 5 Jul 2022 15:15:29 +0200
Subject: [PATCH 09/39] Improve button style

---
 .../habitica/ui/activities/ContinuePhoneActivity.kt |  2 +-
 wearos/src/main/res/layout/activity_login.xml       | 13 +++++++------
 wearos/src/main/res/layout/activity_rya.xml         |  4 +---
 wearos/src/main/res/layout/activity_task_detail.xml |  2 +-
 wearos/src/main/res/layout/activity_task_form.xml   |  6 ++----
 wearos/src/main/res/layout/logout_layout.xml        |  4 ++--
 wearos/src/main/res/values/styles.xml               | 13 +++++++++++--
 7 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/ContinuePhoneActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/ContinuePhoneActivity.kt
index 210f10b56..1011af0b6 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/ContinuePhoneActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/ContinuePhoneActivity.kt
@@ -44,7 +44,7 @@ class ContinuePhoneActivity : BaseActivity<ActivityContinuePhoneBinding, Continu
         val set = AnimationSet(true)
         set.interpolator = AnticipateOvershootInterpolator()
         set.duration = 600
-        set.startOffset = 200
+        set.startOffset = 100
         set.fillBefore = true
         set.fillAfter = true
         set.addAnimation(alphaAnimation)
diff --git a/wearos/src/main/res/layout/activity_login.xml b/wearos/src/main/res/layout/activity_login.xml
index f717b4dc3..b764ba9e3 100644
--- a/wearos/src/main/res/layout/activity_login.xml
+++ b/wearos/src/main/res/layout/activity_login.xml
@@ -37,7 +37,7 @@
                 android:id="@+id/sign_in_on_phone_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/ChipButton"
+                style="@style/ChipButton.Icon"
                 android:text="@string/sign_in_on_phone"
                 android:drawableStart="@drawable/handoff"
                 android:layout_marginBottom="@dimen/spacing_small"/>
@@ -45,7 +45,7 @@
                 android:id="@+id/other_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/ChipButton"
+                style="@style/ChipButton.Icon"
                 android:drawableStart="@drawable/ic_keyboard"
                 android:text="@string/other_options"/>
 
@@ -57,7 +57,7 @@
                 android:drawableStart="@drawable/google_icon"
                 android:text="@string/login_btn_google"
                 android:layout_marginBottom="@dimen/spacing_small"
-                style="@style/ChipButton"/>
+                style="@style/ChipButton.Icon"/>
             <Button
                 android:id="@+id/username_password_button"
                 android:layout_width="match_parent"
@@ -65,14 +65,14 @@
                 android:text="@string/sign_in_password"
                 android:layout_marginBottom="@dimen/spacing_small"
                 android:drawableStart="@drawable/ic_keyboard"
-                style="@style/ChipButton"/>
+                style="@style/ChipButton.Icon"/>
             <Button
                 android:id="@+id/register_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/create_account"
                 android:drawableStart="@drawable/handoff"
-                style="@style/ChipButton"/>
+                style="@style/ChipButton.Icon"/>
 
             <EditText
                 android:id="@+id/username_edit_text"
@@ -105,6 +105,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/sign_in"
-                style="@style/ChipButton.Purple"/>
+                style="@style/ChipButton.Purple"
+                android:textSize="16sp"/>
         </LinearLayout>
 </com.habitrpg.wearos.habitica.ui.views.HabiticaScrollView>
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/activity_rya.xml b/wearos/src/main/res/layout/activity_rya.xml
index d194aa98d..5165ad853 100644
--- a/wearos/src/main/res/layout/activity_rya.xml
+++ b/wearos/src/main/res/layout/activity_rya.xml
@@ -34,7 +34,6 @@
             android:layout_height="wrap_content"
             android:text="@string/review_dailies"
             style="@style/ChipButton.Purple"
-            android:gravity="center"
             android:layout_marginBottom="@dimen/spacing_small"/>
         <Button
             android:id="@+id/phone_button"
@@ -42,7 +41,7 @@
             android:layout_height="wrap_content"
             android:text="@string/check_on_phone"
             android:drawableStart="@drawable/handoff"
-            style="@style/ChipButton"
+            style="@style/ChipButton.Icon"
             android:gravity="center"/>
 
         <LinearLayout
@@ -58,7 +57,6 @@
             style="@style/ChipButton.Purple"
             android:text="@string/start_new_day"
             android:layout_marginTop="2dp"
-            android:gravity="center"
             android:visibility="gone"/>
         <TextView
             android:layout_width="match_parent"
diff --git a/wearos/src/main/res/layout/activity_task_detail.xml b/wearos/src/main/res/layout/activity_task_detail.xml
index 3093f88f8..7d23a7d78 100644
--- a/wearos/src/main/res/layout/activity_task_detail.xml
+++ b/wearos/src/main/res/layout/activity_task_detail.xml
@@ -45,7 +45,7 @@
                 android:id="@+id/edit_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/ChipButton"
+                style="@style/ChipButton.Icon"
                 android:drawableStart="@drawable/handoff"
                 android:text="@string/edit_on_phone"
                 android:layout_marginTop="12dp"/>
diff --git a/wearos/src/main/res/layout/activity_task_form.xml b/wearos/src/main/res/layout/activity_task_form.xml
index 2e6172b55..f730f5594 100644
--- a/wearos/src/main/res/layout/activity_task_form.xml
+++ b/wearos/src/main/res/layout/activity_task_form.xml
@@ -39,9 +39,8 @@
                     android:id="@+id/save_button"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/ChipButton"
+                    style="@style/ChipButton.Icon"
                     android:text="@string/save"
-                    android:gravity="start|center_vertical"
                     android:layout_marginTop="20dp"
                     android:layout_marginBottom="4dp"
                     android:drawableStart="@drawable/save"/>
@@ -49,8 +48,7 @@
                     android:id="@+id/edit_button"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/ChipButton"
-                    android:gravity="start|center_vertical"
+                    style="@style/ChipButton.Icon"
                     android:text="@string/action_edit"
                     android:drawableStart="@drawable/edit"/>
             </LinearLayout>
diff --git a/wearos/src/main/res/layout/logout_layout.xml b/wearos/src/main/res/layout/logout_layout.xml
index bc003b454..4dbbfdb96 100644
--- a/wearos/src/main/res/layout/logout_layout.xml
+++ b/wearos/src/main/res/layout/logout_layout.xml
@@ -22,7 +22,7 @@
 
         <Button
             android:id="@+id/logout_button"
-            style="@style/ChipButton"
+            style="@style/ChipButton.Icon"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/spacing_small"
@@ -31,7 +31,7 @@
 
         <Button
             android:id="@+id/cancel_button"
-            style="@style/ChipButton"
+            style="@style/ChipButton.Icon"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:drawableStart="@drawable/cancel"
diff --git a/wearos/src/main/res/values/styles.xml b/wearos/src/main/res/values/styles.xml
index fc67faee8..6bdc4a7d2 100644
--- a/wearos/src/main/res/values/styles.xml
+++ b/wearos/src/main/res/values/styles.xml
@@ -25,19 +25,28 @@
         <item name="android:textSize">14sp</item>
         <item name="android:textColor">@color/watch_white</item>
         <item name="fontFamily">sans-serif-medium</item>
-        <item name="android:gravity">start|center_vertical</item>
+        <item name="android:gravity">center</item>
         <item name="android:minHeight">52dp</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:letterSpacing">0.01</item>
-        <item name="android:drawablePadding">8dp</item>
         <item name="android:foreground">@drawable/touch_feedback</item>
     </style>
 
+    <style name="ChipButton.Icon" parent="ChipButton">
+        <item name="android:gravity">start|center_vertical</item>
+        <item name="android:drawablePadding">8dp</item>
+    </style>
+
     <style name="ChipButton.Small" parent="ChipButton">
         <item name="android:textSize">14sp</item>
         <item name="android:minHeight">32dp</item>
     </style>
 
+    <style name="ChipButton.Icon.Purple" parent="ChipButton.Icon">
+        <item name="android:backgroundTint">@color/watch_purple_100</item>
+        <item name="android:textColor">@color/watch_black</item>
+    </style>
+
     <style name="ChipButton.Purple" parent="ChipButton">
         <item name="android:backgroundTint">@color/watch_purple_100</item>
         <item name="android:textColor">@color/watch_black</item>

From fa47696d4e0cecfceacc7348b1d0ba4432334c32 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 5 Jul 2022 15:15:43 +0200
Subject: [PATCH 10/39] fix opening activities

---
 Habitica/res/values/wear.xml                                     | 1 +
 .../android/habitica/receivers/DeviceCommunicationService.kt     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Habitica/res/values/wear.xml b/Habitica/res/values/wear.xml
index c2aa69a99..07ccda727 100644
--- a/Habitica/res/values/wear.xml
+++ b/Habitica/res/values/wear.xml
@@ -3,5 +3,6 @@
     tools:keep="@array/android_wear_capabilities">
     <string-array name="android_wear_capabilities">
         <item>edit_task</item>
+        <item>open_activity</item>
     </string-array>
 </resources>
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/DeviceCommunicationService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/DeviceCommunicationService.kt
index c8c14712e..a3e2eb3fe 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/DeviceCommunicationService.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/DeviceCommunicationService.kt
@@ -35,6 +35,7 @@ class DeviceCommunicationService : WearableListenerService() {
 
     private fun openActivity(activityClass: Class<*>) {
         val intent = Intent(this, activityClass)
+        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
         startActivity(intent)
     }
 

From 43297a033de1e73dd23fc02aaeab0c08f6f93952 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 5 Jul 2022 15:15:59 +0200
Subject: [PATCH 11/39] fix google sign in

---
 wearos/build.gradle                                 |  8 +++++---
 .../wearos/habitica/ui/viewmodels/LoginViewModel.kt | 13 +++++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/wearos/build.gradle b/wearos/build.gradle
index b54f9b232..331475135 100644
--- a/wearos/build.gradle
+++ b/wearos/build.gradle
@@ -18,6 +18,10 @@ android {
         buildConfigField "String", "TESTING_LEVEL", "\"production\""
     }
 
+    signingConfigs {
+        release
+    }
+
     buildTypes {
         debug {
             minifyEnabled false
@@ -28,15 +32,13 @@ android {
             resValue "string", "app_name", "Habitica Debug"
         }
         release {
+            signingConfig signingConfigs.release
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             resValue "string", "app_name", "Habitica"
         }
     }
 
-    signingConfigs {
-        release
-    }
     flavorDimensions "buildType"
 
     productFlavors {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt
index d7a22e161..6e3739759 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt
@@ -7,6 +7,7 @@ import androidx.activity.result.ActivityResultLauncher
 import androidx.core.content.edit
 import androidx.lifecycle.viewModelScope
 import com.google.android.gms.auth.GoogleAuthException
+import com.google.android.gms.auth.GoogleAuthUtil
 import com.google.android.gms.auth.GooglePlayServicesAvailabilityException
 import com.google.android.gms.auth.UserRecoverableAuthException
 import com.google.android.gms.auth.api.signin.GoogleSignIn
@@ -14,6 +15,7 @@ import com.google.android.gms.auth.api.signin.GoogleSignInAccount
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions
 import com.google.android.gms.common.GoogleApiAvailability
 import com.google.android.gms.common.GooglePlayServicesUtil
+import com.google.android.gms.common.Scopes
 import com.google.android.gms.common.UserRecoverableException
 import com.google.android.gms.common.api.ApiException
 import com.google.android.gms.tasks.Task
@@ -28,8 +30,10 @@ import com.habitrpg.wearos.habitica.data.repositories.UserRepository
 import com.habitrpg.wearos.habitica.managers.LoadingManager
 import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.io.IOException
 import javax.inject.Inject
 
@@ -76,11 +80,16 @@ class LoginViewModel @Inject constructor(userRepository: UserRepository,
                     return@async null
                 }
             }.await()
+            val scopesString = Scopes.PROFILE + " " + Scopes.EMAIL
+            val scopes = "oauth2:$scopesString"
+            val token = withContext(Dispatchers.IO) {
+                account?.account?.let { GoogleAuthUtil.getToken(activity, it, scopes) }
+            }
             val auth = UserAuthSocial()
             auth.network = "google"
             auth.authResponse = UserAuthSocialTokens()
-            auth.authResponse?.client_id = account?.id
-            auth.authResponse?.access_token = account?.idToken
+            auth.authResponse?.client_id = account?.email
+            auth.authResponse?.access_token = token
             val response = apiClient.loginSocial(auth)
             handleAuthResponse(response)
         }

From d526fdd8a161c06123e378ada10892481f021ff9 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 5 Jul 2022 17:14:02 +0200
Subject: [PATCH 12/39] Implement levelup activity

---
 Habitica/build.gradle                         |   8 +-
 .../habitica/ui/AvatarWithBarsViewModel.kt    |   2 +-
 .../habitica/ui/activities/ArmoireActivity.kt |   2 +-
 .../habitica/ui/activities/DeathActivity.kt   |   2 +-
 .../inventory/PetDetailRecyclerAdapter.kt     |   2 +-
 build.gradle                                  |   2 +-
 common/build.gradle                           |   1 +
 .../libs/LeonidsLib-1.3.2.jar                 | Bin
 .../common}/habitica/helpers/Animations.kt    |   2 +-
 common/src/main/res/values/strings.xml        |   1 +
 wearos/build.gradle                           |   9 +++
 wearos/src/main/AndroidManifest.xml           |   1 +
 .../habitica/ui/activities/FaintActivity.kt   |   2 +
 .../habitica/ui/activities/LevelupActivity.kt |  72 ++++++++++++++++++
 .../ui/activities/TaskResultActivity.kt       |   7 ++
 .../ui/viewmodels/LevelupViewModel.kt         |  22 ++++++
 .../res/drawable-mdpi/experience_large.png    | Bin 0 -> 873 bytes
 .../res/drawable-xhdpi/experience_large.png   | Bin 0 -> 1471 bytes
 .../res/drawable-xxhdpi/experience_large.png  | Bin 0 -> 2003 bytes
 .../src/main/res/drawable/confetti_blue.xml   |   6 ++
 .../src/main/res/drawable/confetti_purple.xml |   6 ++
 wearos/src/main/res/drawable/confetti_red.xml |   6 ++
 .../src/main/res/drawable/confetti_yellow.xml |   6 ++
 wearos/src/main/res/layout/activity_faint.xml |   7 +-
 .../res/layout/activity_habit_direction.xml   |   6 +-
 .../src/main/res/layout/activity_levelup.xml  |  55 +++++++++++++
 wearos/src/main/res/layout/activity_rya.xml   |   3 +-
 .../src/main/res/layout/task_reward_chip.xml  |   3 +-
 .../src/main/res/layout/task_reward_drop.xml  |   3 +-
 wearos/src/main/res/values/strings.xml        |   1 +
 wearos/src/main/res/values/styles.xml         |   9 ++-
 31 files changed, 226 insertions(+), 20 deletions(-)
 rename {Habitica => common}/libs/LeonidsLib-1.3.2.jar (100%)
 rename {Habitica/src/main/java/com/habitrpg/android => common/src/main/java/com/habitrpg/common}/habitica/helpers/Animations.kt (98%)
 create mode 100644 wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/LevelupActivity.kt
 create mode 100644 wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LevelupViewModel.kt
 create mode 100644 wearos/src/main/res/drawable-mdpi/experience_large.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/experience_large.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/experience_large.png
 create mode 100644 wearos/src/main/res/drawable/confetti_blue.xml
 create mode 100644 wearos/src/main/res/drawable/confetti_purple.xml
 create mode 100644 wearos/src/main/res/drawable/confetti_red.xml
 create mode 100644 wearos/src/main/res/drawable/confetti_yellow.xml
 create mode 100644 wearos/src/main/res/layout/activity_levelup.xml

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 93ac09aa7..372b493aa 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -26,7 +26,6 @@ configurations {
 }
 
 dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
     //Networking
     implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
     implementation "com.squareup.okhttp3:logging-interceptor:$okhttp_version"
@@ -215,6 +214,13 @@ android {
             dimension "buildType"
             buildConfigField "String", "TESTING_LEVEL", "\"staff\""
             resValue "string", "app_name", "Habitica Staff"
+            versionCode app_version_code + 8
+        }
+
+        partners {
+            dimension "buildType"
+            buildConfigField "String", "TESTING_LEVEL", "\"partners\""
+            resValue "string", "app_name", "Habitica"
             versionCode app_version_code + 6
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt
index aeccc8dcb..f94d0cdfb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt
@@ -10,7 +10,7 @@ import androidx.core.os.bundleOf
 import androidx.lifecycle.ViewModel
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.AvatarWithBarsBinding
-import com.habitrpg.android.habitica.helpers.Animations
+import com.habitrpg.common.habitica.helpers.Animations
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
index 9df8bf29a..f98d13c19 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
@@ -18,7 +18,7 @@ import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.android.habitica.extensions.observeOnce
 import com.habitrpg.android.habitica.helpers.AdHandler
 import com.habitrpg.android.habitica.helpers.AdType
-import com.habitrpg.android.habitica.helpers.Animations
+import com.habitrpg.common.habitica.helpers.Animations
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.common.habitica.extensions.loadImage
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt
index 3f283f8b0..e1487ef8b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt
@@ -14,7 +14,7 @@ import com.habitrpg.android.habitica.extensions.fromHtml
 import com.habitrpg.android.habitica.extensions.observeOnce
 import com.habitrpg.android.habitica.helpers.AdHandler
 import com.habitrpg.android.habitica.helpers.AdType
-import com.habitrpg.android.habitica.helpers.Animations
+import com.habitrpg.common.habitica.helpers.Animations
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt
index ca6c57903..f06af2b9f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt
@@ -5,7 +5,7 @@ import android.view.ViewGroup
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.CanHatchItemBinding
 import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.android.habitica.helpers.Animations
+import com.habitrpg.common.habitica.helpers.Animations
 import com.habitrpg.android.habitica.models.inventory.Animal
 import com.habitrpg.android.habitica.models.inventory.Egg
 import com.habitrpg.android.habitica.models.inventory.Food
diff --git a/build.gradle b/build.gradle
index 3f48048c6..52878da1e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         kotlin_version = '1.7.0'
         core_ktx_version = '1.8.0'
         appcompat_version = '1.4.2'
-        lifecycle_version = '2.4.1'
+        lifecycle_version = '2.5.0'
         coroutines_version = '1.6.1'
         okhttp_version = '4.9.3'
         retrofit_version = '2.9.0'
diff --git a/common/build.gradle b/common/build.gradle
index 1b1269e5b..c566aea07 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -36,6 +36,7 @@ android {
 }
 
 dependencies {
+    implementation fileTree(include: ['*.jar'], dir: '../common/libs')
 
     implementation "androidx.core:core-ktx:$core_ktx_version"
     implementation "androidx.appcompat:appcompat:$appcompat_version"
diff --git a/Habitica/libs/LeonidsLib-1.3.2.jar b/common/libs/LeonidsLib-1.3.2.jar
similarity index 100%
rename from Habitica/libs/LeonidsLib-1.3.2.jar
rename to common/libs/LeonidsLib-1.3.2.jar
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/Animations.kt b/common/src/main/java/com/habitrpg/common/habitica/helpers/Animations.kt
similarity index 98%
rename from Habitica/src/main/java/com/habitrpg/android/habitica/helpers/Animations.kt
rename to common/src/main/java/com/habitrpg/common/habitica/helpers/Animations.kt
index 01e62ec96..2c0392f36 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/Animations.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/helpers/Animations.kt
@@ -1,4 +1,4 @@
-package com.habitrpg.android.habitica.helpers
+package com.habitrpg.common.habitica.helpers
 
 import android.view.View
 import android.view.ViewAnimationUtils
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 4739dc3e2..0619d050a 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -28,6 +28,7 @@
     <string name="new_task">New Task</string>
     <string name="avatar">Avatar</string>
     <string name="user_level">Lvl. %d</string>
+    <string name="user_level_long">Level %d</string>
 
     <string name="action_edit">Edit</string>
     <string name="action_cancel">Cancel</string>
diff --git a/wearos/build.gradle b/wearos/build.gradle
index 331475135..61a77bec1 100644
--- a/wearos/build.gradle
+++ b/wearos/build.gradle
@@ -50,6 +50,13 @@ android {
             dimension "buildType"
             buildConfigField "String", "TESTING_LEVEL", "\"staff\""
             resValue "string", "app_name", "Habitica Staff"
+            versionCode app_version_code + 9
+        }
+
+        partners {
+            dimension "buildType"
+            buildConfigField "String", "TESTING_LEVEL", "\"partners\""
+            resValue "string", "app_name", "Habitica"
             versionCode app_version_code + 7
         }
 
@@ -79,6 +86,8 @@ android {
 }
 
 dependencies {
+    implementation fileTree(include: ['*.jar'], dir: '../common/libs')
+
     implementation "androidx.core:core-ktx:$core_ktx_version"
     implementation "com.google.android.gms:play-services-wearable:$play_wearables_version"
     implementation "androidx.recyclerview:recyclerview:$recyclerview_version"
diff --git a/wearos/src/main/AndroidManifest.xml b/wearos/src/main/AndroidManifest.xml
index 6e8ac7642..795289991 100644
--- a/wearos/src/main/AndroidManifest.xml
+++ b/wearos/src/main/AndroidManifest.xml
@@ -49,6 +49,7 @@
 
         <activity android:name="com.habitrpg.wearos.habitica.ui.activities.SettingsActivity" />
         <activity android:name="com.habitrpg.wearos.habitica.ui.activities.ContinuePhoneActivity" />
+        <activity android:name="com.habitrpg.wearos.habitica.ui.activities.LevelupActivity" />
 
         <activity android:name="androidx.wear.activity.ConfirmationActivity" />
     </application>
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/FaintActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/FaintActivity.kt
index 0f1ad2d6b..bc3b2668d 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/FaintActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/FaintActivity.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import androidx.activity.viewModels
 import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.databinding.ActivityFaintBinding
+import com.habitrpg.common.habitica.helpers.Animations
 import com.habitrpg.wearos.habitica.ui.viewmodels.FaintViewModel
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineExceptionHandler
@@ -28,6 +29,7 @@ class FaintActivity: BaseActivity<ActivityFaintBinding, FaintViewModel>() {
             }
         }
 
+        binding.iconView.startAnimation(Animations.bobbingAnimation(4f))
         binding.hpBar.setPercentageValues(0f, 50f)
     }
 
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/LevelupActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/LevelupActivity.kt
new file mode 100644
index 000000000..150424de2
--- /dev/null
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/LevelupActivity.kt
@@ -0,0 +1,72 @@
+package com.habitrpg.wearos.habitica.ui.activities
+
+import android.os.Bundle
+import android.view.Gravity
+import android.view.animation.AccelerateInterpolator
+import android.widget.FrameLayout
+import androidx.activity.viewModels
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.ActivityLevelupBinding
+import com.habitrpg.common.habitica.helpers.Animations
+import com.habitrpg.wearos.habitica.ui.viewmodels.LevelupViewModel
+import com.plattysoft.leonids.ParticleSystem
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.launch
+
+@AndroidEntryPoint
+class LevelupActivity: BaseActivity<ActivityLevelupBinding, LevelupViewModel>() {
+    override val viewModel: LevelupViewModel by viewModels()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        binding = ActivityLevelupBinding.inflate(layoutInflater)
+        super.onCreate(savedInstanceState)
+        binding.continueButton.setOnClickListener {
+            binding.continueButton.isEnabled = false
+            startAnimatingProgress()
+            lifecycleScope.launch(CoroutineExceptionHandler { _, _ ->
+                stopAnimatingProgress()
+                binding.continueButton.isEnabled = true
+            }) {
+                finish()
+            }
+        }
+
+        viewModel.level.observe(this) {
+            binding.titleView.text = getString(R.string.user_level_long, it)
+        }
+
+        binding.iconView.startAnimation(Animations.bobbingAnimation(4f))
+        binding.expBar.setPercentageValues(100f, 100f)
+        val container = binding.confettiAnchor
+        container.postDelayed(
+            {
+                createParticles(container, R.drawable.confetti_blue)
+                createParticles(container, R.drawable.confetti_red)
+                createParticles(container, R.drawable.confetti_yellow)
+                createParticles(container, R.drawable.confetti_purple)
+            }, 500
+        )
+    }
+
+    private fun createParticles(container: FrameLayout, resource: Int) {
+        ParticleSystem(
+            container,
+            20,
+            ContextCompat.getDrawable(this, resource),
+            6000
+        )
+            .setRotationSpeed(144f)
+            .setScaleRange(1.0f, 1.6f)
+            .setSpeedByComponentsRange(-0.15f, 0.15f, 0.15f, 0.45f)
+            .setFadeOut(200, AccelerateInterpolator())
+            .emitWithGravity(binding.confettiAnchor, Gravity.TOP, 10, 2000)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        binding.expBar.animateProgress(0f, 2000)
+    }
+}
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt
index 080ab510d..09cb8d823 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt
@@ -49,6 +49,13 @@ class TaskResultActivity : BaseActivity<ActivityTaskResultBinding, TaskResultVie
         }
     }
 
+    override fun finish() {
+        if (viewModel.result?.hasLeveledUp == true) {
+            startActivity(Intent(parent, LevelupActivity::class.java))
+        }
+        super.finish()
+    }
+
     private fun makeChips() {
         binding.gridLayout.removeAllViews()
         var chips = mutableListOf<TaskRewardChip>()
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LevelupViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LevelupViewModel.kt
new file mode 100644
index 000000000..bc591ef91
--- /dev/null
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LevelupViewModel.kt
@@ -0,0 +1,22 @@
+package com.habitrpg.wearos.habitica.ui.viewmodels
+
+import androidx.lifecycle.asLiveData
+import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
+import com.habitrpg.wearos.habitica.data.repositories.UserRepository
+import com.habitrpg.wearos.habitica.managers.LoadingManager
+import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.map
+import javax.inject.Inject
+
+@HiltViewModel
+class LevelupViewModel @Inject constructor(
+    userRepository: UserRepository,
+    taskRepository: TaskRepository,
+    exceptionBuilder: ExceptionHandlerBuilder,
+    loadingManager: LoadingManager
+) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, loadingManager) {
+    val level = userRepository.getUser()
+        .map { it.stats?.lvl }
+        .asLiveData()
+}
diff --git a/wearos/src/main/res/drawable-mdpi/experience_large.png b/wearos/src/main/res/drawable-mdpi/experience_large.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b7465ddf5e3faab5f86b5fce13cbfd2af9f86e6
GIT binary patch
literal 873
zcmV-v1D5=WP)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0{%%vK~#7F&6rJ3
z6G0rtpJCgk0)=uYX+W_82jt?(7%!%N0uP=%c;J%=AH;AV$i<_csoqFDX$%L2R10b-
zk-pj&x*ca`yW8z<i=7t}o@BGTv(w#QelzpmbOA%5d&@6yokDjqS^8>)(w)^T3}gZ(
z60sah5o*MiHWar6imY>jtO;BCrd&(jxxOter~yk}qrNRYQ$b5!yPhp&sF0=Py6>W%
zEp=0VOH((2xiug<<GZeIO9?7uY5sw;pI-EJQn#gMDrjk{2g6Mnuq6#O(vlkkwxpm0
zkTtRGHTW&L3EHygw)mYy$T*$EP5F=oYto&kgHUG&&i=9jTpR|UltahfBG2<V=s=Bx
z;hDY-WS%(3u^GqOw>LnuD4Oi^Pq4awhCT70a6}qL04zE~<PP6luSQjmfFJMCEEU*x
z!fpY?BZTdV6dX~4@h5d3NIwMHRWWR><F{z!_XoPj!VzVdc#0Xi3*1OKeJIeWo}kkx
zqg!M9UkB*2a}_v3cb7Lo$nbi?hb6fdZWk4NeW1y1l|i{Jf7|Ih(DHHU=MlTYwkn2(
z(yg8;R!exH8)k|F@LCjH`tIb8CD^c4(Yz>#=J?bs&?q{quQ%zvuzsjBd+kaXMwlYZ
z)Yn{KPAR~l%U0qNn)R~StkOp$A}uADe$$YQ4aXl;KLr*Zp=rlZ`}rBQ!`Dd8FCm$_
zB@NTRbVaU&<8^8>?Hsd7-<-XN^A9i4sW_8+A(cQ34Jnv@moYLDj!*VzLL64wQT+ar
za~NX;=~+t}rr%W}0?z8PcOS`!23{t3Szsxh6;LXE7su(Og?QAvbsjd^7zf6U)C*bM
z*q+$%8u&Zza&T#LOFkgT0!c%8V0<Xt)CLP=a?*E8)=w5l2}*>`4e!`zD`d&v?|(y$
zvSq@OGL%TbRvc9$mUyIAUodoUWq)W5<CdNsJ%(cR{)~>Yp<#(f%M?$@mZl{h{SO>L
zE1H&!h1(Jz&A2rKG4s*PwR2r8xuLtOn=q8WUhHzBTxSOP00000NkvXXu0mjf04szh

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/experience_large.png b/wearos/src/main/res/drawable-xhdpi/experience_large.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f122296a9dea52e41b9e6c4e4c981f24c924100
GIT binary patch
literal 1471
zcmV;w1wi_VP)<h;3K|Lk000e1NJLTq002q=002q|1^@s69MHmX00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1yo5yK~#7F&74hd
z8$}$4{~Oz>lQ<!Xk{+5+5J5<Afdk@*g2b0V2&sIMiZ4QuD%1;~pqEBS9C9e)Ld&74
zsuF0`RDDSk*ReO*&TqZ5yY{}#taoPqj}*z>H+!ExJKkM8A!0^w^TXZX=Eu9lj5cwj
z-MTJx;n5y3VvZPrnuMe9hg(&wM2%~bkAv&P2sWbPn&Jt(s^U{rx~6y<pQ>1h%G4Ck
z;8PWkqVj5r=kch@xv0XL;stnA<-Vx0n&M^LSLIYxWliyd?yGWJluAwUvTmz#CQ7-c
zcm=mrxhqPirg$B9RXGt=TGQHRM4gp_72Q?krl_)-Hoqe3ZBg;MZmO~_s<Ni}m2pwb
zs<K~HRZS9RRaq6KRFi~RRd$O~tx3YDDr=&&YLYOj%3e{rHA$FMWkpo2nj}oBvQt#u
znj{RWGA=5(wR5d@O_HjreihGQ7-OQs4>E7<+z~r+qi`XWnj~dad2|EM6&~V-@Tg(J
z7mGu!>dpXa+WIy-y>*G`=q{0enw|IZKGEoyO7X-8r~dg*-VcxVs6iSNr7TGD$+i5$
zZsjAQ{(nUO|DK%(Nsy&N!@_13r7Z}Q)wJ;i(P<=VaFks}rK&Uy39CIu#bZ#bbw^7Q
zDq6alKW`~D4y}KhyT}<W(9jP^8N4>}8fP8Dw2P`$5C{crCGTEK+mm82e=U-OqQF#D
zgIE8GpTqF+oOtEkjz{xt&0VNjnDVnUCMZo>R(PtgJbo-iK~gkUr6r}YC9HDmMg*mS
ztc}mbAik4KlcInSHF)}GuB0@kg%y53YC@34kf1C`a(*V3T`rvM_jYL1dO%fNh}YO3
z1~eE2dcwwI7{=RDVVSKNFG$ke9FIv0o5}i}$wSW{9Fza{b@=$=<dFQQ`*iW<P-*i`
z7Zz{DnV{)yL6#7emXzlF#Xa($>{BpQJ4I+pm}gB;dr@4ne3>t3YP<gNVXmY!wuQCF
z!<5b-6oEk)*J|^MqHr>a>$Pr$sL>noy2LoM_I~+t-LCjg3i2;?3bsq9;;<cRoUF#Q
z(}$k8uY+3_x@F;Qy(wYX8L=a;o;{}S(tF`ghPOxKv-7;O_B`qe3QO|Dq4!{K{Ld+@
z2@4P1?d04kk^~?MOvrL1D4AS<HDMUDIz92WHi{=nQQ*>iix&C^&IBd1D=;n$J9R!J
zy7F~ADJ`o1@HQ=aC$zd*F=iPOlq{x*5n<Rdc@_>)(YPf=;oa}#{%_&q)yr4&Wf>Nf
zEUrmo!qSoeBt=z8QIG^#k_lOs1SPB0WF}#~55)bF7uk7HRS-3NevkSGw=;{ZU%o;s
zoq;t$$?7vwOIRm$OC?QI6+|8X^)p?ZWo2wE&rz?daT{$$LCIzsLR(n)J*b?EVIk_-
z!@IdPwObx-ueV5vh6E*>YZzr=MOBGQoyY&|*RQEzLCIzfp(L!Jsz-nSk(pLmlOaLL
z<_!~mIO!F9wpUP9o~Y8A0{YSW{@@ofNbL_7R0(&$EBGZve42u{`3g`|p(L?w(~^Ll
z?;eOlqHx|x^^LgIMX%nr8^nsJaNMX_Rb@?v#-wTN6a{Kl#i1r(O;nw#xYPvf6$Lb_
z;!+c^DoUp+PBj6$MFGXCIMoEKi&CkITTQ@zQJ|tKZZ!epmoP;{Ut8SOStqRNyMu4Y
z0d9%{b;@v56L3}((5lK|O~74IK&KFgH36qZ0i~)O*96=a1yo9LToZ6!6ez8VK~2DY
zQJ}0C1~mZ|MS<L^nA8M#6b16iVNw%dQxuq}icw8~Pf;LU5Tlw{68<U%%3=n;zr)G2
Zq<1z&_HPWO^G5&x002ovPDHLkV1m?juxbDR

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/experience_large.png b/wearos/src/main/res/drawable-xxhdpi/experience_large.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3e786a90eb2d6f2fdd74f1cfd383ccb20a0ed98
GIT binary patch
literal 2003
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

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable/confetti_blue.xml b/wearos/src/main/res/drawable/confetti_blue.xml
new file mode 100644
index 000000000..90c3bf076
--- /dev/null
+++ b/wearos/src/main/res/drawable/confetti_blue.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <size android:height="4dp" android:width="8dp" />
+    <solid android:color="@color/watch_blue_100" />
+    <corners android:radius="1dp" />
+</shape>
\ No newline at end of file
diff --git a/wearos/src/main/res/drawable/confetti_purple.xml b/wearos/src/main/res/drawable/confetti_purple.xml
new file mode 100644
index 000000000..959d9a18c
--- /dev/null
+++ b/wearos/src/main/res/drawable/confetti_purple.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <size android:height="4dp" android:width="8dp" />
+    <solid android:color="@color/watch_purple_100" />
+    <corners android:radius="1dp" />
+</shape>
\ No newline at end of file
diff --git a/wearos/src/main/res/drawable/confetti_red.xml b/wearos/src/main/res/drawable/confetti_red.xml
new file mode 100644
index 000000000..417150c8b
--- /dev/null
+++ b/wearos/src/main/res/drawable/confetti_red.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+<size android:height="4dp" android:width="8dp" />
+    <solid android:color="@color/watch_red_100" />
+    <corners android:radius="1dp" />
+</shape>
\ No newline at end of file
diff --git a/wearos/src/main/res/drawable/confetti_yellow.xml b/wearos/src/main/res/drawable/confetti_yellow.xml
new file mode 100644
index 000000000..8d6f38f9e
--- /dev/null
+++ b/wearos/src/main/res/drawable/confetti_yellow.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <size android:height="4dp" android:width="8dp" />
+    <solid android:color="@color/watch_yellow_100" />
+    <corners android:radius="1dp" />
+</shape>
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/activity_faint.xml b/wearos/src/main/res/layout/activity_faint.xml
index eda15d562..388602f45 100644
--- a/wearos/src/main/res/layout/activity_faint.xml
+++ b/wearos/src/main/res/layout/activity_faint.xml
@@ -16,8 +16,10 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:gravity="center"
-        android:layout_gravity="center">
+        android:layout_gravity="center"
+        android:paddingVertical="@dimen/spacing_medium">
         <ImageView
+            android:id="@+id/icon_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/broken_heart"
@@ -35,7 +37,8 @@
             android:layout_height="wrap_content"
             android:text="@string/faint_description"
             android:textColor="@color/watch_gray_500"
-            android:textSize="14sp"
+            style="@style/Text.Body1"
+            android:layout_marginHorizontal="@dimen/spacing_large"
             android:layout_marginBottom="@dimen/spacing_large"
             android:gravity="center"/>
         <Button
diff --git a/wearos/src/main/res/layout/activity_habit_direction.xml b/wearos/src/main/res/layout/activity_habit_direction.xml
index 8b68214f1..f7e18ff58 100644
--- a/wearos/src/main/res/layout/activity_habit_direction.xml
+++ b/wearos/src/main/res/layout/activity_habit_direction.xml
@@ -19,17 +19,15 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/how_did_you_do"
-        android:fontFamily="sans-serif-medium"
         android:gravity="center"
-        android:textSize="14sp"
+        style="@style/Text.Body1"
         android:textColor="@color/watch_gray_200"/>
     <TextView
         android:id="@+id/text_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fontFamily="sans-serif-medium"
         android:gravity="center"
-        android:textSize="16sp"
+        style="@style/Text.SubHeader1"
         android:maxLines="2"
         android:textColor="@color/watch_white"/>
     <Space
diff --git a/wearos/src/main/res/layout/activity_levelup.xml b/wearos/src/main/res/layout/activity_levelup.xml
new file mode 100644
index 000000000..6f3097858
--- /dev/null
+++ b/wearos/src/main/res/layout/activity_levelup.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <FrameLayout
+        android:id="@+id/confetti_anchor"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:paddingVertical="@dimen/spacing_medium">
+        <ImageView
+            android:id="@+id/icon_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/experience_large"
+            android:importantForAccessibility="no"
+            android:layout_marginBottom="@dimen/spacing_medium"/>
+        <TextView
+            android:id="@+id/title_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textColor="@color/watch_white"
+            style="@style/Text.SubHeader1"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/levelup_description"
+            android:textColor="@color/watch_gray_200"
+            style="@style/Text.Body1"
+            android:layout_marginBottom="@dimen/spacing_large"
+            android:layout_marginHorizontal="@dimen/spacing_large"
+            android:gravity="center"/>
+        <Button
+            android:id="@+id/continue_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/continue_text"
+            style="@style/ChipButton.Small.Yellow"/>
+    </LinearLayout>
+    <com.habitrpg.wearos.habitica.ui.views.CircularProgressView
+        android:id="@+id/exp_bar"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:arcFillColor="@color/exp_bar_color"
+        app:backgroundArcColor="@color/bar_background_color"
+        app:offset="4dp" />
+</FrameLayout>
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/activity_rya.xml b/wearos/src/main/res/layout/activity_rya.xml
index 5165ad853..9a996bbaa 100644
--- a/wearos/src/main/res/layout/activity_rya.xml
+++ b/wearos/src/main/res/layout/activity_rya.xml
@@ -12,10 +12,9 @@
             android:id="@+id/title_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="14sp"
             android:textColor="@color/watch_purple_200"
             android:text="@string/day_start"
-            android:fontFamily="sans-serif-medium"
+            style="@style/Text.Body1"
             android:gravity="center"
             android:layout_marginHorizontal="12dp"
             android:layout_marginBottom="10dp"/>
diff --git a/wearos/src/main/res/layout/task_reward_chip.xml b/wearos/src/main/res/layout/task_reward_chip.xml
index aaed9fa64..032739e2e 100644
--- a/wearos/src/main/res/layout/task_reward_chip.xml
+++ b/wearos/src/main/res/layout/task_reward_chip.xml
@@ -9,8 +9,7 @@
     android:id="@+id/text_view"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:fontFamily="sans-serif-medium"
-    android:textSize="16sp"
+    style="@style/Text.SubHeader1"
     android:textColor="@color/watch_black"/>
     <ImageView
         android:id="@+id/icon_view"
diff --git a/wearos/src/main/res/layout/task_reward_drop.xml b/wearos/src/main/res/layout/task_reward_drop.xml
index 93be993e9..7154eb740 100644
--- a/wearos/src/main/res/layout/task_reward_drop.xml
+++ b/wearos/src/main/res/layout/task_reward_drop.xml
@@ -14,8 +14,7 @@
         android:id="@+id/text_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:fontFamily="sans-serif-medium"
-        android:textSize="14sp"
+        style="@style/Text.Body1"
         android:gravity="center"
         android:textColor="@color/watch_white"
         />
diff --git a/wearos/src/main/res/values/strings.xml b/wearos/src/main/res/values/strings.xml
index b35ef0c0f..fdbb2ba62 100644
--- a/wearos/src/main/res/values/strings.xml
+++ b/wearos/src/main/res/values/strings.xml
@@ -36,4 +36,5 @@
     <string name="a_potion">a Potion</string>
     <string name="some_food">Some Food</string>
     <string name="continue_on_your_phone">Continue on your phone</string>
+    <string name="levelup_description">You leveled up through all your hard work!</string>
 </resources>
\ No newline at end of file
diff --git a/wearos/src/main/res/values/styles.xml b/wearos/src/main/res/values/styles.xml
index 6bdc4a7d2..e551a3830 100644
--- a/wearos/src/main/res/values/styles.xml
+++ b/wearos/src/main/res/values/styles.xml
@@ -2,6 +2,7 @@
 <resources>
     <style name="HabiticaAppTheme" parent="@android:style/Theme.DeviceDefault">
         <item name="android:windowBackground">@color/watch_black</item>
+        <item name="fontFamily">sans-serif</item>
     </style>
     <style name="Chip">
         <item name="android:layout_marginVertical">@dimen/row_spacing</item>
@@ -24,7 +25,7 @@
         <item name="android:background">@drawable/row_background</item>
         <item name="android:textSize">14sp</item>
         <item name="android:textColor">@color/watch_white</item>
-        <item name="fontFamily">sans-serif-medium</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:gravity">center</item>
         <item name="android:minHeight">52dp</item>
         <item name="android:textAllCaps">false</item>
@@ -62,6 +63,11 @@
         <item name="android:textColor">@color/watch_black</item>
     </style>
 
+    <style name="ChipButton.Small.Yellow" parent="ChipButton.Small">
+        <item name="android:backgroundTint">@color/watch_yellow_200</item>
+        <item name="android:textColor">@color/watch_black</item>
+    </style>
+
     <style name="Text" />
 
     <style name="Text.SubHeader1">
@@ -75,5 +81,6 @@
     </style>
     <style name="Text.Body2">
         <item name="android:textSize">14sp</item>
+        <item name="android:fontFamily">sans-serif</item>
     </style>
 </resources>
\ No newline at end of file

From 4b65ffc4f06ff4d0c8814a261a88ae1c5c385cc1 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 5 Jul 2022 17:31:03 +0200
Subject: [PATCH 13/39] fix paths

---
 Habitica/build.gradle | 2 +-
 build.gradle          | 2 +-
 common/build.gradle   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 372b493aa..d846d6971 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -26,6 +26,7 @@ configurations {
 }
 
 dependencies {
+    implementation fileTree(include: ['*.jar'], dir: '../common/libs')
     //Networking
     implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
     implementation "com.squareup.okhttp3:logging-interceptor:$okhttp_version"
@@ -128,7 +129,6 @@ dependencies {
     }
     androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-
 }
 
 android {
diff --git a/build.gradle b/build.gradle
index 52878da1e..97a6b9d7c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         core_ktx_version = '1.8.0'
         appcompat_version = '1.4.2'
         lifecycle_version = '2.5.0'
-        coroutines_version = '1.6.1'
+        coroutines_version = '1.6.2'
         okhttp_version = '4.9.3'
         retrofit_version = '2.9.0'
         daggerhilt_version = '2.42'
diff --git a/common/build.gradle b/common/build.gradle
index c566aea07..0a56516b6 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -36,7 +36,7 @@ android {
 }
 
 dependencies {
-    implementation fileTree(include: ['*.jar'], dir: '../common/libs')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
 
     implementation "androidx.core:core-ktx:$core_ktx_version"
     implementation "androidx.appcompat:appcompat:$appcompat_version"

From 1061b19035435f8fa817db4005dba7adefd4b26d Mon Sep 17 00:00:00 2001
From: Hafiz <hafizbhamidi@gmail.com>
Date: Wed, 6 Jul 2022 22:06:41 -0400
Subject: [PATCH 14/39] changed StatValue name -> StatValueView Replace
 authentication buttons (Google sign in, sign in with passsword, create
 account, etc) with TextActionChipView (Icons 14dp left from left edge of
 chip, 24dp icon, text starts 46 dp from left edge of chip)

---
 .../views/{StatValue.kt => StatValueView.kt}  |  2 +-
 .../habitica/ui/views/TextActionChipView.kt   | 27 ++++++++++
 wearos/src/main/res/drawable/ic_keyboard.xml  |  2 +-
 wearos/src/main/res/layout/activity_login.xml | 52 +++++++++----------
 wearos/src/main/res/layout/activity_stats.xml |  6 +--
 .../src/main/res/layout/stat_value_layout.xml |  2 +-
 .../src/main/res/layout/text_action_chip.xml  | 41 +++++++++++++++
 wearos/src/main/res/values/attrs.xml          |  4 ++
 8 files changed, 104 insertions(+), 32 deletions(-)
 rename wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/{StatValue.kt => StatValueView.kt} (97%)
 create mode 100644 wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TextActionChipView.kt
 create mode 100644 wearos/src/main/res/layout/text_action_chip.xml

diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/StatValue.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/StatValueView.kt
similarity index 97%
rename from wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/StatValue.kt
rename to wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/StatValueView.kt
index 6ddd83490..3c874aa35 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/StatValue.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/StatValueView.kt
@@ -9,7 +9,7 @@ import com.habitrpg.android.habitica.databinding.StatValueLayoutBinding
 import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.common.habitica.helpers.NumberAbbreviator
 
-class StatValue @JvmOverloads constructor(
+class StatValueView @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyle: Int = 0
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TextActionChipView.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TextActionChipView.kt
new file mode 100644
index 000000000..5605ae8f7
--- /dev/null
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TextActionChipView.kt
@@ -0,0 +1,27 @@
+package com.habitrpg.wearos.habitica.ui.views
+
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.RelativeLayout
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.TextActionChipBinding
+import com.habitrpg.common.habitica.extensions.layoutInflater
+
+class TextActionChipView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
+    RelativeLayout(context, attrs) {
+    private val attributes = context.theme?.obtainStyledAttributes(
+        attrs,
+        R.styleable.TextActionChip,
+        0, 0
+    )
+
+    val binding = TextActionChipBinding.inflate(context.layoutInflater, this)
+
+    init {
+        val chipText = attributes?.getText(R.styleable.TextActionChip_chipText)
+        val chipImage = attributes?.getDrawable(R.styleable.TextActionChip_chipImage)
+
+        binding.chipTextview.text = chipText
+        binding.chipImageview.setImageDrawable(chipImage)
+    }
+}
\ No newline at end of file
diff --git a/wearos/src/main/res/drawable/ic_keyboard.xml b/wearos/src/main/res/drawable/ic_keyboard.xml
index a6ef5a43a..402bc4e09 100644
--- a/wearos/src/main/res/drawable/ic_keyboard.xml
+++ b/wearos/src/main/res/drawable/ic_keyboard.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
-    android:height="19dp"
+    android:height="18dp"
     android:viewportWidth="24"
     android:viewportHeight="19">
   <path
diff --git a/wearos/src/main/res/layout/activity_login.xml b/wearos/src/main/res/layout/activity_login.xml
index b764ba9e3..19d914f20 100644
--- a/wearos/src/main/res/layout/activity_login.xml
+++ b/wearos/src/main/res/layout/activity_login.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.habitrpg.wearos.habitica.ui.views.HabiticaScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<com.habitrpg.wearos.habitica.ui.views.HabiticaScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -33,46 +33,46 @@
                 style="@style/Text.Body2"
                 android:textColor="@color/watch_white"
                 android:layout_marginBottom="18dp"/>
-            <Button
+
+            <com.habitrpg.wearos.habitica.ui.views.TextActionChipView
                 android:id="@+id/sign_in_on_phone_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/ChipButton.Icon"
-                android:text="@string/sign_in_on_phone"
-                android:drawableStart="@drawable/handoff"
-                android:layout_marginBottom="@dimen/spacing_small"/>
-            <Button
+                android:layout_marginBottom="4dp"
+                app:chipImage="@drawable/handoff"
+                app:chipText="@string/sign_in_on_phone" />
+
+            <com.habitrpg.wearos.habitica.ui.views.TextActionChipView
                 android:id="@+id/other_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/ChipButton.Icon"
-                android:drawableStart="@drawable/ic_keyboard"
-                android:text="@string/other_options"/>
+                android:layout_marginBottom="4dp"
+                app:chipImage="@drawable/ic_keyboard"
+                app:chipText="@string/other_options" />
 
-
-            <Button
+            <com.habitrpg.wearos.habitica.ui.views.TextActionChipView
                 android:id="@+id/google_login_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:drawableStart="@drawable/google_icon"
-                android:text="@string/login_btn_google"
-                android:layout_marginBottom="@dimen/spacing_small"
-                style="@style/ChipButton.Icon"/>
-            <Button
+                android:layout_marginBottom="4dp"
+                app:chipImage="@drawable/google_icon"
+                app:chipText="@string/login_btn_google" />
+
+            <com.habitrpg.wearos.habitica.ui.views.TextActionChipView
                 android:id="@+id/username_password_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/sign_in_password"
-                android:layout_marginBottom="@dimen/spacing_small"
-                android:drawableStart="@drawable/ic_keyboard"
-                style="@style/ChipButton.Icon"/>
-            <Button
+                android:layout_marginBottom="4dp"
+                app:chipImage="@drawable/ic_keyboard"
+                app:chipText="@string/sign_in_password" />
+
+            <com.habitrpg.wearos.habitica.ui.views.TextActionChipView
                 android:id="@+id/register_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/create_account"
-                android:drawableStart="@drawable/handoff"
-                style="@style/ChipButton.Icon"/>
+                android:layout_marginBottom="4dp"
+                app:chipImage="@drawable/handoff"
+                app:chipText="@string/create_account" />
 
             <EditText
                 android:id="@+id/username_edit_text"
diff --git a/wearos/src/main/res/layout/activity_stats.xml b/wearos/src/main/res/layout/activity_stats.xml
index faaf344b6..c63c5e093 100644
--- a/wearos/src/main/res/layout/activity_stats.xml
+++ b/wearos/src/main/res/layout/activity_stats.xml
@@ -43,20 +43,20 @@
         android:layout_centerInParent="true"
         android:orientation="vertical">
 
-        <com.habitrpg.wearos.habitica.ui.views.StatValue
+        <com.habitrpg.wearos.habitica.ui.views.StatValueView
             android:id="@+id/hp_stat_value"
             android:layout_width="match_parent"
             android:layout_marginTop="5dp"
             android:layout_height="wrap_content"
             android:layout_marginBottom="8dp"/>
 
-        <com.habitrpg.wearos.habitica.ui.views.StatValue
+        <com.habitrpg.wearos.habitica.ui.views.StatValueView
             android:id="@+id/exp_stat_value"
             android:layout_width="match_parent"
             android:layout_marginBottom="8dp"
             android:layout_height="wrap_content" />
 
-        <com.habitrpg.wearos.habitica.ui.views.StatValue
+        <com.habitrpg.wearos.habitica.ui.views.StatValueView
             android:id="@+id/mp_stat_value"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
diff --git a/wearos/src/main/res/layout/stat_value_layout.xml b/wearos/src/main/res/layout/stat_value_layout.xml
index d4d5e6839..ddaad3dfc 100644
--- a/wearos/src/main/res/layout/stat_value_layout.xml
+++ b/wearos/src/main/res/layout/stat_value_layout.xml
@@ -6,7 +6,7 @@
     android:layout_height="30dp"
     android:paddingStart="16dp"
     android:paddingEnd="0dp"
-    tools:parentTag="com.habitrpg.wearos.habitica.ui.views.StatValue">
+    tools:parentTag="com.habitrpg.wearos.habitica.ui.views.StatValueView">
 
     <View
         android:id="@+id/view"
diff --git a/wearos/src/main/res/layout/text_action_chip.xml b/wearos/src/main/res/layout/text_action_chip.xml
new file mode 100644
index 000000000..77f643d14
--- /dev/null
+++ b/wearos/src/main/res/layout/text_action_chip.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:layout_height="wrap_content"
+    tools:layout_width="match_parent"
+    tools:parentTag="com.habitrpg.wearos.habitica.ui.views.TextActionChipView">
+
+    <ImageView
+        android:id="@+id/chip_imageview"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="14dp"
+        android:clickable="false"
+        android:duplicateParentState="true"
+        android:elevation="2dp" />
+
+    <TextView
+        android:id="@+id/chip_textview"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="34dp"
+        android:clickable="false"
+        android:duplicateParentState="true"
+        android:elevation="2dp"
+        android:fontFamily="sans-serif-medium"
+        android:letterSpacing=".01"
+        android:paddingHorizontal="@dimen/row_padding_horizontal"
+        android:textColor="@color/watch_white"
+        android:textSize="14sp" />
+
+    <ImageView
+        android:id="@+id/wear_chip_button"
+        style="@style/ChipButton.Icon"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clickable="false"
+        android:duplicateParentState="true" />
+
+</merge>
\ No newline at end of file
diff --git a/wearos/src/main/res/values/attrs.xml b/wearos/src/main/res/values/attrs.xml
index b561512f4..a04d48410 100644
--- a/wearos/src/main/res/values/attrs.xml
+++ b/wearos/src/main/res/values/attrs.xml
@@ -13,4 +13,8 @@
         <attr name="ellipsis" format="string" />
         <attr name="ellipsisColor" format="color" />
     </declare-styleable>
+    <declare-styleable name="TextActionChip">
+        <attr name="chipText" format="string" />
+        <attr name="chipImage" format="reference" />
+    </declare-styleable>
 </resources>
\ No newline at end of file

From 091927b28f1c4ca3fa5a8c282ee5a0157169b6af Mon Sep 17 00:00:00 2001
From: Hafiz <hafizbhamidi@gmail.com>
Date: Wed, 6 Jul 2022 22:14:19 -0400
Subject: [PATCH 15/39] Update edit icon

---
 wearos/src/main/res/drawable-xhdpi/edit.png | Bin 0 -> 391 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 wearos/src/main/res/drawable-xhdpi/edit.png

diff --git a/wearos/src/main/res/drawable-xhdpi/edit.png b/wearos/src/main/res/drawable-xhdpi/edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a03bc9e426f46a210ca0db42c0fd27aaebf444f
GIT binary patch
literal 391
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?2=RS;(M3{v?36l5$8
za(7}_cTVOdki(Mh=<CS9u(6-}Pa-Q&PR7&4F{Fa=?Tm-KO$GvP_C3ry8v7n_>|$K}
zf-Ua>$BxEAX0r>t1<ZFJ?D01EC$PbxTK8jIk>bns-<@s=F&zGpZ=}K?nEPYmXPwte
zy{DzB`!G(k4>A@#&!u^|iM90egGgmpnJ1Tf6Bf?-H8JH#<1a-)?IlMVI*gM7PwPcp
zn|q%r$zeWkwX8H_?u*}BB!w6LW?S)hg^X071NX1mbKiScc)S)-`tE(o)akw43&r<R
z6SwT~cKP&au3+%Qe({Ha|9m-hnNIj89iFx4<ZKA4nf|Bmk5EY6wGGccXMZ@k`KkR`
zbC#sG0+#9GPOK|Va4RxhdBS?1an+}$^9-ex2g4miDi69lm{ca_ID}Lt-rG?2T=U^E
eyJdS4B@S?3<56LClTri)HG`+CpUXO@geCwB<(yUk

literal 0
HcmV?d00001


From 8292fe21c79be6e5f31bf5808421f82d598f0671 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 6 Jul 2022 08:01:53 +0200
Subject: [PATCH 16/39] fix crash

---
 .../java/com/habitrpg/common/habitica/helpers/AppTestingLevel.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/src/main/java/com/habitrpg/common/habitica/helpers/AppTestingLevel.kt b/common/src/main/java/com/habitrpg/common/habitica/helpers/AppTestingLevel.kt
index 249bcca73..b2049338a 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/helpers/AppTestingLevel.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/helpers/AppTestingLevel.kt
@@ -2,6 +2,7 @@ package com.habitrpg.common.habitica.helpers
 
 enum class AppTestingLevel(identifier: String) {
     STAFF("staff"),
+    PARTNERS("partners"),
     ALPHA("alpha"),
     BETA("beta"),
     PRODUCTION("production")

From d5c0d09035d5fef9467e6e9be7615c7ad63b2f3f Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 6 Jul 2022 09:17:51 +0200
Subject: [PATCH 17/39] Minor UI tweaks

---
 .../habitica/helpers/RxErrorHandler.kt        |  1 +
 common/src/main/res/values/strings.xml        | 21 ++++++++++++++-----
 wearos/build.gradle                           |  1 -
 .../ui/activities/TaskDetailActivity.kt       | 12 ++++++-----
 .../ui/activities/TaskFormActivity.kt         |  2 +-
 .../ui/activities/TaskListActivity.kt         |  8 +++----
 .../ui/activities/TaskResultActivity.kt       |  2 +-
 7 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RxErrorHandler.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RxErrorHandler.kt
index 5d36223ab..dce9aebb5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RxErrorHandler.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RxErrorHandler.kt
@@ -37,6 +37,7 @@ class RxErrorHandler {
                     !HttpException::class.java.isAssignableFrom(throwable.javaClass) &&
                     !retrofit2.HttpException::class.java.isAssignableFrom(throwable.javaClass) &&
                     !EOFException::class.java.isAssignableFrom(throwable.javaClass) &&
+                    !retrofit2.adapter.rxjava3.HttpException::class.java.isAssignableFrom(throwable.javaClass) &&
                     throwable !is ConnectionShutdownException
                 ) {
                     instance?.analyticsManager?.logException(throwable)
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 0619d050a..327b79e24 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -48,11 +48,22 @@
 
     <string name="login_validation_error_title">Validation Error</string>
     <string name="login_validation_error_fieldsmissing">You have to fill out all fields.</string>
-    <string name="x_habits">%d Habits</string>
-    <string name="x_dailies">%d Dailies</string>
-    <string name="x_todos">%d To do\'s</string>
-    <string name="x_rewards">%d Rewards</string>
-
+    <plurals name="x_habits">
+        <item quantity="one">%d Habit</item>
+        <item quantity="other">%d Habits</item>
+    </plurals>
+    <plurals name="x_dailies">
+        <item quantity="one">%d Daily</item>
+        <item quantity="other">%d Dailies</item>
+    </plurals>
+    <plurals name="x_todos">
+        <item quantity="one">%d To Do</item>
+        <item quantity="other">%d To Do\'s</item>
+    </plurals>
+    <plurals name="x_rewards">
+        <item quantity="one">%d Reward</item>
+        <item quantity="other">%d Rewards</item>
+    </plurals>
     <string name="create_task_title">Create a Task</string>
     <string name="complete_task_title">Complete a Task</string>
     <string name="create_task">Create %s</string>
diff --git a/wearos/build.gradle b/wearos/build.gradle
index 61a77bec1..b6bf694f6 100644
--- a/wearos/build.gradle
+++ b/wearos/build.gradle
@@ -129,7 +129,6 @@ dependencies {
     kapt "com.google.dagger:hilt-compiler:$daggerhilt_version"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-
 }
 repositories {
     mavenCentral()
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskDetailActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskDetailActivity.kt
index 419db4aa2..983a7e867 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskDetailActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskDetailActivity.kt
@@ -6,10 +6,10 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ActivityTaskDetailBinding
+import com.habitrpg.common.habitica.models.tasks.TaskType
 import com.habitrpg.common.habitica.models.tasks.streakString
 import com.habitrpg.wearos.habitica.ui.viewmodels.TaskDetailViewModel
 import dagger.hilt.android.AndroidEntryPoint
-import java.util.Locale
 
 @AndroidEntryPoint
 class TaskDetailActivity : BaseActivity<ActivityTaskDetailBinding, TaskDetailViewModel>() {
@@ -33,10 +33,12 @@ class TaskDetailActivity : BaseActivity<ActivityTaskDetailBinding, TaskDetailVie
 
     private fun subscribeUI() {
         viewModel.task.observe(this) { task ->
-            binding.taskTypeView.text = task?.type?.value?.replaceFirstChar {
-                if (it.isLowerCase()) it.titlecase(
-                    Locale.getDefault()
-                ) else it.toString()
+            binding.taskTypeView.text = when (task?.type) {
+                TaskType.HABIT -> getString(R.string.habit)
+                TaskType.DAILY -> getString(R.string.daily)
+                TaskType.TODO -> getString(R.string.todo)
+                TaskType.REWARD -> getString(R.string.reward)
+                null -> ""
             }
             binding.taskTypeView.setTextColor(
                 ContextCompat.getColor(
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskFormActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskFormActivity.kt
index 30ee04e7a..6dfcd5ffe 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskFormActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskFormActivity.kt
@@ -94,7 +94,7 @@ class TaskFormActivity : BaseActivity<ActivityTaskFormBinding, TaskFormViewModel
             binding.editText.requestFocus()
         } else {
             taskType = TaskType.TODO
-            binding.header.textView.text = getString(R.string.create_task_title)
+            binding.header.textView.text = getString(R.string.new_task)
         }
     }
 
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt
index 210aadf95..62ce9de45 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt
@@ -163,10 +163,10 @@ class TaskListActivity : BaseActivity<ActivityTasklistBinding, TaskListViewModel
         val taskType = viewModel.taskType ?: return ""
         return if (count != null) {
             when (taskType) {
-                TaskType.HABIT -> getString(R.string.x_habits, count)
-                TaskType.DAILY -> getString(R.string.x_dailies, count)
-                TaskType.TODO -> getString(R.string.x_todos, count)
-                TaskType.REWARD -> getString(R.string.x_rewards, count)
+                TaskType.HABIT -> resources.getQuantityString(R.plurals.x_habits, count, count)
+                TaskType.DAILY -> resources.getQuantityString(R.plurals.x_dailies, count, count)
+                TaskType.TODO -> resources.getQuantityString(R.plurals.x_todos, count, count)
+                TaskType.REWARD -> resources.getQuantityString(R.plurals.x_rewards, count, count)
             }
         } else {
             when (taskType) {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt
index 09cb8d823..b17c9969b 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt
@@ -51,7 +51,7 @@ class TaskResultActivity : BaseActivity<ActivityTaskResultBinding, TaskResultVie
 
     override fun finish() {
         if (viewModel.result?.hasLeveledUp == true) {
-            startActivity(Intent(parent, LevelupActivity::class.java))
+            startActivity(Intent(this, LevelupActivity::class.java))
         }
         super.finish()
     }

From 91b1f32d7251cecf7f7e9ad661ff94c6638fae26 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 6 Jul 2022 09:37:44 +0200
Subject: [PATCH 18/39] Add crashlitcs to app

---
 wearos/build.gradle                            |  6 ++++++
 .../wearos/habitica/MainApplication.kt         | 18 ++++++++++++++++++
 .../habitica/ui/activities/MainActivity.kt     |  1 +
 3 files changed, 25 insertions(+)

diff --git a/wearos/build.gradle b/wearos/build.gradle
index b6bf694f6..0b2ac1396 100644
--- a/wearos/build.gradle
+++ b/wearos/build.gradle
@@ -3,6 +3,8 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-kapt'
     id 'dagger.hilt.android.plugin'
+    id 'com.google.gms.google-services'
+    id 'com.google.firebase.crashlytics'
 }
 apply plugin: 'kotlin-android'
 
@@ -111,6 +113,10 @@ dependencies {
     //Analytics
     implementation "com.amplitude:android-sdk:$amplitude_version"
 
+    implementation platform('com.google.firebase:firebase-bom:30.2.0')
+    implementation 'com.google.firebase:firebase-crashlytics-ktx'
+    implementation 'com.google.firebase:firebase-analytics-ktx'
+
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt
index 7c8a4d8ae..fa3a383fb 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt
@@ -2,6 +2,10 @@ package com.habitrpg.wearos.habitica
 
 import android.app.Application
 import android.content.Intent
+import com.google.firebase.analytics.ktx.analytics
+import com.google.firebase.crashlytics.ktx.crashlytics
+import com.google.firebase.ktx.Firebase
+import com.habitrpg.android.habitica.BuildConfig
 import com.habitrpg.common.habitica.extensions.setupCoil
 import com.habitrpg.common.habitica.helpers.MarkdownParser
 import com.habitrpg.common.habitica.models.tasks.TaskType
@@ -30,6 +34,7 @@ class MainApplication : Application() {
         super.onCreate()
         MarkdownParser.setup(this)
         setupCoil()
+        setupFirebase()
 
         MainScope().launch {
             userRepository.getUser().onEach {
@@ -58,5 +63,18 @@ class MainApplication : Application() {
                 taskRepository.retrieveTasks(user?.tasksOrder)
             }
         }
+
+        logLaunch()
+    }
+
+    private fun logLaunch() {
+        Firebase.analytics.logEvent("wear_launched", null)
+    }
+
+    private fun setupFirebase() {
+        if (!BuildConfig.DEBUG) {
+            val crashlytics = Firebase.crashlytics
+            crashlytics.setCustomKey("is_wear", true)
+        }
     }
 }
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt
index 746aa6de7..db0a4b284 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt
@@ -145,6 +145,7 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
     }
 
     private fun openTaskFormActivity() {
+        throw RuntimeException("WEAR TEST")
         openTaskForm.launch(Intent(this, TaskFormActivity::class.java))
     }
 

From 2bada3fc35c99866073c045b2250b2eccdc9fa59 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 6 Jul 2022 12:47:09 +0200
Subject: [PATCH 19/39] Improve network handling

---
 build.gradle                                  |  2 +-
 version.properties                            |  2 +-
 wearos/build.gradle                           |  3 -
 .../wearos/habitica/MainApplication.kt        |  7 +-
 .../wearos/habitica/data/ApiClient.kt         | 64 +++++++++++++------
 .../wearos/habitica/data/ApiService.kt        | 55 ++++++++--------
 .../data/repositories/TaskRepository.kt       | 15 +++--
 .../data/repositories/UserRepository.kt       | 19 ++++--
 .../habitrpg/wearos/habitica/models/Result.kt | 28 ++++++++
 .../habitica/models/WearableHabitResponse.kt  |  3 +-
 .../tasks/CheckedTaskViewHolder.kt            |  2 +-
 .../habitica/ui/viewmodels/LoginViewModel.kt  |  4 +-
 wearos/src/main/res/values/colors.xml         |  1 +
 wearos/src/main/res/values/strings.xml        |  2 +-
 14 files changed, 138 insertions(+), 69 deletions(-)
 create mode 100644 wearos/src/main/java/com/habitrpg/wearos/habitica/models/Result.kt

diff --git a/build.gradle b/build.gradle
index 97a6b9d7c..2dfd25719 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,7 +31,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:7.2.1'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.google.gms:google-services:4.3.13'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.1'
diff --git a/version.properties b/version.properties
index 836b20a4b..872b2b01f 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
 NAME=4.0
-CODE=4050
\ No newline at end of file
+CODE=4160
\ No newline at end of file
diff --git a/wearos/build.gradle b/wearos/build.gradle
index 0b2ac1396..cfce73bd7 100644
--- a/wearos/build.gradle
+++ b/wearos/build.gradle
@@ -110,9 +110,6 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     kapt("com.squareup.moshi:moshi-kotlin-codegen:$moshi_version")
 
-    //Analytics
-    implementation "com.amplitude:android-sdk:$amplitude_version"
-
     implementation platform('com.google.firebase:firebase-bom:30.2.0')
     implementation 'com.google.firebase:firebase-crashlytics-ktx'
     implementation 'com.google.firebase:firebase-analytics-ktx'
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt
index fa3a383fb..0de723f56 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt
@@ -59,8 +59,8 @@ class MainApplication : Application() {
         if (userRepository.hasAuthentication) {
             MainScope().launch(CoroutineExceptionHandler { _, _ ->
             }) {
-                val user = userRepository.retrieveUser()
-                taskRepository.retrieveTasks(user?.tasksOrder)
+                val user = userRepository.retrieveUser(true)
+                taskRepository.retrieveTasks(user?.tasksOrder, true)
             }
         }
 
@@ -74,6 +74,9 @@ class MainApplication : Application() {
     private fun setupFirebase() {
         if (!BuildConfig.DEBUG) {
             val crashlytics = Firebase.crashlytics
+            if (userRepository.hasAuthentication) {
+                crashlytics.setUserId(userRepository.userID)
+            }
             crashlytics.setCustomKey("is_wear", true)
         }
     }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt
index c6778bbe3..604c0acd3 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt
@@ -3,12 +3,12 @@ package com.habitrpg.wearos.habitica.data
 import android.content.Context
 import android.net.ConnectivityManager
 import android.net.NetworkCapabilities
-import com.amplitude.api.Amplitude
 import com.habitrpg.common.habitica.BuildConfig
 import com.habitrpg.common.habitica.api.HostConfig
 import com.habitrpg.common.habitica.api.Server
 import com.habitrpg.common.habitica.models.auth.UserAuth
 import com.habitrpg.common.habitica.models.auth.UserAuthSocial
+import com.habitrpg.wearos.habitica.models.NetworkResult
 import com.habitrpg.wearos.habitica.models.WearableHabitResponse
 import com.habitrpg.wearos.habitica.models.tasks.Task
 import okhttp3.Cache
@@ -17,6 +17,7 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Converter
+import retrofit2.Response
 import retrofit2.Retrofit
 import java.io.File
 import java.util.GregorianCalendar
@@ -28,6 +29,8 @@ class ApiClient @Inject constructor(
     private val hostConfig: HostConfig,
     private val context: Context
 ) {
+    val userID: String
+    get() = hostConfig.userID
     private lateinit var retrofitAdapter: Retrofit
 
     // I think we don't need the ApiClientImpl anymore we could just use ApiService
@@ -117,6 +120,8 @@ class ApiClient @Inject constructor(
                     .removeHeader("Pragma")
                     .build()
                 val response = chain.proceed(request)
+                val responseBuilder = response.newBuilder()
+                responseBuilder.header("was-cached", (response.networkResponse == null).toString())
                 if (request.method == "GET") {
                     if (response.code == 504) {
                         // Cache miss. Network might be down, but retry call without cache to be sure.
@@ -124,12 +129,12 @@ class ApiClient @Inject constructor(
                             .header("Cache-Control", "no-cache")
                             .build())
                     } else {
-                        response.newBuilder()
+                        responseBuilder
                             .header("Cache-Control", request.header("Cache-Control") ?: "")
                             .build()
                     }
                 } else {
-                    response
+                    responseBuilder.build()
                 }
             }
             .readTimeout(2400, TimeUnit.SECONDS)
@@ -149,38 +154,57 @@ class ApiClient @Inject constructor(
     fun updateAuthenticationCredentials(userID: String?, apiToken: String?) {
         this.hostConfig.userID = userID ?: ""
         this.hostConfig.apiKey = apiToken ?: ""
-        Amplitude.getInstance().userId = this.hostConfig.userID
     }
 
-    private fun <T> process(response: WearableHabitResponse<T>): T? {
-        return response.data
+    private suspend fun <T: Any> process(call: suspend () -> Response<WearableHabitResponse<T>>): NetworkResult<T> {
+        val response: Response<WearableHabitResponse<T>>
+        try {
+            response = call.invoke()
+        } catch (t: Exception) {
+            return NetworkResult.Error(t, false)
+        }
+
+        val wasCached = response.headers()["was-cached"] == "true"
+
+        return if (!response.isSuccessful) {
+            val errorBody = response.errorBody()
+            @Suppress("BlockingMethodInNonBlockingContext")
+            NetworkResult.Error(Exception((response.message() + errorBody?.string())), !wasCached)
+        } else {
+            val body = response.body()
+            return if (body?.data != null) {
+                NetworkResult.Success(body.data!!, !wasCached)
+            } else {
+                NetworkResult.Error(Exception("response.body() can't be null"), !wasCached)
+            }
+        }
     }
 
     suspend fun getUser(forced: Boolean = false) = if (forced) {
-        process(apiService.getUserForced())
+        process { apiService.getUserForced() }
     } else {
-        process(apiService.getUser())
+        process { apiService.getUser() }
     }
-    suspend fun updateUser(data: Map<String, Any>) = process(apiService.updateUser(data))
-    suspend fun sleep() = process(apiService.sleep())
-    suspend fun revive() = process(apiService.revive())
+    suspend fun updateUser(data: Map<String, Any>) = process { apiService.updateUser(data) }
+    suspend fun sleep() = process { apiService.sleep() }
+    suspend fun revive() = process { apiService.revive() }
 
-    suspend fun loginLocal(auth: UserAuth) = process(apiService.connectLocal(auth))
-    suspend fun loginSocial(auth: UserAuthSocial) = process(apiService.connectSocial(auth))
+    suspend fun loginLocal(auth: UserAuth) = process { apiService.connectLocal(auth) }
+    suspend fun loginSocial(auth: UserAuthSocial) = process { apiService.connectSocial(auth) }
 
-    suspend fun addPushDevice(data: Map<String, String>) = process(apiService.addPushDevice(data))
-    suspend fun removePushDevice(id: String) = process(apiService.removePushDevice(id))
+    suspend fun addPushDevice(data: Map<String, String>) = process { apiService.addPushDevice(data) }
+    suspend fun removePushDevice(id: String) = process { apiService.removePushDevice(id) }
 
-    suspend fun runCron() = process(apiService.runCron())
+    suspend fun runCron() = process { apiService.runCron() }
 
     suspend fun getTasks(forced: Boolean = false) = if (forced) {
-            process(apiService.getTasksForced())
+            process { apiService.getTasksForced() }
         } else {
-            process(apiService.getTasks())
+            process { apiService.getTasks() }
         }
     suspend fun scoreTask(id: String, direction: String) =
-        process(apiService.scoreTask(id, direction))
+        process { apiService.scoreTask(id, direction) }
 
-    suspend fun createTask(task: Task) = process(apiService.createTask(task))
+    suspend fun createTask(task: Task) = process { apiService.createTask(task) }
     fun hasAuthentication() = hostConfig.hasAuthentication()
 }
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiService.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiService.kt
index 4e1c1b4ea..b87455033 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiService.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiService.kt
@@ -10,6 +10,7 @@ import com.habitrpg.wearos.habitica.models.tasks.BulkTaskScoringData
 import com.habitrpg.wearos.habitica.models.tasks.Task
 import com.habitrpg.wearos.habitica.models.tasks.TaskList
 import com.habitrpg.wearos.habitica.models.user.User
+import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.GET
@@ -22,83 +23,83 @@ import retrofit2.http.Query
 
 interface ApiService {
     @GET("user/")
-    suspend fun getUser(): WearableHabitResponse<User>
+    suspend fun getUser(): Response<WearableHabitResponse<User>>
     @GET("user/")
     @Headers("Cache-Control: no-cache")
-    suspend fun getUserForced(): WearableHabitResponse<User>
+    suspend fun getUserForced(): Response<WearableHabitResponse<User>>
 
     @PUT("user/")
-    suspend fun updateUser(@Body updateDictionary: Map<String, Any>): WearableHabitResponse<User>
+    suspend fun updateUser(@Body updateDictionary: Map<String, Any>): Response<WearableHabitResponse<User>>
 
     @PUT("user/")
-    suspend fun registrationLanguage(@Header("Accept-Language") registrationLanguage: String): WearableHabitResponse<User>
+    suspend fun registrationLanguage(@Header("Accept-Language") registrationLanguage: String): Response<WearableHabitResponse<User>>
 
     @GET("tasks/user")
-    suspend fun getTasks(): WearableHabitResponse<TaskList>
+    suspend fun getTasks(): Response<WearableHabitResponse<TaskList>>
     @GET("tasks/user")
     @Headers("Cache-Control: no-cache")
-    suspend fun getTasksForced(): WearableHabitResponse<TaskList>
+    suspend fun getTasksForced(): Response<WearableHabitResponse<TaskList>>
 
     @GET("tasks/user")
-    suspend fun getTasks(@Query("type") type: String): WearableHabitResponse<TaskList>
+    suspend fun getTasks(@Query("type") type: String): Response<WearableHabitResponse<TaskList>>
 
     @GET("tasks/user")
-    suspend fun getTasks(@Query("type") type: String, @Query("dueDate") dueDate: String): WearableHabitResponse<TaskList>
+    suspend fun getTasks(@Query("type") type: String, @Query("dueDate") dueDate: String): Response<WearableHabitResponse<TaskList>>
 
     @GET("tasks/{id}")
-    suspend fun getTask(@Path("id") id: String): WearableHabitResponse<Task>
+    suspend fun getTask(@Path("id") id: String): Response<WearableHabitResponse<Task>>
 
     @POST("tasks/{id}/score/{direction}")
-    suspend fun scoreTask(@Path("id") id: String, @Path("direction") direction: String): WearableHabitResponse<TaskDirectionData>
+    suspend fun scoreTask(@Path("id") id: String, @Path("direction") direction: String): Response<WearableHabitResponse<TaskDirectionData>>
     @POST("tasks/bulk-score")
-    suspend fun bulkScoreTasks(@Body data: List<Map<String, String>>): WearableHabitResponse<BulkTaskScoringData>
+    suspend fun bulkScoreTasks(@Body data: List<Map<String, String>>): Response<WearableHabitResponse<BulkTaskScoringData>>
 
     @POST("tasks/{id}/move/to/{position}")
-    suspend fun postTaskNewPosition(@Path("id") id: String, @Path("position") position: Int): WearableHabitResponse<List<String>>
+    suspend fun postTaskNewPosition(@Path("id") id: String, @Path("position") position: Int): Response<WearableHabitResponse<List<String>>>
 
     @POST("tasks/{taskId}/checklist/{itemId}/score")
-    suspend fun scoreChecklistItem(@Path("taskId") taskId: String, @Path("itemId") itemId: String): WearableHabitResponse<Task>
+    suspend fun scoreChecklistItem(@Path("taskId") taskId: String, @Path("itemId") itemId: String): Response<WearableHabitResponse<Task>>
 
     @POST("tasks/user")
-    suspend fun createTask(@Body item: Task): WearableHabitResponse<Task>
+    suspend fun createTask(@Body item: Task): Response<WearableHabitResponse<Task>>
 
     @POST("tasks/user")
-    suspend fun createTasks(@Body tasks: List<Task>): WearableHabitResponse<List<Task>>
+    suspend fun createTasks(@Body tasks: List<Task>): Response<WearableHabitResponse<List<Task>>>
 
     @PUT("tasks/{id}")
-    suspend fun updateTask(@Path("id") id: String, @Body item: Task): WearableHabitResponse<Task>
+    suspend fun updateTask(@Path("id") id: String, @Body item: Task): Response<WearableHabitResponse<Task>>
 
     @DELETE("tasks/{id}")
-    suspend fun deleteTask(@Path("id") id: String): WearableHabitResponse<Void>
+    suspend fun deleteTask(@Path("id") id: String): Response<WearableHabitResponse<Void>>
 
     @POST("user/auth/local/register")
-    suspend fun registerUser(@Body auth: UserAuth): WearableHabitResponse<UserAuthResponse>
+    suspend fun registerUser(@Body auth: UserAuth): Response<WearableHabitResponse<UserAuthResponse>>
 
     @POST("user/auth/local/login")
-    suspend fun connectLocal(@Body auth: UserAuth): WearableHabitResponse<UserAuthResponse>
+    suspend fun connectLocal(@Body auth: UserAuth): Response<WearableHabitResponse<UserAuthResponse>>
 
     @POST("user/auth/social")
-    suspend fun connectSocial(@Body auth: UserAuthSocial): WearableHabitResponse<UserAuthResponse>
+    suspend fun connectSocial(@Body auth: UserAuthSocial): Response<WearableHabitResponse<UserAuthResponse>>
 
     @DELETE("user/auth/social/{network}")
-    suspend fun disconnectSocial(@Path("network") network: String): WearableHabitResponse<Void>
+    suspend fun disconnectSocial(@Path("network") network: String): Response<WearableHabitResponse<Void>>
 
     @POST("user/auth/apple")
-    suspend fun loginApple(@Body auth: Map<String, Any>): WearableHabitResponse<UserAuthResponse>
+    suspend fun loginApple(@Body auth: Map<String, Any>): Response<WearableHabitResponse<UserAuthResponse>>
 
     @POST("user/sleep")
-    suspend fun sleep(): WearableHabitResponse<Boolean>
+    suspend fun sleep(): Response<WearableHabitResponse<Boolean>>
 
     @POST("user/revive")
-    suspend fun revive(): WearableHabitResponse<User>
+    suspend fun revive(): Response<WearableHabitResponse<User>>
 
     // Push notifications
     @POST("user/push-devices")
-    suspend fun addPushDevice(@Body pushDeviceData: Map<String, String>): WearableHabitResponse<List<Void>>
+    suspend fun addPushDevice(@Body pushDeviceData: Map<String, String>): Response<WearableHabitResponse<List<Void>>>
 
     @DELETE("user/push-devices/{regId}")
-    suspend fun removePushDevice(@Path("regId") regId: String): WearableHabitResponse<List<Void>>
+    suspend fun removePushDevice(@Path("regId") regId: String): Response<WearableHabitResponse<List<Void>>>
 
     @POST("cron")
-    suspend fun runCron(): WearableHabitResponse<EmptyResponse>
+    suspend fun runCron(): Response<WearableHabitResponse<EmptyResponse>>
 }
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/TaskRepository.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/TaskRepository.kt
index d5ec83c93..5f1efd5f5 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/TaskRepository.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/TaskRepository.kt
@@ -18,9 +18,14 @@ class TaskRepository @Inject constructor(
     private val userLocalRepository: UserLocalRepository
 ) {
 
-    suspend fun retrieveTasks(order: TasksOrder?, forced: Boolean = false): TaskList? {
-        val tasks = apiClient.getTasks(forced)
-        tasks?.let { localRepository.saveTasks(tasks, order) }
+    suspend fun retrieveTasks(order: TasksOrder?, ensureFresh: Boolean = false): TaskList? {
+        val response = apiClient.getTasks()
+        var tasks = response.responseData
+        tasks?.let { localRepository.saveTasks(it, order) }
+        if (ensureFresh && !response.isResponseFresh) {
+            tasks = apiClient.getTasks(true).responseData
+            tasks?.let { localRepository.saveTasks(tasks, order) }
+        }
         return tasks
     }
 
@@ -28,7 +33,7 @@ class TaskRepository @Inject constructor(
 
     suspend fun scoreTask(user: User?, task: Task, direction: TaskDirection): TaskScoringResult? {
         val id = task.id ?: return null
-        val result = apiClient.scoreTask(id, direction.text)
+        val result = apiClient.scoreTask(id, direction.text).responseData
         if (result != null) {
             task.completed = direction == TaskDirection.UP
             task.value += result.delta
@@ -65,7 +70,7 @@ class TaskRepository @Inject constructor(
     }
 
     suspend fun createTask(task: Task) {
-        val newTask = apiClient.createTask(task)
+        val newTask = apiClient.createTask(task).responseData
         if (newTask != null) {
             localRepository.updateTask(newTask)
         }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserRepository.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserRepository.kt
index 29baa4726..891c6b133 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserRepository.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserRepository.kt
@@ -1,6 +1,7 @@
 package com.habitrpg.wearos.habitica.data.repositories
 
 import com.habitrpg.wearos.habitica.data.ApiClient
+import com.habitrpg.wearos.habitica.models.NetworkResult
 import com.habitrpg.wearos.habitica.models.user.User
 import javax.inject.Inject
 
@@ -8,25 +9,33 @@ class UserRepository @Inject constructor(
     private val apiClient: ApiClient,
     private val localRepository: UserLocalRepository
 ) {
+    val userID: String
+    get() = apiClient.userID
     val hasAuthentication: Boolean
         get() = apiClient.hasAuthentication()
 
     fun getUser() = localRepository.getUser()
 
-    suspend fun retrieveUser(forced: Boolean = false): User? {
-        val user = apiClient.getUser(forced)
+    suspend fun retrieveUser(ensureFresh: Boolean = false): User? {
+        var response = apiClient.getUser()
+        var user = (response as? NetworkResult.Success)?.data
         user?.let { localRepository.saveUser(it) }
+        if (ensureFresh && !response.isResponseFresh) {
+            response = apiClient.getUser(true)
+            user = (response as? NetworkResult.Success)?.data
+            user?.let { localRepository.saveUser(it) }
+        }
         return user
     }
 
     suspend fun updateUser(data: Map<String, Any>): User? {
-        val user = apiClient.updateUser(data)
+        val user = apiClient.updateUser(data).responseData
         user?.let { localRepository.saveUser(it) }
         return user
     }
 
-    suspend fun sleep() = apiClient.sleep()
-    suspend fun revive() = apiClient.revive()
+    suspend fun sleep() = apiClient.sleep().responseData
+    suspend fun revive() = apiClient.revive().responseData
     suspend fun runCron() {
         apiClient.runCron()
     }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/Result.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/Result.kt
new file mode 100644
index 000000000..a21ed6f23
--- /dev/null
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/Result.kt
@@ -0,0 +1,28 @@
+package com.habitrpg.wearos.habitica.models
+
+sealed class NetworkResult<out T : Any> {
+    val isResponseFresh: Boolean
+    get() = if (this is Success) {
+        this.isFresh
+    } else if (this is Error) {
+        this.isFresh
+    } else {
+        false
+    }
+    val responseData: T?
+        get() {
+            return if (this is Success) {
+                this.data
+            } else {
+                null
+            }
+        }
+
+    val isSuccess: Boolean
+        get() = this is Success
+    val isError: Boolean
+        get() = this is Error
+
+    data class Success<out T : Any>(val data: T, val isFresh: Boolean) : NetworkResult<T>()
+    data class Error(val exception: Exception, val isFresh: Boolean) : NetworkResult<Nothing>()
+}
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/WearableHabitResponse.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/WearableHabitResponse.kt
index 1b949dd12..54302c16e 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/WearableHabitResponse.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/WearableHabitResponse.kt
@@ -2,6 +2,7 @@ package com.habitrpg.wearos.habitica.models
 
 class WearableHabitResponse<T> {
     var data: T? = null
-    var success: Boolean? = null
+    var success: Boolean = false
     var message: String? = null
+    val isFresh: Boolean = true
 }
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/CheckedTaskViewHolder.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/CheckedTaskViewHolder.kt
index 863093323..b9ab7c41b 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/CheckedTaskViewHolder.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/CheckedTaskViewHolder.kt
@@ -20,7 +20,7 @@ abstract class CheckedTaskViewHolder(itemView: View) : TaskViewHolder(itemView)
         if (data.completed) {
             checkbox.setImageResource(R.drawable.checkmark)
             checkboxWrapper.backgroundTintList =
-                ColorStateList.valueOf(ContextCompat.getColor(itemView.context, R.color.amp_transparent))
+                ColorStateList.valueOf(ContextCompat.getColor(itemView.context, R.color.transparent))
             checkbox.backgroundTintList = ColorStateList.valueOf(
                 ContextCompat.getColor(
                     itemView.context,
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt
index 6e3739759..9c2100d56 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt
@@ -91,7 +91,7 @@ class LoginViewModel @Inject constructor(userRepository: UserRepository,
             auth.authResponse?.client_id = account?.email
             auth.authResponse?.access_token = token
             val response = apiClient.loginSocial(auth)
-            handleAuthResponse(response)
+            handleAuthResponse(response.responseData)
         }
     }
 
@@ -153,7 +153,7 @@ class LoginViewModel @Inject constructor(userRepository: UserRepository,
 
     fun login(username: String, password: String, onResult: (Boolean) -> Unit) {
         viewModelScope.launch(exceptionBuilder.userFacing(this)) {
-            val response = apiClient.loginLocal(UserAuth(username, password))
+            val response = apiClient.loginLocal(UserAuth(username, password)).responseData
             handleAuthResponse(response)
             onResult(response?.id != null)
         }.invokeOnCompletion {
diff --git a/wearos/src/main/res/values/colors.xml b/wearos/src/main/res/values/colors.xml
index 706e492a2..5799d09b1 100644
--- a/wearos/src/main/res/values/colors.xml
+++ b/wearos/src/main/res/values/colors.xml
@@ -60,4 +60,5 @@
     <color name="exp_bar_color">@color/watch_yellow_100</color>
     <color name="mp_bar_color">@color/watch_blue_100</color>
     <color name="hp_bar_color">@color/watch_red_100</color>
+    <color name="transparent">#00ffffff</color>
 </resources>
\ No newline at end of file
diff --git a/wearos/src/main/res/values/strings.xml b/wearos/src/main/res/values/strings.xml
index fdbb2ba62..7ae3faeb5 100644
--- a/wearos/src/main/res/values/strings.xml
+++ b/wearos/src/main/res/values/strings.xml
@@ -5,7 +5,7 @@
     <string name="you_found">You found…</string>
     <string name="one_quest_item">1 Quest item</string>
     <string name="x_quest_item">%d Quest items</string>
-    <string name="x_and_y">%s and %s</string>
+    <string name="x_and_y">%1$s and %2$s</string>
     <string name="some_x">some %s</string>
     <string name="edit_on_phone">Edit on phone</string>
     <string name="sign_in">Sign in</string>

From 35ee77def2d2cc9f06fd47a0c6f9130d155da340 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 7 Jul 2022 09:12:55 +0200
Subject: [PATCH 20/39] update icons

---
 Habitica/build.gradle                         |   2 +-
 build.gradle                                  |   6 +-
 .../helpers/RecyclerViewEmptySupport.kt       |   9 +-
 version.properties                            |   2 +-
 .../habitica/ui/activities/MainActivity.kt    |   1 -
 .../ui/activities/TaskListActivity.kt         |  12 +-
 .../habitica/ui/adapters/BaseAdapter.kt       |   5 +
 .../habitica/ui/adapters/TaskListAdapter.kt   |   7 +-
 .../habitica/ui/views/HabiticaRecyclerView.kt |  16 +-
 .../habitica/ui/views/HabiticaScrollView.kt   |  25 ++-
 wearos/src/main/res/drawable-hdpi/cancel.png  | Bin 0 -> 1594 bytes
 wearos/src/main/res/drawable-hdpi/edit.png    | Bin 0 -> 1586 bytes
 .../main/res/drawable-hdpi/google_icon.png    | Bin 0 -> 1968 bytes
 wearos/src/main/res/drawable-hdpi/handoff.png | Bin 0 -> 474 bytes
 .../main/res/drawable-hdpi/ic_keyboard.png    | Bin 0 -> 1580 bytes
 wearos/src/main/res/drawable-hdpi/logout.png  | Bin 0 -> 1581 bytes
 wearos/src/main/res/drawable-hdpi/save.png    | Bin 0 -> 441 bytes
 wearos/src/main/res/drawable-mdpi/cancel.png  | Bin 0 -> 268 bytes
 wearos/src/main/res/drawable-mdpi/edit.png    | Bin 0 -> 267 bytes
 .../main/res/drawable-mdpi/google_icon.png    | Bin 0 -> 673 bytes
 wearos/src/main/res/drawable-mdpi/handoff.png | Bin 0 -> 376 bytes
 .../main/res/drawable-mdpi/ic_keyboard.png    | Bin 0 -> 344 bytes
 wearos/src/main/res/drawable-mdpi/logout.png  | Bin 0 -> 372 bytes
 wearos/src/main/res/drawable-mdpi/save.png    | Bin 0 -> 318 bytes
 wearos/src/main/res/drawable-xhdpi/cancel.png | Bin 0 -> 399 bytes
 .../main/res/drawable-xhdpi/google_icon.png   | Bin 0 -> 1207 bytes
 .../src/main/res/drawable-xhdpi/handoff.png   | Bin 0 -> 597 bytes
 .../main/res/drawable-xhdpi/ic_keyboard.png   | Bin 0 -> 486 bytes
 wearos/src/main/res/drawable-xhdpi/logout.png | Bin 0 -> 554 bytes
 wearos/src/main/res/drawable-xhdpi/save.png   | Bin 0 -> 553 bytes
 .../src/main/res/drawable-xxhdpi/cancel.png   | Bin 0 -> 508 bytes
 wearos/src/main/res/drawable-xxhdpi/edit.png  | Bin 0 -> 527 bytes
 .../main/res/drawable-xxhdpi/google_icon.png  | Bin 0 -> 1729 bytes
 .../src/main/res/drawable-xxhdpi/handoff.png  | Bin 0 -> 803 bytes
 .../main/res/drawable-xxhdpi/ic_keyboard.png  | Bin 0 -> 605 bytes
 .../src/main/res/drawable-xxhdpi/logout.png   | Bin 0 -> 719 bytes
 wearos/src/main/res/drawable-xxhdpi/save.png  | Bin 0 -> 796 bytes
 wearos/src/main/res/drawable/cancel.xml       |   9 -
 wearos/src/main/res/drawable/daily_square.xml |   2 +-
 wearos/src/main/res/drawable/edit.xml         |   5 -
 wearos/src/main/res/drawable/google_icon.xml  |  18 --
 wearos/src/main/res/drawable/ic_keyboard.xml  |   9 -
 wearos/src/main/res/drawable/logout.xml       |   9 -
 wearos/src/main/res/drawable/save.xml         |   5 -
 wearos/src/main/res/layout/activity_rya.xml   |   3 +-
 .../main/res/layout/activity_task_detail.xml  |   5 +-
 .../main/res/layout/activity_task_form.xml    | 212 +++++++++---------
 .../src/main/res/layout/empty_task_list.xml   |  17 ++
 wearos/src/main/res/layout/row_habit.xml      |   2 +-
 wearos/src/main/res/layout/row_todo.xml       |   2 +-
 wearos/src/main/res/values/styles.xml         |   3 +-
 51 files changed, 188 insertions(+), 198 deletions(-)
 create mode 100644 wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/BaseAdapter.kt
 create mode 100644 wearos/src/main/res/drawable-hdpi/cancel.png
 create mode 100644 wearos/src/main/res/drawable-hdpi/edit.png
 create mode 100644 wearos/src/main/res/drawable-hdpi/google_icon.png
 create mode 100644 wearos/src/main/res/drawable-hdpi/handoff.png
 create mode 100644 wearos/src/main/res/drawable-hdpi/ic_keyboard.png
 create mode 100644 wearos/src/main/res/drawable-hdpi/logout.png
 create mode 100644 wearos/src/main/res/drawable-hdpi/save.png
 create mode 100644 wearos/src/main/res/drawable-mdpi/cancel.png
 create mode 100644 wearos/src/main/res/drawable-mdpi/edit.png
 create mode 100644 wearos/src/main/res/drawable-mdpi/google_icon.png
 create mode 100644 wearos/src/main/res/drawable-mdpi/handoff.png
 create mode 100644 wearos/src/main/res/drawable-mdpi/ic_keyboard.png
 create mode 100644 wearos/src/main/res/drawable-mdpi/logout.png
 create mode 100644 wearos/src/main/res/drawable-mdpi/save.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/cancel.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/google_icon.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/handoff.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/ic_keyboard.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/logout.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/save.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/cancel.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/edit.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/google_icon.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/handoff.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/ic_keyboard.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/logout.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/save.png
 delete mode 100644 wearos/src/main/res/drawable/cancel.xml
 delete mode 100644 wearos/src/main/res/drawable/edit.xml
 delete mode 100644 wearos/src/main/res/drawable/google_icon.xml
 delete mode 100644 wearos/src/main/res/drawable/ic_keyboard.xml
 delete mode 100644 wearos/src/main/res/drawable/logout.xml
 delete mode 100644 wearos/src/main/res/drawable/save.xml
 create mode 100644 wearos/src/main/res/layout/empty_task_list.xml

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index d846d6971..d5035923b 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -5,12 +5,12 @@ plugins {
 
     id 'com.google.gms.google-services'
     id 'com.google.firebase.crashlytics'
-    id 'realm-android'
     id 'androidx.navigation.safeargs'
     id 'com.google.firebase.firebase-perf'
 }
 
 apply plugin: 'kotlin-android'
+apply plugin: "realm-android"
 
 repositories {
     mavenLocal()
diff --git a/build.gradle b/build.gradle
index 2dfd25719..7e5ecde9f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,14 +31,14 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.1.3'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.google.gms:google-services:4.3.13'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.1'
-        classpath "io.realm:realm-gradle-plugin:10.10.1"
+        classpath "io.realm:realm-gradle-plugin:10.11.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.19.0"
-        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.0-rc02"
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.0"
         classpath 'com.google.firebase:perf-plugin:1.4.1'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$daggerhilt_version"
     }
diff --git a/common/src/main/java/com/habitrpg/common/habitica/helpers/RecyclerViewEmptySupport.kt b/common/src/main/java/com/habitrpg/common/habitica/helpers/RecyclerViewEmptySupport.kt
index e88db2736..871a7145e 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/helpers/RecyclerViewEmptySupport.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/helpers/RecyclerViewEmptySupport.kt
@@ -39,6 +39,8 @@ class FailedViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
     }
 }
 
+class HolderViewHolder(itemView: View): RecyclerView.ViewHolder(itemView)
+
 class EmptyViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
     private val binding = EmptyItemBinding.bind(itemView)
@@ -66,6 +68,7 @@ class EmptyViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
 class RecyclerViewStateAdapter(val showLoadingAsEmpty: Boolean = false) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     var onRefresh: (() -> Unit)? = null
+    var emptyViewBuilder: (() -> View)? = null
     var emptyItem: EmptyItem? = null
         set(value) {
             field = value
@@ -90,7 +93,11 @@ class RecyclerViewStateAdapter(val showLoadingAsEmpty: Boolean = false) : Recycl
                 object : RecyclerView.ViewHolder(view) {}
             }
             1 -> FailedViewHolder(parent.inflate(R.layout.failed_item))
-            else -> EmptyViewHolder(parent.inflate(R.layout.empty_item))
+            else ->if (emptyViewBuilder != null) {
+                HolderViewHolder(emptyViewBuilder?.invoke() ?: View(parent.context))
+            } else {
+                EmptyViewHolder(parent.inflate(R.layout.empty_item))
+            }
         }
     }
 
diff --git a/version.properties b/version.properties
index 872b2b01f..2c9269b28 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
 NAME=4.0
-CODE=4160
\ No newline at end of file
+CODE=4180
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt
index db0a4b284..746aa6de7 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt
@@ -145,7 +145,6 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
     }
 
     private fun openTaskFormActivity() {
-        throw RuntimeException("WEAR TEST")
         openTaskForm.launch(Intent(this, TaskFormActivity::class.java))
     }
 
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt
index 62ce9de45..20fce3a98 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt
@@ -9,7 +9,7 @@ import androidx.activity.viewModels
 import androidx.wear.widget.WearableLinearLayoutManager
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ActivityTasklistBinding
-import com.habitrpg.common.habitica.helpers.EmptyItem
+import com.habitrpg.android.habitica.databinding.EmptyTaskListBinding
 import com.habitrpg.common.habitica.models.responses.TaskDirection
 import com.habitrpg.common.habitica.models.responses.TaskScoringResult
 import com.habitrpg.common.habitica.models.tasks.TaskType
@@ -32,6 +32,7 @@ class TaskListActivity : BaseActivity<ActivityTasklistBinding, TaskListViewModel
         binding = ActivityTasklistBinding.inflate(layoutInflater)
         super.onCreate(savedInstanceState)
         configureAdapter()
+
         binding.recyclerView.apply {
             overScrollMode = View.OVER_SCROLL_ALWAYS
             layoutManager =
@@ -40,8 +41,10 @@ class TaskListActivity : BaseActivity<ActivityTasklistBinding, TaskListViewModel
                     HabiticaScrollingLayoutCallback()
                 )
             adapter = this@TaskListActivity.adapter
-            emptyItem = EmptyItem(
-                getString(
+            emptyViewBuilder = {
+                val emptyBinding = EmptyTaskListBinding.inflate(layoutInflater)
+                emptyBinding.header.textView.text = getTitle(viewModel.taskCount.value)
+                emptyBinding.descriptionView.text = getString(
                     R.string.no_tasks, getString(
                         when (viewModel.taskType) {
                             TaskType.HABIT -> R.string.habit
@@ -52,7 +55,8 @@ class TaskListActivity : BaseActivity<ActivityTasklistBinding, TaskListViewModel
                         }
                     )
                 )
-            )
+                emptyBinding.root
+            }
             onRefresh = {
                 viewModel.retrieveFullUserData()
             }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/BaseAdapter.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/BaseAdapter.kt
new file mode 100644
index 000000000..6872d56a3
--- /dev/null
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/BaseAdapter.kt
@@ -0,0 +1,5 @@
+package com.habitrpg.wearos.habitica.ui.adapters
+
+interface BaseAdapter {
+    fun hasData(): Boolean
+}
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt
index 23b21327f..47e74595e 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt
@@ -8,7 +8,7 @@ import com.habitrpg.wearos.habitica.models.tasks.Task
 import com.habitrpg.wearos.habitica.ui.viewHolders.HeaderSectionViewHolder
 import com.habitrpg.wearos.habitica.ui.viewHolders.tasks.TaskViewHolder
 
-open class TaskListAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+open class TaskListAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>(), BaseAdapter {
     var title: String = ""
     var onTaskScore: ((Task) -> Unit)? = null
     var onTaskTapped:((Task) -> Unit)? = null
@@ -18,6 +18,11 @@ open class TaskListAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
         field = value
         notifyDataSetChanged()
     }
+
+    override fun hasData(): Boolean {
+        return data.isNotEmpty()
+    }
+
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         val inflater = parent.context.layoutInflater
         return HeaderSectionViewHolder(RowSectionHeaderBinding.inflate(inflater, parent, false).root)
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaRecyclerView.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaRecyclerView.kt
index 2e05254c1..a810daa5f 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaRecyclerView.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaRecyclerView.kt
@@ -2,10 +2,12 @@ package com.habitrpg.wearos.habitica.ui.views
 
 import android.content.Context
 import android.util.AttributeSet
+import android.view.View
 import androidx.wear.widget.WearableRecyclerView
 import com.habitrpg.common.habitica.helpers.EmptyItem
 import com.habitrpg.common.habitica.helpers.RecyclerViewState
 import com.habitrpg.common.habitica.helpers.RecyclerViewStateAdapter
+import com.habitrpg.wearos.habitica.ui.adapters.BaseAdapter
 
 class HabiticaRecyclerView @JvmOverloads constructor(
     context: Context, attrs: AttributeSet? = null
@@ -13,7 +15,7 @@ class HabiticaRecyclerView @JvmOverloads constructor(
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
         post {
-            setPaddingRelative(0, (height * 0.1).toInt(), 0, (height * 0.25).toInt())
+            setPadding(0, (height * 0.1).toInt(), 0, (height * 0.25).toInt())
             scrollToPosition(0)
         }
     }
@@ -46,6 +48,12 @@ class HabiticaRecyclerView @JvmOverloads constructor(
             emptyAdapter.emptyItem = value
         }
 
+    var emptyViewBuilder: (() -> View)?
+        get() = emptyAdapter.emptyViewBuilder
+        set(value) {
+            emptyAdapter.emptyViewBuilder = value
+        }
+
     private var actualAdapter: Adapter<*>? = null
     private val emptyAdapter = RecyclerViewStateAdapter(true)
 
@@ -65,7 +73,11 @@ class HabiticaRecyclerView @JvmOverloads constructor(
 
     internal fun updateState(isInitial: Boolean = false) {
         state = if (actualAdapter != null && !isInitial) {
-            val emptyViewVisible = actualAdapter?.itemCount == 0
+            val emptyViewVisible = if (actualAdapter is BaseAdapter) {
+                (actualAdapter as? BaseAdapter)?.hasData() != true
+        } else {
+            actualAdapter?.itemCount == 0
+        }
             if (emptyViewVisible) {
                 RecyclerViewState.EMPTY
             } else {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaScrollView.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaScrollView.kt
index 56268e902..822578f7a 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaScrollView.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaScrollView.kt
@@ -5,6 +5,7 @@ import android.content.res.Resources
 import android.util.AttributeSet
 import androidx.core.view.children
 import androidx.core.widget.NestedScrollView
+import com.habitrpg.common.habitica.extensions.dpToPx
 
 class HabiticaScrollView @JvmOverloads constructor(
     context: Context, attrs: AttributeSet? = null
@@ -13,19 +14,19 @@ class HabiticaScrollView @JvmOverloads constructor(
     override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
         super.onLayout(changed, l, t, r, b)
         if (changed) {
-            if (context.resources.configuration.isScreenRound) {
-                val verticalPadding =
-                    (0.146467f * Resources.getSystem().displayMetrics.widthPixels).toInt()
-                val horizontalPadding =
-                    (0.1f * Resources.getSystem().displayMetrics.widthPixels).toInt()
-                children.firstOrNull()
-                    ?.setPadding(
-                        horizontalPadding,
-                        verticalPadding,
-                        horizontalPadding,
-                        verticalPadding*2
-                    )
+            val verticalPadding = if (context.resources.configuration.isScreenRound) {
+                (0.146467f * Resources.getSystem().displayMetrics.widthPixels).toInt()
+            } else {
+                0
             }
+            val horizontalPadding = 10.dpToPx(context)
+            children.firstOrNull()
+                ?.setPadding(
+                    horizontalPadding,
+                    verticalPadding,
+                    horizontalPadding,
+                    verticalPadding*2
+                )
         }
     }
 }
\ No newline at end of file
diff --git a/wearos/src/main/res/drawable-hdpi/cancel.png b/wearos/src/main/res/drawable-hdpi/cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff2d3452bed53a3f6e726910a989a75598fe58d3
GIT binary patch
literal 1594
zcmbVMTWs4@81~i@SZP(HZqSq$%blie)bX(slICb(>yoaCn7gdawhmr;VxK0av5#jv
zO;Uk`GK8qaLxs3>h=~j|CMv<kw3mSdg)uasOc@&*LgE3mmu&*Hi6?mBI5!nkZj0pj
z*#7?S|G)n>mmD4G>gelW7^W)`kB!m$M)$hML;rtZ78dAjof$u9Gt7Ojx!0OaU%>#w
zwBOcJ6V8OZ8!ANiA(f=Duc(_8%`n@x7fqy0V~0)SjAlf*Uq1MVV>LCx9e7v<vKhr$
zEk0}E@!8RoGCQq=Rc`wu?6xAL1UhyQThw!g4T}-3#tZ4$eJyZo4dP5kxFOdeJ0U08
zD6udb@`=0x0ANF5pNi5*Nv8)`2}q&<0)iOe0f7E63<TK5kE8A^bqbEfb~T*QrwEsI
z91{vcp-}J@{61o31Th>A3qTSiiKhtOE*TCg@`l~tWQbu~u{6`sh{3vyC{6NCgrlL>
zHRxuG*039Sq8Ss4$P`2$a5dF{s?x%lc`H|Qt||h~VI3QeO|fDNYi5Z<>@4{k>elB!
zIiR_f<(7|CW6|}N3)>l<p)wi?Sru)kN+uS@uubxof`?~lnEkFA6GknJ9Ac#i$u%pL
zY=+EAeji{r%Sh1-SHzYTCOC#19N}o)Bp!r#5KM_7D2dQd3mAX^)S)s_wW-o-P`?OW
zvlUR<H7at@zk*c-P7zB-RI;X{3>Hiy!?CSI!YIiRi#n#!`D;<gGE5k@gA4^HViAt2
z_Gy|5LqRpIsDo)9h=VF0@PjZvD1}12s(>H@Ab^k*Y}&_&l6Py{v{(P9{T@rB!-aBp
z%;S!n+Y~Ua*|c1x#!QUkLyc2TV{3f?k>d7ugj3wYVwG#W*6uh1b=pD}Q__DZcO7Pv
zDW`xeJd~l?`VS2y(C`I!7VAoczlyAVTQRpyI9&$rv9*TiLu-*?gKjU2uBkKo9=}3Y
z+|P;FP-^1bPggH>ont%Ole;EA&3$d8gBLcVH*b#gY*{S7*L`9!HE`?5<?&NX8=32`
z?0>bg?zac4dl`vYGv9OYfOmbid$D-+v&v)M<(H2hUaFkw^!&P%Ka%WP-n(b!%Z|f0
zCOf{5c79Rzt}P|^FM|u^+mkzYcwY4Ocy3gd7n1XB`=Iv_+qT&IVfWp0YhO57hP^#o
zPrrTs(iQ8W_{ZyypSX7a{Ig=<{b$Mpy}}dMtPMX_Z@%&Et*Gascf<M4?4$i=e)sd!
z{mNWlb*uP^f!e+ssoZ;c$2ZTtb@BJt`=0W=bSzVS^6Y4}{jPT&xSsla)A6Tc$K36n
M7#@wiyK}Pq2T`^QhX4Qo

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-hdpi/edit.png b/wearos/src/main/res/drawable-hdpi/edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..98328401fecf5939986125382c7266743ecc7e8c
GIT binary patch
literal 1586
zcmbVMTWB0r7@nlbnr;)YVqi@l940k1)!8{SJIQ7b9ox<B)<iRLNw%0i2swM^?Cy}A
zi!+n%Zcu1KgrufkC`u@{s4tC0#fMT51+}52Dn3*MD<Y&&wNRoUzUYgd*&9*ftqZer
zX6F09|Ns8ma(eucu3%4)VVJJbk>muu@Aa>a0R6wgtgh1APJ862%P@Dp>R&B=pF^2p
z+J4qEQ{I$12C-#?k!EE{xNO)I%`gWJmTiP*h{tA0UN;r)r}sbPSY1=NCk9lY+6hw7
zN9G(dIX9lcb2B)maR(n}50oJ#Fo=iPvQac$SXQ_yFQjMxwZO4eh&Q8fao-_3rKZ`0
z<q$R+7I_Q+V570HhO!7}vk$QnkVFB<f++I<z(@?rGF$&~)SaW{;6(Cp-5GsSxPs@|
zP!LL`Qn(ZeTTWgOW3iY3BtepRis0Rf>7g=jy1fmCByq8$+n#Qjtj~zD)~u&+G}M{~
z!*0@=Zaq&lV?r6(f*1zArYcawO`JXJ6syiPERZ5Gi0Qc$D>kuq!SXD(VEqks^Yfn^
z(A=tO)5o^47)H~D>!prS8TEv0i*_>=n+OxcwPqbmQpaeRy}lY7CLDr1%gI<)u~DgX
zBV<;JgaNxxMOZg|5&c_CND_HO;b`3?9z=OCm=U8;qNR)QK!yO+psJ<mxyp9XhzKQW
zwgpPNMnfL@SFna*&T<SyCF=&t6Tvp~9NSDJOjt$Bp^j;Ek!lpG3P(-XLnbDpNrj`T
z!@91)q3FO+Rt6G}Wl7}aoHWG8fHugBQ540JI7qM@YuG0(JnPrCVXys9`^O!f4i_rk
zF^@lTepA2^-KFKK)MsLnJXJpxb++0E5MjT+6%PA_B^p<Mt>1A5YP6*Sp``y%?i$Rs
za$X5JB%Y_)`VS2y(C`I+7Hdj`zlyAW+cLKeI9&$*vAKrmLvxW4lWs4EuBrBpYrS;E
zeLtFvXQtLSud7|_ptF5rIJ7wY;9|UEQM$#he9U$Zvz?c|dEnIkffJiIzrOwYD^GuR
z<5ckns}-E-KetP3sk9xx@1x+x5$DafmRq{Vu80@y^bYq>YX0nt__?-knGd?xZU**~
z(<j$n*j4x{^4^Zi?MHg9FMOIw<I@+`o()W_TwHwgLjUCS-pm`DiNIKQN`Vk?=l96R
zf4zJrz)j!twstlYxw;3prl!AqZQn}p-sRo#YpZ>??hoz!W$8+J{)>(8o)7k1dN;lv
z>RVbs^Mz1g>BLKiZvWUn`4~Lh`sDA4b9X({^73z27mj|ibkg7Iqp9)aJHyipe*nmS
B0J{JH

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-hdpi/google_icon.png b/wearos/src/main/res/drawable-hdpi/google_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc514fbdacab77baad6c4f617f76c9dff9fb900b
GIT binary patch
literal 1968
zcmbVN2~gBl7+$GY*Ro)X9i*+M!J)L0P4<vwQ&t3)b6iAS5zir;1W4IUViI6k(F)qj
zqSdjCNF4>W*jlSq=_o>VypRHd2PocS2ers3En1OU$G*U_qaAy>GugbCeDC}J@4xa%
za#EbPGC-+ND7+Km&C|eroO}%*3jVJtN=m@(MLvF(s8IN>m#;xVCvd$&F}Rztrb?-n
z$vDY5)C9%ZXtmS91GGXB9^vE(GK-cV8=b+hCb+BmAPg~-37$E@f?4=zI+KZa3G{SV
zl9hC2kwyxRm<WYCaX{dpB?59f?5v18O>iGC4%YHx6o&dBQkDshlnp|umSiZJ6KKew
z)*vK?VUWS7rU)BB+H4_^7Sn1_Opj{x2!`Q0Bd*s&?jH=y2~;{h%^d4C26iSmQ<8Wb
zMRRj=)wwz~CuE=+qtS?BT2!k=00I&7Scz~VtQa`JV5UV<V0ek)SV(3hY+SZvf`P03
z8XUZbmKEJ`0ue)<1dnRen5?M}NRb{KpDoz?j8h~^+i3^QN+Q5&JXk)HlQ=Px`x|P{
z>!%EW*jg+e8_)E`;qaIcrI;Kb!yS-kqD5;SPovXlk;@iHIwl9W87Qma@o0f2Bu=n$
zoP8iu$pbD!TAdn$f-MBeu(F7^pEyFB35hnrAa7a(Gay)~Rb#+47(M}P^*Dz0LoFP|
zq~|>os>5~IQ&3Pf6d@7+3Z_Urof8}ckjyxU3>xLx3>fkR5|8HWoB#|1?{s}$SS)w~
zD@p`Q(g|i03{<NbhQdRs30hKX3`4>QgC5cAF+F0_=t+dugxYKxGTmmt3<KxQ9GNZW
zcHlhqKhIAQ7|>jV{keJMmXnJDk7q=Xt~_^7Os5yPS9S*Ks{@=M<@z?kq?}lqg58gq
z=Z-)>ZEhwFNdF<-{V<VBmvRY#j?4hj`VR$#0{2n57yFf<e-+vH?uot~fP-NmFFj)j
zY&?UEX2J9lz?ka#_z|g4cu@)FNNehm+ilHRXVUzK{W9rxjIVOTR-<eBT)bsh`;T*c
z!|lt`Z?5~)i98q<f;F6M$T_|ABc<w0eX<X{pKYJgmNY-`(V<C)%D$b9U;Ay*<~@6Y
zxT}V|$YI|3<&~@QyK9=)jGcki)<5>6z3^Y5D~KYva!}a|bxdd7mmQ7ei6auvPFzx7
zy|J-uI8m}VF0N$s=E{qu(M@4<-}5!JcMbLn8r9NzN>J8~?FjfPcCAqtKlH;2N7)aJ
z5L;AG7+mQ8rtkTJ`q)*A;a5Uk(1k4Ia(?5|kzTu+N>=vlW45H8HlV5g?8&t8UHLmU
z9KYP@dZ(zab_jl{>EXBs7jKNNImkQOM!1-Ht7}#q%zltqU|ShAbu2e;OIdQeGQ?YI
z3m<YkGOky6e_QPZ&Fqe<P1n4<OM4Sv|M_7~ldW*uqL2XI$GSmTwE&uJ>?kW9vp)P}
z+FLh|s?Vo1_0Al%+;PjWvsn{&rRHMKnkdzniaX_}c0FzhU(pr5@!0GmDztTbROzYM
z)}4_r1^XSq4lG>wYI8(&!T0+g=~i@?hE;SOopF5o{rTNX>vlV8_Afb6d)W8xc%Apd
zAarPoPs_4fX;5<c7vqilB9<FdzP=vfza}5e-+QhmCVud0zs{WGd-bZKd&M_qVe|H$
zW13G)bQaEP9l3Z?VDQ=x0#X`PTRX2qclLhs+1c-^ekW4j&}Oe2LsU&IYP4Uf<+~PD
zTBR0UM0-Oda{Ey9l;ZmV(y=`)w!^!N<|MhIR`K2qe{70>ZJn`Ty)RRCm9(h*EI*w&
uw){r%<>2<av{yyz=RHTmdV5H(mm7SlR{K<o&UaPvH#H$9$-E;ft?*AAv)0c5

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-hdpi/handoff.png b/wearos/src/main/res/drawable-hdpi/handoff.png
new file mode 100644
index 0000000000000000000000000000000000000000..d183eeb9f2e761c06061ad3d646255bc10a722bf
GIT binary patch
literal 474
zcmV<00VV#4P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00009a7bBm000o2
z000o20Vd5lGynhq0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0dGk}K~#7F?O5$i
z!!QuNRQ#tSc!X|17=Z~08?Zsc1h4@ap-e!SfNaog02>@H>Pd})<NCX;+9y4wNzcyH
z`OdxzkpaxS1lQmX$H6yPkq<=7meXKOuE3z0)1uV9cVW<UM`=;&9-0IxIsz7SVmLWL
zHx9PHLSHO}e&GKpUr_)szM0Hd>+D=S6p99HNB5o1D4U?7C|Vo4%gi#wi;|sRkuPEf
zHSZ2pmN}KlHrJAU$yI@$UY<&j_HU!PW<3=(%j5)CGk<r&741Fsfb8qY2Cg1rzj9?W
zo#)tTe>;5;ZOP#J!9(o<v!PNf<#!K0ku5lWP`}#*brwMw`)VsDR}8J>+JpC4-hR$7
z*Wo(EN(pWt##mEj5hNaIY;4cEgbjjb7w>etbk2&g0v|{BFQlm&T?7rO>)rzIVO8L}
z2ny>OEOBiV55XiTq$%`<NzezSMeAam`h!(XKHy#ZGPJ<4KIv`2XVW|X09FbGgg!A@
Q7XSbN07*qoM6N<$g7sm;E&u=k

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-hdpi/ic_keyboard.png b/wearos/src/main/res/drawable-hdpi/ic_keyboard.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdb41122ae635c6e97dd7b49ac8d8bff5799e17f
GIT binary patch
literal 1580
zcmbVMTWB0r7@loP(6*71s4a!s<3yy<&UI(A*+aJ_&7>x+lg4z#v|8+$nX|iNcIJ#T
zv)$eJl1j7`5~vVpAFNgj(x<WnL?oC#_@EJ#_|k%+wJ0&R4MNcu@pfh}Lo4ytftfjH
z<~!g2fB)^|@X!-&>$a?87^ZD-Kpmm)N5cD_R{FfgoH;{Z_qqdze1_ThdU(ek{S+z;
zv-Xyi84X6YC!s-X9+^bPeA#v>nqhYCF1yGW!vWB7&T`W1k8_t;V3}$5nS>^4ZXeED
z1LGb(I6jmy#>b45$?o0-c9tO}uyKGu*)BLfET`ETFQn`6v%rEHBp6Gxy`e!csttoa
z;$e{FCC(5<5hPQ*iF9P>`VJtAvLuL#ASs+E!gvZQ3TRv`HRqXGIHK-t7^Ay1n-2mP
z3PPz=;!AO!csW5zrBZ?@3$n~n1m{<r0F^n%?`$%t*f%`O4J_h-kP+#m7^GS1YF&fv
zMzoIKh!c&NP)4pG@nWc{1~iQb=N7#}&A4d@xPWc!1U|(|5!TI<fcSaxH`LMZI}Fg+
zYFcDtRbOm7GT{gP$Eb`(KvqTjnTm^r5$uzqXW;&0)XmONjSKrci~{0i2q`o(HQaO=
z$Z=i-+cjiZPAH=5wj)?Y0Zy|tZ!#w)Ik7t<C7~q31l=l76zfopm{zv3DpY~-_#IGM
zH6{wszk*EzW{GDbD%rA84hyc6V?h*1*hdP)qlT$>@tPN!1_vEKK#qY2)ig_0^Oj{o
zy}Kuw&}pH_MoQw8q^WZ~I_lvPNhxcXrkubyI<FF=80NNl-u$2E4|o=BE>yT{p0MS@
zqJRUIPt#Rt^u$5@Vq;aXK&=iSGQ#>!vqqR$Y_g5d)?G)SPFu=jO8O7!uETti4NAzv
zy*V1K|4>i@bzca3v93h;tH|2F+xoT%r^6szMq`L>qCtioI=wtPrfz;c9Ztq?2G!oo
z=!Yw(KX01^8`Z9B`>OZvtFGN&ZTaE5<;nIPXn%F`{cXwQM@RPj^fr(eew{Ka&SlU#
z(Y5eSEOG9!;~A!viG6Riii^J!z;xWQeqq)uK78q+4a$RzBA<Gk`S?hCK6Z3rcIk~-
z>4mwaT~8UCPHk>~z@IsEm~@p+ZYeU{jrh;AOULB{H{P5%p-#hB56``I`Mr)$mX^0K
zKG&Z3V)$yyg{@m(nz*@l+j_J6`qX`|OwV84aCVKkp1J<*vnR~S*Pg#}j_;UZmggsy
q<16R?INfQV|KQ87=3~FDY^pxpa^<skr#6T4e6W8=y}0M-%YOn9I|<+b

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-hdpi/logout.png b/wearos/src/main/res/drawable-hdpi/logout.png
new file mode 100644
index 0000000000000000000000000000000000000000..1dd0560ab232eeef4b64d22504ec75b7eee654b6
GIT binary patch
literal 1581
zcmbVMTWAzl7@k-SF=S~fw9-P$Vb<D2c4p4(CF>rXx^Xv}wN6ZvElsJ2XJ^jtPO~#-
zIy1>`Qj{8n(uko11WSGC1q=29DMd;v)HYP&gP6vLs)e?B@Il%jwD_bCJ+n8oq&Ej<
z=FFV$eE<Lbw>Jj|b_Lp>Xy-UCkm*kkvG*qbZfj-FW$xrj_F8ZEzvOaU=PCbg*?b8_
zId1LmMs~y-QTHH?nj+R|j))c0W@wJvw!LCwZIpN*M+%0e@VCDDng@oi@Gr(xsM;w~
zH2NnUGCVnu)h0)^gwAh&7Hq2^Mqm;TgNj+QTvSo`DlcMd|F^`0D#ROA_+H;27*Pj7
ziaG?uMOn}wgdm;}b)3UmE*An}7?vd%mE@=ZA&MkWGz#h$&&)Y`9u1{;){U_*g)e%Z
zjU=gDE{o-eNS%TtClUz>hNW;=U<kpTusmE5EH~I-NE26c4BIoP1$;)Fqhp@JGgoUG
zOuI>Ix%D`)h)ES}OR@-kO;w<-HF5TsQ>q%*HHnmnNi5H0Sh<O{i`1iTk^T*JbNfC6
zEVioJw6Ur$rr9*%dVS+eMm->_qTTF-O{5{>(lJLPedEl{ps&V8DTiQ>I$26fjZ6(T
zTn6EY2tk*MHN)~nbl-D?q_Ia7p5-kpz_<W=vT_`SWh8GEU=%@EgQ`?F@)N5;BQlEi
z+y`Y<qhk;MD_GZ1o;oIGk_{6Vh-6y@9y9}qQnW-JW|(;wsd}NRC}X)EwltDSD?C#z
z8itN!sKZ1IYJwb-Wg)8NWg!<MVOE<xI*buL4x_oo`83tW{M<Iq>;LooUdLd~g-Z|2
z<F}k&6sX^DS-K|bJuysPt*=T3sMZ0(nqS`vulb23I$!^7Ja7bRwB;gUr2mla8qB46
zuZ$hiTVT=p4+SML_a(m<Yf7ZQimdM4)3*&c8wUQeIfmFrbC3~>O)rOysUK$(kFgQA
zoJsd)N9I?qeiN7n9m(f+F0?)M^!xhJnMF0cW7k64O6!yF2Jh}K9z6rz?mQCwZdST@
z_?h$HcE0{g_x!r0sU^-j-x0drabj-$nzfa=;K#{_$1f~{10V3A<dq9ssd;wI@e@bd
zfS7#bk9T@+w(o{Fm!8|$3Gd=;*RPL%S(uiOy)yU4^x!9F_8h++n0`&)vhZQ+3lD9W
zIriv{b)UZ{zI9_ZFc(=oy>eO%-MMz|HvtMWGuJMCzkJ)iedW*>rNz+8SNC4t{PPd7
yu0#9I9o{tj*}>$+%ia4wx})^$yOk=m9BkR0-8cn*I&1j@J<~Uk{&dHIsXqbNItZEo

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-hdpi/save.png b/wearos/src/main/res/drawable-hdpi/save.png
new file mode 100644
index 0000000000000000000000000000000000000000..70bf3b46f5244f04cacf27ae651837ff9dcdcd09
GIT binary patch
literal 441
zcmV;q0Y?6bP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00009a7bBm000o2
z000o20Vd5lGynhq0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0ZvIoK~#7F?UvDP
z!Y~kq&s7It1dq@Sni1Hb8KEPz8?+OIPSA9MWP^?nHYgih|C5bm@&L~H2t4?cet`r*
zpMB@UM3ssm%=|?61cV0U7isAph(bpuq(eO2ikVP~h&8k}XN1ySYiTVqgw`$R0-=;|
zzE(MvLg}ux$cC&a6iUT9wkW5OP|AR8NsFusd1ZUCi9<O(X~DxASsk+DFukql*r=R7
zu2N3bAD1(*<xInmHOL#6@7}~oIUh&?hg*T<8SzxcUgDgSS8_Q|aF{LIDDi@n&YA=A
zh4c^^(+}JkiH5=sG%*(JqsRwD4i~@8;Z${O)3hlAYyMu?cK*nsr0M+<hext!M1GK6
zR#|3P3XRD7yh)c*DkMAbNx4m$fmUdwg0f_j(bU(wj4cp4o))`{mr_XH>+dp3P9`-3
jdJ5CDFFh@lN+t3S%)L`z0#;$P00000NkvXXu0mjf!6&vB

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-mdpi/cancel.png b/wearos/src/main/res/drawable-mdpi/cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f9e6e4fba26035f6c3c77e70361ac83d8e889eb
GIT binary patch
literal 268
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL
zyA#8@b22Z19F}xPUq=Rpjs4tz5?O)#g`O^sAr*{or<~?(RS<DeUoYgfg~j?q>4CRr
zg4{Z1{MdQWF=odHmAo@|ECmG~Jf1p%=kw+8C+#MS+k$_dXw`U<e6DX&3Sa3R;nq)6
z`M5GG*Qxkb_Dgw9diKe8qO7Xl&V{V*pJINt9+`4e-b7>H>f@2c<&WoUnOjNsTTk)x
z-rRC1aF6c8pX{5RzG+B`9Q?M)SaHACC7%YTX@3+a?Y9D2=yUq=J+9qs>*IlrW$<+M
Kb6Mw<&;$UWj%NY@

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-mdpi/edit.png b/wearos/src/main/res/drawable-mdpi/edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..99bd70e5685cbce7f395f8309507de1ee823579a
GIT binary patch
literal 267
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL
zyA#8@b22Z19F}xPUq=Rpjs4tz5?O)#1)eUBAr*{oC%)x%Fc4^4pTwXnag@U+fdxou
zge5Tf9AJAsE9BAUO#k19kI&xYxaIui7)CpJ7o8QdTbC_+V8o*HafVDxi^D`KORMP~
zJF1R}PZHb_m^|@9ggT>NfpziRB}}&;{A``)IV-iL{9(Az@(;~N*kx*ap0?Zbu4CEC
zUy-nJ+fp^Bj+06K8yi^7MK?S&dibh#!MEN2KUqIMbbq4cQm>ql2?acLK({h@y85}S
Ib4q9e0O%iJ&j0`b

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-mdpi/google_icon.png b/wearos/src/main/res/drawable-mdpi/google_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..09592e3cc6b2038a646b29df0808ed3466011cfc
GIT binary patch
literal 673
zcmV;S0$%-zP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0yarRK~#7F?NmW)
z6G0SyGux%1h8od}P-R1p9!!y{U=P!R_eJp_9!$=H+LLGn<DvKdgRB>e9<&|>O-4LP
z55{v34k&sN*_sw2&CcuFG@E9pyPMEn`$01E-n{+3d2ePOz%hn^4GZ`ogy6{UB7gt{
zr|0&8VN+}N;{4~jcPN4HLO3?E8Xyyp4TW4+&Pgdp7WgSd2{doev;ZRk)egs*qLjY5
zGG;o$ohOnrP_!G_r2};KGec!@oS#Y{PZY4xBu6R%9w<RnLW^PLtdt5;5GzsVgXM02
znR?rLKOMPzi|d&zf??o;hDPpAT=@lO?yrMYXp^lMk3t?Imch<P`zsZ=6wU)b2jiz(
zr`SBiYP+z!UCU%d{8oROUy0248T80QSSQ;}le`yHhRiK9MgM&Po*p;q70m`WNL4id
zhqhCyxk(}_;nxQu#_U*$G{Pr36lWutgh!i~VJycVlDj$>Q(wv#2knLBtuhV$bK!Ib
zkeUIa_o_V&_xx+{TTjp`dvJBtbsz<zij*OHHs}j1l&J#t^^RQGx*%I<?>P_(0kayj
zt2fFfc~|(v29eRLhA5mV`DAh}w&|n~JKPGdYrzOq)KQx>`ZR{5f>D;aKX<@x&2?im
zKt(R)y-a}+v#)QJ5Ou>8NyGSG7wpZs=kjr}YObZW>oAjm@dl;sKo%JIOylDE?KfWX
z@(^5ldDEpRm#*+dGP@6vx+!&5dQh6Z%m43qva;sGF%FAeguB^?#?7{w00000NkvXX
Hu0mjfO`9hr

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-mdpi/handoff.png b/wearos/src/main/res/drawable-mdpi/handoff.png
new file mode 100644
index 0000000000000000000000000000000000000000..616d6c72694e7a279d97a6b8364c2918669ba1b3
GIT binary patch
literal 376
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL
zyA#8@b22Z19F}xPUq=Rpjs4tz5?O(Ayq+$OAr*{Q!`|{X83@?+FdH!C9bh}eX4P28
z<X*t?2nhQcq+hT-VA<eU%j<qg;hS*Xk4e*=s@`V*es@WzSD~fjAX84O^t=QwHH8%-
z|0Z;IUHus*EEWB!eNIif&<xRT?lq>hvOCnRQy$!mROnj79?5XbETiql^tBD98z!*%
z8ebKE!x%QdA$+ye14h&5CApIGwM;*#3hiN*>9_ejr(U}wC2Rj?_8AKn1R82iXf1O;
z!*<AsdvDo?Z5^HU-*!|TNalOvm~C?V@RO9l$t&0Y;GVJh;W1H5`H6g+LyYb-9{y+&
zb2F{6&@Wrz^0y=R-8XCz^f=JP^l`elU%Jqaz#C6~g^2#$eDry$;m@3(3`U>4?@w=R
R<pc&4gQu&X%Q~loCIAd#l7;{P

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-mdpi/ic_keyboard.png b/wearos/src/main/res/drawable-mdpi/ic_keyboard.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f22bc99ee1d7f7b932402634a24636920284873
GIT binary patch
literal 344
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL
zyA#8@b22Z19F}xPUq=Rpjs4tz5?O)#x1KJJAr*{oL*McqQV_81VSd0?CbYXr*`m|R
zb9ZAQlk7t2DZHoHDwgv*b6lAf@VI~9lcyGT_p~j!T)6)+owGc<$ACSYtv92MZLN0y
z><n!Q3oZWDQ*NEfbjVo{Hglux=A^iZ;R(n0uv;efZQ<8kSQ_<zr|n_s%|C>c4JUd_
z7+kMOE_lRhdtA0f>P!Ais}roIMRSEtT|J<Xb%BLVtfyFZwg>MCX_plj@3%cG`ts)^
z_chau>l-`1JnxF(*(`tgYfI&G{>R5R9@Mm6ks(tXb|?I&c>SiOGav9;Y4v}*TeSZB
lf-6&X^Sk!w&Jy!E$ZQhPr7U>po+QxY44$rjF6*2UngDrbgGm4Y

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-mdpi/logout.png b/wearos/src/main/res/drawable-mdpi/logout.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0df4282b7fc724bfaf4c1affc696a92750bb1e9
GIT binary patch
literal 372
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL
zyA#8@b22Z19F}xPUq=Rpjs4tz5?O(AoSrU@Ar*{Qr(P6nGT><oKF=s|kT-=nk=gtL
zuZ_BZc_EAW0_hHE3nu9!AzaszoL780P(D4o!OY&%i*bhas!{>Ng%2I3ZRDPEN|8-y
z#{!0q#%oJ8Sll*kNq%%^^@%=(1JkZfSt}=0urjleEwbS5jv4JPVgmhY(UX^^q|QET
z&$_PfeAf&a<K_LT91C~0ZfDQicOppO$ez2?W`0tLj@*Ct$!7H!wvxTaKbFk=bBVd{
zU5kW{pvnECGb{Hsmv{1%Z}N#z;+s|d$t(Eb_PHX;3cPYxnWazMjr_YQLdEt)BGb&Z
z9_vnqwKlc02n8E)uwS3YQGH|Y0nYyH@FjDc94eJqd8Nx7-{==_vtbmOxp2qh?}xR4
PfyChH>gTe~DWM4f3xtZ2

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-mdpi/save.png b/wearos/src/main/res/drawable-mdpi/save.png
new file mode 100644
index 0000000000000000000000000000000000000000..be82c2f4172ed45febbcc0252381b2d5b2bee0bf
GIT binary patch
literal 318
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL
zyA#8@b22Z19F}xPUq=Rpjs4tz5?O)#%bqTdAr*{or(EQ1au9G4PiCCvz&Qnk*e^9s
zOJKjyxRL420ig?AOPUMy=A1n0apUM@{kTtu&fh(Ik3}HzBGUsG@1No}dyYChZ_3az
z<YaQnn&rvk#&mCs{dIG}h6VfnuK6{EasJn*(;AB0Iv%rm*T(Ew%$i%H8f8_#Iz*?y
z*-iWL+pHhI%!0Q+JUp|?^vf5=_sQ+gjMduW<9{yPCs(t;|3>D*%Gn9CZ}1k$%r#5U
zHe2__X|{@I)#Y=Y(sL4ju9(93N@@+`yGV~5gFjkDk&&~+7q4!-dvcxPe4zIjJYD@<
J);T3K0RSKld?Ww>

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/cancel.png b/wearos/src/main/res/drawable-xhdpi/cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d4d9a818b096cfed319ab4c4fcbaf27594f4f0f
GIT binary patch
literal 399
zcmV;A0dW3_P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0VGL8K~#7F?UvmQ
zgD?yR-A=#=9f=XxpxuCs!bY$Gqqsp$qzFNA!k3>1pOiN+cM^mUDT<;fN(9XOw(CV;
zwwc>(%87lz$UjzOgp*(0?2&R1$TKoxC(l_T4&)&bC-T?`JE-UXtSJ!}@}8a$*g+FA
zLMT5G5<$dlS0|X$*|ijvM@3YXzZ=nnd}>5f@`2PWi4e*!R2nBHiMW(!!N*@SqD^@~
zM16TrLPR_Ao`?vj{FAUe1lKUN2Ftd}5Ye%t2nq7-MBI?CA0d=qSop`Ll0?Y+qeMFq
zG4i{6>PMu=HxqG3zIp^gzFGuQzDk50G9cw6BR+({4l+o2VT2(h2N94{<w=C090U>2
tBk?Z6P)@e@k~8epE@B`>Q4~dq;0rmkxa~yi2Ymnl002ovPDHLkV1m`<nGpa0

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/google_icon.png b/wearos/src/main/res/drawable-xhdpi/google_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4fcab4bdf80979d2abc5f6bc4f846929b337f1d
GIT binary patch
literal 1207
zcmV;o1W5adP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1WZXpK~#7F?U~PS
z8$}eyzcXt$I1QB}Rfr#Lvk`|L5Q-xxLIRPA{{c)8Lgheg!Hq-94Fo7_RTW2)JCZS%
zwgOahMG#NI1@SAbkhpNjLXpa$5QhZC)ZTr}IH{CS&;GDCBuM@oY_I3-?t3$DzWZht
z7%*VKfP;h~A#Ms`dmb+^jtK$;2wC-acGsO;fLtP62dCOeDJ2r1?*M)k`67sBK};YX
zE@P0K`Q-<sbkQR{2XI3O!H8E>Puu7d<%ILl@?sf15IcZXA+l+o&#9m1ku0vo{pq-)
z5i0=YyqzLmV}uFp4-FN>WSk&UQ4O{8Y2x)HQpSXu{0sXs0-dxWzOv8GmrpJ)I*3W6
z5!lIj8_{SGs7jn9hnCKcb6Msg2hN`DrdGW=uL&K2j!gQfAQYwXoJwK(zMYD!awm{}
zoY#a0FqK~oOC2Aq>T&P<xReb<<i<03M~Ok>#FvZn=!3ujZhw|8ZhiA$Wpil^)a;&Z
z+WAw<Ulegb1P0LhJY82`!fV`vwGSVK{@x3@Czk8uI6%0mVXNLr8=-$&*(OF`{sBX$
zf8S$cahk>fV+_D*rNy3O6-4&MA8~Z*=gzUJV?OAohDi#ej50=rZW%T*^$U*J>-g)t
z`xdZ-P{f4|fqwB)u5>bPw<hy*fU_~JaospFw%$1U%B^dN0OzcZeqrA0>a(j_8B-`o
zI@P#Day~H_GuB?_0Cq1%?#9I-f#ZKpPyoiKsz+=ThXi8)N+yi~a7I)34`IH)ZfY~C
zkWW}*h6?oi*75ACADtHOzYxAKSBv;i8>I?ab+4T98jQK7HnWV9QW}QYfB$`@`7q`;
zAJGb{+ayA$zdaKAw9a4HaMZ9G1MrEAs%K0gFJ;wsA8$|^Z~Xa0$9awFvEq}L3O15}
z^Vz_5uN^;t%yiSmP7nX&9mDL}6qat^zsIJ{tO)CbVDc9?i)y%SQ@c(<>5Q7^BLW~F
zRh=@gHJ-vvf4G~8c<l1?JqID)-Llo!dqFnDPz`DiUC^AlJhMt*c8FQ6z2%jzm1>a}
zG~(iBj)Pqd?0qnoT72462WdhdWJJ7#a0=;+wQ}atOfk$*R0`S0uguJ~Mz5{}Ij>Rj
zSq*Z&V}l5&G?`b1=c3puJJ$z3h3`q8QkzvC8f`7dl*%zq6DlPNJNu@v{yv4wZ|A_<
z$M3q%cJB{QN{2N<?iWr@^;#-p>8dh^gwf6q>mXDxyHTAmDc>3iEgB>5%xTH=7_Uc|
z4?QvTM*%}?&ut(0R9<}NUMI?Vv9=cXJBakg(-^u{D9bm;ov7!;-rUvcWMwQT>YRv-
zs=c^}($_D2Qj2$5k8~7=VJ@N3kSX#?U!ASFh)LfsICLPY*wUjBZ-VP;R~LH37QQ|E
zu|$s~_KHc*k2a+W>h+N>wQY4}`;J^{)PAYUv@`<ONfl?untn~jc<>DvFkryp<R8W+
VkNx`J<>&wa002ovPDHLkV1id`G3WpQ

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/handoff.png b/wearos/src/main/res/drawable-xhdpi/handoff.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a0df3118495b8e09337657b89b7b33a86e50783
GIT binary patch
literal 597
zcmV-b0;>IqP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0qRLaK~#7F?V5{i
z!Y~kq|5P1-5!?w16BH(BHz*s>4PXSi0o{NNU<2p`WP{QP+&jfcY3g1aH;IobpL9x;
zhkZYO+}Q*O#9BKdTauk@w;ae8Tp!wk3Nt-8UggB~*7=qp04|IU2K{r)vTPzfaDy7i
z`8m=!&y1=5C+UG&0mL)X@+jR55s(@q-Mj_?B7=a`T)lu>#F3M|p?wx)?L}aQ=HZ<u
zO774B)*tP~x?)?PD_-%l1#;;HRRSn&Sfe4sER-5G0&KC~n4%#n1h~BagN$dqL&!Sd
zf|eF2r_5s%LQKeuS_EwIeY!LV6rn-@O`ka(W{41>W)R1U=sb|wVs~Lhc8@p=3K0_$
zd9L2<BNFofUEpsRSI(w-qmM4sR(5&zUF^ICIKOe-=ppbGes)~BmQy)f#L#m(?b|>T
zH@GyV5{3@^!<f?LoNVT1C@(6~>0g|GC!6|ao-$fmV2%jq8BM9g#o0Xqoo7^ZA#(P}
zfr?H?eBR_;HA_lqph^rYvec;Bm7sC(0?)Pzb*~L#`L7#W9P(FapT>z_v;eXt6fn#}
zsTl;MCPcs|(jwL$B4CfSh)c=ZPYv99_JB11)^ilTlOCvT0hgCoH=Oz)clEY|TX3)4
j?s1o#ILh0=&uzW{y47I2|2C8b00000NkvXXu0mjfv4;DI

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/ic_keyboard.png b/wearos/src/main/res/drawable-xhdpi/ic_keyboard.png
new file mode 100644
index 0000000000000000000000000000000000000000..40b2f54b10fbb8f22f94f11497b98bf48626b9c4
GIT binary patch
literal 486
zcmV<C0U7>@P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0eeYAK~#7F?U;>K
z!Y~lWuRI4}1H%O91~36Kfx3YkSSN6V;s!E-I04;&jGz<5J5BUBs%?e$lED4m`#&zd
zgx<Y;HUNsED2l>x&J9ubsEtd9HL5}x8E+wizrddt)DY6dqUJ?W)ZxK*0zNwm-ay*C
zp)N5AON9Y*l#qV#1dWcnP~bhVfjkl*EcU>N44#04jKBmwV;?}~WS_uUkGjvOB`ecp
zdSvBWQU4k>@%AffA^a7yX;Qwk@(gtaedw^6l%l@j&W8V6Fn87RJ|lc(TQH%n&VktU
znFC|&xf@pAI&KIban5Yh;OETH&*#7xI->hPZ2Al#>&2NcdnJ4ZevT$|0IUCKTl+dq
zZM)&xDMfu<Mh}4|5F1@aW1|TmqvD@XTiBD6+KGQd9>n^v_x+QuLa{lj1T5r(4F*qO
z3Hh)JhP>QeL%KK90gIaMT<-b@Q%HL#(MQib1W#;DVt?;WNj$;s7gS6v>H)rX{gmQT
c6y@ak0AB9e<&e=lG5`Po07*qoM6N<$g6K!jpa1{>

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/logout.png b/wearos/src/main/res/drawable-xhdpi/logout.png
new file mode 100644
index 0000000000000000000000000000000000000000..5bb2a3c3bd5c046568b6c0b369d3c749135085cd
GIT binary patch
literal 554
zcmV+_0@eMAP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0l!H^K~#7F?U~_i
zgD?<<A5s1{8`Rw(BP1JSgmi<Bz$R@+=mcbhZcvYq4d}asN)(KR&4Fu`PdZu14!jr6
zXAHo~%KxVDb=Gx#U?cH}*b5ZJGnR(J4Wp_Rz|3sn5YMJ!7-T>%g=pXlisG3<1!iQ^
zK4@~@AR{)N;{!5dJ96A7;{$(?(FT~xC6r;x?%7;<Zi`4ZNJJxEs$JDoz9^CyXo=t9
zUNoXjEN-A9{s)6d6N?&XEs{G&_pL9~#G(e8$?B_S27x9PPa&E(vw8OnF$ge`WD;wd
zNLEI*OpIN~yiBO$CF6l{8t6B;n>Y?Fb}9zQE9QHSGVqv4mO_CT45U*o1_T3#iJS~L
z$;p6a^yWb>1}q%n1r-B4v79^#{`?J*;?)eq!U-wm_v{&B;Sn#S+|W!GFQnSgsE8L*
zY-rTP3n?}<C(jUz0P#YK4b72pb#&kQLc|LxHZ<~%scXU_LcEY_L(?{45h-5KdYleM
zOvocLCcfAjYhcfdm59LiMz6UOdQjv`tqf+SI|p?Ckp=i=fVcF*=7NlHRU!E(XORg#
s1FglzA_JUNs4?+WD|}{MSy`EvZ{y}hY(v8HH~;_u07*qoM6N<$f)v~0b^rhX

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/save.png b/wearos/src/main/res/drawable-xhdpi/save.png
new file mode 100644
index 0000000000000000000000000000000000000000..c76a1d6ca957e63025827846a4ebd57fa6440475
GIT binary patch
literal 553
zcmV+^0@nSBP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0lrB@K~#7F?U~_i
z!Y~kpFI5L%1V-ovWCTXY2;G2o13H1j1f>&@4d@1GCx8vEcd{+4Dg+Yy90&Q6p7?{3
zd%kC%5dfJ?CX*D1SdmJYD^z@qn%0<E!klmnSWYB08zUVCTn^k7NSPZ3F!^}hX~0EI
zY2*p~sYq=y@fy*AN#hlw1OHi)6zHxf(hCS8VZfy#9VO!>ZNO5Jl!@0SWV~V-uq;V$
zaEVt5p2RlbQjs`X$Kdhejb~00e!&Uj(4y2#;Z~EjX0>9VQ0hj^D}=f`wOKVuT9h7+
zsN?pEI&P9i6iN?AdclIUM%^8$y`#{HSFlrviwAw)vsR=9gy&59C4EB(P;c%H%EkxH
z^VeN96fgj@%KV^}`IJ~?3$ON$v@eRHx%Q=-229?#;L=DMF8qVErNYlJ6x17$PnA!M
zH^gjAO7I2!e-8|S7l;Ss=qvX#Oaq@HUobW%4zUe1r1!o}Ig}U%?53=#@E-__q=5!>
zOlsel^dVuOfxt28Ba{KZv)cn-0}WiJWz@ngV+?Sid(tjeO!^pNV6vDDqGJ*tFyTKu
ru65w9n_!ZlzT-<?lQWr2=7IPF<-Q!^2&VsD00000NkvXXu0mjfidp1>

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/cancel.png b/wearos/src/main/res/drawable-xxhdpi/cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f5a8854054d8a647f03567e0fd6e758aa868e4d
GIT binary patch
literal 508
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ79h;%I?XTvD9BhG
z<nF|<?wrg^AcrO0(btiIVPik{pF~!m+(b_o$B+ufw=?eM9yZ`%d+K*V(8ekJ#1qMd
zcN=alc+0Yer=vk`(X~mc6GQeh|B!fCac;gW6VMzm*lzGSdXB9|v4xD@K_Smq#(bG>
zUUE}nz9lsJcm;H(9DS^>DQc-Lm%en_smPBjrp{7IKe{+HYsDR%{^<ed!)I-NQ~2(V
zVUX49dFSj-m#_Gor_QzSSmkr874A#g%Fi7<{!k`uk>E++IX)FpD&>VnA0JM<b4<|9
ztw`QoLNIfth0}SD(?<n^R32Gr^k0!^KXY7APiIGbW$uR~t*)J~70L@+j(Pl7?lUkD
z+S#wn)8TUZh@h3*qNk5IWR)&%Ds17N=%MU)n%UTZtL8{u<44ulwvWc~Z6Dn?@;nY(
z%=0*HE6?LX_nC6spH@w*(mS@=RcfQadZElGN^fj0^|0Q^UNZC18{J852GyNQG*4Yq
zjue>l(%^C9P33dBx3{^!aItzl?c6r^qoO&xvhLYLJzeGj3V_*KsYf5LnbS2zw10U@
q(W;;@n|YI-d|S{X$`1?Cw|^L7&%IqF|AzT8NXXOG&t;ucLK6V~g3=!V

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/edit.png b/wearos/src/main/res/drawable-xxhdpi/edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac6c76cd1ea5e55df8caccaaaed5414498875076
GIT binary patch
literal 527
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ79h;%I?XTvD9BhG
z<nF|<?wrg^AcrO0(btiIVPik{pF~!m+!9Y0$B+ufw>RJV9ySm-_EBAwxum7<0EcX&
z;0*?|13nDWC2VR9f;SfA1ejUWEUIx><Q^yUTd(rprIkUK`M>&4O)_Ul?lBbG%E#^H
z^6lqStMlLfT-)t;y;MG;Sn`?Pc~8CXQ_{Olr-|21sFVHtX2UYJ2W$8<S<Y2WP<x;w
zuc@!&IkT_Z<&x`MarY(OqHa}3g|vH0x>dsjG@q^a*!Mn+|9{OgmP?!$C*9xvNy@|8
z#q;02=V!WFG&=Wk&f$L9!Qr`I_LGbUdxd|Sth|@<+Xt4C<=eDcOZd;9+|v9!WC_dp
zlV5^=iU4WRLz3N79_&11;XF~u#$4DhUgduMo%21HxliU!El5%dJ=WQJh2!~hTbt_=
z>IaLD7%KG%7WQ-`yT~X%k`O%JVc~{F=qL9*kKICZwivG4TIKTTMrmx*WU~)bwPnr<
zPq3Cb%RRwc<}CAsXqmO96S8I2s!phuSt}aAA+we>Ktg7%S%8MjTD1TRnYCg89x`j$
z0wQE`^A=pNxHYx#t?_y3W8Wtg&O0cP+_TZGmhm0Kjzs&U3*Er@WAJqKb6Mw<&;$Vg
CqtF@v

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/google_icon.png b/wearos/src/main/res/drawable-xxhdpi/google_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e964638865a7e5b515080d18f0b9af3667f33e8
GIT binary patch
literal 1729
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
XsoZV|fu#e*00000NkvXXu0mjf;prQw

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/handoff.png b/wearos/src/main/res/drawable-xxhdpi/handoff.png
new file mode 100644
index 0000000000000000000000000000000000000000..6852bf95ea790200fcc89cb023058c4069a06e6a
GIT binary patch
literal 803
zcmV+;1Kj+HP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0=P*;K~#7F?VOKo
z)G!o>e?bgzBZLVk8>AC(8#GKnnV{_i91{>GpiDrRfNs#+05(Y9Q(UQP<9o5=B+l#m
zBrB)Xy+oh<-|t*tB3;+*=u%VqNa>8y4ta1#=?|qtQ4~k40m-Q--FNwOg{7f~UUb{y
zJ0d6$0X?jw%RROSSGO-A{}3yP<&@Ya=On2eoB0g_AvqPcD~GuV$s8<*sIYDJA(>+Y
zmDn~x!;lz3uL=_+V1fipkbnsiFhK$)NZ>8f^WUYl*dgJP%N&AkX|D4LE8(U>zmW*5
zVghrNpta%Z-69d{1X1<orPgyK!m5~n2@)_t0wzen1PQ1TM1#aDO8>fkuWtFhF!vJ8
z9Q#iR-m4yXm&uYem7r?i-t|;Tngks^_gT_cM50O10e!&25SOu4UyUG|V(=V{rx-p-
zb&Mocy%<ZP^npJ9@MH;=q;ecYl4_im^t0>Znnbdk&AXTXjA^^L9r~q@ArX6bU!3*l
zy4>*>^KWr;@K+^8dSq9{7LFbf0~vB`gVtQ|e?fMF+=}2Gmf=>)kZT*njVBlX64T&@
z-q%}w3yCxvO|FyGXYaUkUAd2D?02bKw0A><mePAq7A`rL7>Ty^AW6<mh#W?ZAQzg<
z<EK+{t`Uf)62v8=^!zPK4x>qsueXYp!)OxJ4&0k0hf&jukq91s@W;oo5BF9FOhi>T
z&ywiUAR)FdCSZaDOpt&H5->pm8Yip#!{U=0h1A=PjzH5GqsU{R3W=~PCNM_{+Pj5!
z70e+hX{7twSQQg6K>{X7zyt}HAORC3V1fi<1Z5Rm5Wz7dbBrKy!#{J{kj$~i<M2-&
zD{PZ@AxCz_wn0IM6lKKCV&|E8LjQB7!P3w}&$?|K@)i`Z@RX=FXh2kr{$!_IjtS(R
h_DJa$rDjUCdH}y}(dIJoPaXgO002ovPDHLkV1mp!Ul9NR

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/ic_keyboard.png b/wearos/src/main/res/drawable-xxhdpi/ic_keyboard.png
new file mode 100644
index 0000000000000000000000000000000000000000..7013815835b4326c158722204c4ca4aed2d32a5b
GIT binary patch
literal 605
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ79h;%I?XTvD9BhG
z<nF|<?wrg^AcrO0(btiIVPik{pF~!m+$T>L$B+ufx3?Q}n;b;g9<;w?C}W<p;O>I5
z=DYy23w{ZA9LzJ!U$DJmD`NsOckJW7bl~;D#||D({^?g5KDv6rzUcT%SwW!5K)|EB
zs`{dY@zZwJ>vLYu%=UU*@X)HLw(#v@4XcUzeCY>E%^puLQnkBzqaaMpMmt<=;_JzW
z`K7rov&ZKx{l8a4pk4U$;XdtU1~>O*9#f3{#4LO<!S7*P@=eE#NE-#_D)kCYyNT0p
z%sgg1WqavE?>C0^O3X$qM;QM;HBwyB+91N=@zLS#9F5uMcia#(6gz%RG<W`vdq+0r
zubbcXZFS%Ci+vxrudZA_Hz($@S>c}Ypv(I%S7vn8_j~&^g7iX&m2J$+q~ru9FfnT8
z8D6~+z9(%t->2P6&v$JzOue5bCcEQO*Eh~m>;AGHdmmG$cB~qA`I*kT5wtC95&uuF
z9rt)HdY+HcEzCZUa=J8Vmtn~zpy^2+b{Qw9JI${RSYNRCMT6Z5W~Lwog;t&w>(70e
zH^pcIqb#SF<cS78mZhx`MKiX47yWk4_R7)&>g%pQy0YR6=Ptd2@xeQ`72W%hFS0xD
z8HeGLt#?iYz5bOPmv!v?yUysarwiU%^l1L}ys=J1_Hm!HwMK5&?rLxpN&RHqdZ1dU
SR3)zo#P@Xdb6Mw<&;$Si(f;-T

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/logout.png b/wearos/src/main/res/drawable-xxhdpi/logout.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f21b581004c083e9a61275a4e798fbd467e963b
GIT binary patch
literal 719
zcmV;=0x<oFP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0%S=<K~#7F?VN#a
z!Y~j;Kd1vRLN{nfC>ziTfC(xlAZ*YLnr^@bWdu3_Y*03E?}$Yu6vr{ej!(WPMMeaa
z<H>gJ5(hw06h%>_GD0B6m}hF95s&R?G&(^NBxOR|nzkPkpGRcGgYN?r@Qj)d+9oKF
zPC+DRPEC!18M}7au3n>X#vS{<ptK93-t$7uBNS&3nn5|^67&S+jO#4c=ahc3TY1nN
zbm)=LEl>bs2*xzo{TdPRX41K0#Z>k+sD9fZ6}b;F+jFjo+LNvWIOHnGAt$Y*Tm^aL
zq?44Rpq_HlNXktR9cyO7nd1(KIL*@;YD>*0!l>^dNlYF@k`@?1lBh&+2ub2H>C}=$
zmKrG~iLJ#_NfKSGrjV4RST)Vf#y7;lpt&v;a$AZev0$&<RMk8Ozd&B}k|cVF-2v}#
zD_s!NDM<x2I3=l|KU!D1sGx==P1beW4i(fPhbdi9ryM3#9&|*!l_H#D-EynkE5}K0
zR}?$q<dtuG6V9UVF~klrmP5@B;p+&3dX7jzspK%?1f`V2h!T`q4kJd;5ONq1f`*dA
zNa;bG=Y+~x{Z|en<;G!6O~~?=4SnYwvB))1q+?b+;;ImvTm{+KszK%0AP%_-vhh`e
z$*}<(au#G`tWwAkyGD^FVHR|GjYx<U#KaVHIY!%?JjCFCRwLFz@+tlBBQn9&gTCPx
zG(iCm*|`$MBa|~PL0c$iS_RP@utQTE7Ef0#wu0goM7?NF%@T#vS<Txj`V|FF+TP0@
zc8&5B%}TD~9-zDBuPI&-_kmw|e@&q%ilQi4@(UWyDP`&GxHSL(002ovPDHLkV1oLh
BELQ*k

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/save.png b/wearos/src/main/res/drawable-xxhdpi/save.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf70572edfaa5ea797fc78bb4e07bc5f93fa48a0
GIT binary patch
literal 796
zcmV+%1LOROP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0<lR%K~#7F?VI6o
zn?MkSpE4;RCD1|Kf$1PAfew-uTtVy#Bv)Xk0$m4j2d0E{aNeD}GiO;k0Xn!v>^HN6
zX2h>g`<4YpfTAdhq9}@@48dA^LsdgL4#{b(<CQ-{`A8(lMxwS<6_lfbVz#S~-x)!1
zSMhn@ur_)MT5tRY3W|B6`iX1j0zq+CHB0ZRFPM&sYD@KR$?=;~P=E(`L&Y7nw+q{;
z<`5K9Q*D<NzqthkD!BN)N{?SDK`{*k$4`QwK#eYbzoc}PBte0S>K<MEZcq@3f?^uD
zHKADiqzekv=;HTh&iE}wP@tmvjV^vQCT3}ZVj8Nwo%n&?=F}IyjrrHQr7Aiod(u)F
zs=Li*(;^d_J|}ruwJ#P{K{h+8M-pXlA-x10;xD~5)enD^N(<LfJB(zMphNty<Yz!q
z<Je+k{IUp&iQ*W#OWNbuXR3$3@yjmg5Z_%~w~!Ubmg<h`nPmMxb<*U5Vyt_(U!#j-
zh4Qc*?y9U;zbshy_O|i6j0E=fVEO!t0@$vTxOi4oD9;PkUw?dOwut#(Cd{E4axif5
zGRMB0Opx!AFl+cI>1xJv=Yi@zHK3WSf^4@BeTU2i(!j-NcTP;;B0<*eJS>Fg2rr0I
zUqKrrVw7T#ARikR5u{X*OYaz^I4j70yzi3SB>_YAh%*adUs8`dYC1eYz7QrXds*(_
zV^Vui1^IHa#3)6PMKJ>gBZux#mL!NfB+M3rnOK6L$zzm4vLJ(*Vw6IfpwKNGqZbH3
ziXfK3^JP~eMkz`QG7u1>6eR=|9lArAQ;@;HJ822bA!yKB1ZhkqXi+grkz0^~6JwSx
zCXhqWWOvdMxJ1y^#Ap=u^j{G^y*s*Q`gTx}J821=6V$?qS!aw=*fsu1PEiy^Q4~c{
a`tk;|B<a@<o9G<?0000<MNUMnLSTZ7{8-We

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable/cancel.xml b/wearos/src/main/res/drawable/cancel.xml
deleted file mode 100644
index ce53ea724..000000000
--- a/wearos/src/main/res/drawable/cancel.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:pathData="M2.3249,15.85L0.2,13.675L5.8499,8L0.2,2.3L2.3249,0.125L7.9999,5.825L13.675,0.125L15.8,2.3L10.15,8L15.8,13.675L13.675,15.85L7.9999,10.15L2.3249,15.85Z"
-      android:fillColor="#ffffff"/>
-</vector>
diff --git a/wearos/src/main/res/drawable/daily_square.xml b/wearos/src/main/res/drawable/daily_square.xml
index 954ecadf9..dfb2abba8 100644
--- a/wearos/src/main/res/drawable/daily_square.xml
+++ b/wearos/src/main/res/drawable/daily_square.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <solid android:color="@color/white" />
-    <corners android:radius="@dimen/spacing_medium" />
+    <corners android:radius="6dp" />
 
 </shape>
\ No newline at end of file
diff --git a/wearos/src/main/res/drawable/edit.xml b/wearos/src/main/res/drawable/edit.xml
deleted file mode 100644
index faddfce42..000000000
--- a/wearos/src/main/res/drawable/edit.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
-</vector>
diff --git a/wearos/src/main/res/drawable/google_icon.xml b/wearos/src/main/res/drawable/google_icon.xml
deleted file mode 100644
index 25d3aa10c..000000000
--- a/wearos/src/main/res/drawable/google_icon.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="48"
-    android:viewportHeight="48">
-  <path
-      android:pathData="M43.611,20.083H42V20H24v8h11.303c-1.649,4.657 -6.08,8 -11.303,8c-6.627,0 -12,-5.373 -12,-12s5.373,-12 12,-12c3.059,0 5.842,1.154 7.961,3.039l5.657,-5.657C34.046,6.053 29.268,4 24,4C12.955,4 4,12.955 4,24s8.955,20 20,20s20,-8.955 20,-20C44,22.659 43.862,21.35 43.611,20.083z"
-      android:fillColor="#fbc02d"/>
-  <path
-      android:pathData="M6.306,14.691l6.571,4.819C14.655,15.108 18.961,12 24,12c3.059,0 5.842,1.154 7.961,3.039l5.657,-5.657C34.046,6.053 29.268,4 24,4C16.318,4 9.656,8.337 6.306,14.691z"
-      android:fillColor="#e53935"/>
-  <path
-      android:pathData="M24,44c5.166,0 9.86,-1.977 13.409,-5.192l-6.19,-5.238C29.211,35.091 26.715,36 24,36c-5.202,0 -9.619,-3.317 -11.283,-7.946l-6.522,5.025C9.505,39.556 16.227,44 24,44z"
-      android:fillColor="#4caf50"/>
-  <path
-      android:pathData="M43.611,20.083L43.595,20L42,20H24v8h11.303c-0.792,2.237 -2.231,4.166 -4.087,5.571c0.001,-0.001 0.002,-0.001 0.003,-0.002l6.19,5.238C36.971,39.205 44,34 44,24C44,22.659 43.862,21.35 43.611,20.083z"
-      android:fillColor="#1565c0"/>
-</vector>
diff --git a/wearos/src/main/res/drawable/ic_keyboard.xml b/wearos/src/main/res/drawable/ic_keyboard.xml
deleted file mode 100644
index 402bc4e09..000000000
--- a/wearos/src/main/res/drawable/ic_keyboard.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="18dp"
-    android:viewportWidth="24"
-    android:viewportHeight="19">
-  <path
-      android:pathData="M3.025,18.1C2.175,18.1 1.4583,17.8083 0.875,17.225C0.2917,16.6417 0,15.925 0,15.075V3.025C0,2.175 0.2917,1.4583 0.875,0.875C1.4583,0.2917 2.175,0 3.025,0H20.025C20.875,0 21.5917,0.2917 22.175,0.875C22.7583,1.4583 23.05,2.175 23.05,3.025V15.075C23.05,15.925 22.7583,16.6417 22.175,17.225C21.5917,17.8083 20.875,18.1 20.025,18.1H3.025ZM8.4,6.725H10.675V4.45H8.4V6.725ZM4.45,6.725H6.725V4.45H4.45V6.725ZM7.375,13.675H15.675V12.225H7.375V13.675ZM12.375,6.725H14.65V4.45H12.375V6.725ZM8.4,10.65H10.675V8.375H8.4V10.65ZM4.45,10.65H6.725V8.375H4.45V10.65ZM12.375,10.65H14.65V8.375H12.375V10.65ZM16.325,6.725H18.6V4.45H16.325V6.725ZM16.325,10.65H18.6V8.375H16.325V10.65Z"
-      android:fillColor="#ffffff"/>
-</vector>
diff --git a/wearos/src/main/res/drawable/logout.xml b/wearos/src/main/res/drawable/logout.xml
deleted file mode 100644
index 1d6f5b75b..000000000
--- a/wearos/src/main/res/drawable/logout.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="22"
-    android:viewportHeight="20">
-  <path
-      android:pathData="M3.8,19.8C2.95,19.8 2.225,19.5043 1.625,18.913C1.025,18.321 0.725,17.5917 0.725,16.725V3.275C0.725,2.4083 1.025,1.679 1.625,1.087C2.225,0.4957 2.95,0.2 3.8,0.2H11.025V3.275H3.8V16.725H11.025V19.8H3.8ZM14.975,16.325L12.775,14.125L15.375,11.525H7.6V8.45H15.375L12.775,5.85L14.975,3.675L21.275,10L14.975,16.325Z"
-      android:fillColor="#ffffff"/>
-</vector>
diff --git a/wearos/src/main/res/drawable/save.xml b/wearos/src/main/res/drawable/save.xml
deleted file mode 100644
index 5b1064846..000000000
--- a/wearos/src/main/res/drawable/save.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:tint="#FFFFFF" android:viewportHeight="24"
-    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
-</vector>
diff --git a/wearos/src/main/res/layout/activity_rya.xml b/wearos/src/main/res/layout/activity_rya.xml
index 9a996bbaa..ed3ca84d5 100644
--- a/wearos/src/main/res/layout/activity_rya.xml
+++ b/wearos/src/main/res/layout/activity_rya.xml
@@ -40,8 +40,7 @@
             android:layout_height="wrap_content"
             android:text="@string/check_on_phone"
             android:drawableStart="@drawable/handoff"
-            style="@style/ChipButton.Icon"
-            android:gravity="center"/>
+            style="@style/ChipButton.Icon"/>
 
         <LinearLayout
             android:id="@+id/task_view"
diff --git a/wearos/src/main/res/layout/activity_task_detail.xml b/wearos/src/main/res/layout/activity_task_detail.xml
index 7d23a7d78..c302d47cf 100644
--- a/wearos/src/main/res/layout/activity_task_detail.xml
+++ b/wearos/src/main/res/layout/activity_task_detail.xml
@@ -21,7 +21,7 @@
                 style="@style/Text.SubHeader1"
                 android:textColor="@color/watch_white"
                 android:gravity="center"
-                android:layout_marginBottom="12dp"/>
+                android:layout_marginBottom="7dp"/>
             <TextView
                 android:id="@+id/task_notes_view"
                 android:layout_width="wrap_content"
@@ -37,9 +37,10 @@
                 android:textColor="@color/watch_gray_200"
                 android:gravity="center"
                 android:drawableStart="@drawable/task_icon_streak"
-                android:drawableTint="@color/watch_gray_200"
+                android:drawableTint="@color/watch_gray_10"
                 android:drawablePadding="@dimen/spacing_small"
                 style="@style/Text.Body1"
+                android:layout_marginTop="5dp"
                 android:textSize="12sp"/>
             <Button
                 android:id="@+id/edit_button"
diff --git a/wearos/src/main/res/layout/activity_task_form.xml b/wearos/src/main/res/layout/activity_task_form.xml
index f730f5594..8d7e7a697 100644
--- a/wearos/src/main/res/layout/activity_task_form.xml
+++ b/wearos/src/main/res/layout/activity_task_form.xml
@@ -1,126 +1,120 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<com.habitrpg.wearos.habitica.ui.views.HabiticaScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools">
-    <com.habitrpg.wearos.habitica.ui.views.HabiticaScrollView
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_boxedEdges="all">
-        <FrameLayout
+        android:layout_height="wrap_content">
+        <LinearLayout
+            android:id="@+id/task_confirmation_wrapper"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <LinearLayout
-                android:id="@+id/task_confirmation_wrapper"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:visibility="gone"
+            tools:visibility="visible"
+            android:gravity="center">
+            <TextView
+                android:id="@+id/confirmation_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Text.SubHeader1"
+                android:textSize="14sp"
+                android:textColor="@color/gray_200"
+                />
+            <TextView
+                android:id="@+id/confirmation_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Text.Body1"
+                android:textSize="14sp"
+                android:textColor="@color/watch_white"
+                />
+            <Button
+                android:id="@+id/save_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:visibility="gone"
-                tools:visibility="visible"
-                android:gravity="center">
-                <TextView
-                    android:id="@+id/confirmation_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    style="@style/Text.SubHeader1"
-                    android:textSize="14sp"
-                    android:textColor="@color/gray_200"
-                    />
-                <TextView
-                    android:id="@+id/confirmation_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    style="@style/Text.Body1"
-                    android:textSize="14sp"
-                    android:textColor="@color/watch_white"
-                    />
-                <Button
-                    android:id="@+id/save_button"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/ChipButton.Icon"
-                    android:text="@string/save"
-                    android:layout_marginTop="20dp"
-                    android:layout_marginBottom="4dp"
-                    android:drawableStart="@drawable/save"/>
-                <Button
-                    android:id="@+id/edit_button"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/ChipButton.Icon"
-                    android:text="@string/action_edit"
-                    android:drawableStart="@drawable/edit"/>
-            </LinearLayout>
-            <LinearLayout
-                android:id="@+id/edit_task_wrapper"
+                style="@style/ChipButton.Icon"
+                android:text="@string/save"
+                android:layout_marginTop="20dp"
+                android:layout_marginBottom="4dp"
+                android:drawableStart="@drawable/save"/>
+            <Button
+                android:id="@+id/edit_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/ChipButton.Icon"
+                android:text="@string/action_edit"
+                android:drawableStart="@drawable/edit"/>
+        </LinearLayout>
+        <LinearLayout
+            android:id="@+id/edit_task_wrapper"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="38dp"
+            android:orientation="vertical">
+            <include
+                android:id="@+id/header"
+                layout="@layout/row_section_header" />
+            <EditText
+                android:id="@+id/edit_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:importantForAutofill="no"
+                android:minHeight="52dp"
+                android:paddingHorizontal="18dp"
+                android:hint="@string/task_title_hint"
+                android:background="@drawable/row_background_outline"
+                android:inputType="textCapSentences" />
+            <TextView
+                android:id="@+id/task_type_header"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:layout_marginTop="20dp"
+                android:layout_marginBottom="12dp"
+                style="@style/Text.Body1"
+                android:textColor="@color/watch_purple_200"
+                android:text="@string/task_type" />
+            <LinearLayout
+                android:id="@+id/task_type_wrapper"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="38dp"
                 android:orientation="vertical">
-                <include
-                    android:id="@+id/header"
-                    layout="@layout/row_section_header" />
-                <EditText
-                    android:id="@+id/edit_text"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:importantForAutofill="no"
-                    android:minHeight="52dp"
-                    android:paddingHorizontal="18dp"
-                    android:hint="@string/task_title_hint"
-                    android:background="@drawable/row_background_outline"
-                    android:inputType="textCapSentences" />
                 <TextView
-                    android:id="@+id/task_type_header"
+                    android:id="@+id/todo_button"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:layout_marginTop="20dp"
-                    android:layout_marginBottom="12dp"
-                    style="@style/Text.Body1"
-                    android:textColor="@color/watch_purple_200"
-                    android:text="@string/task_type" />
-                <LinearLayout
-                    android:id="@+id/task_type_wrapper"
+                    style="@style/Chip.NoPadding"
+                    android:gravity="start|center_vertical"
+                    android:paddingHorizontal="20dp"
+                    android:textColor="@color/watch_white"
+                    android:fontFamily="sans-serif-medium"
+                    android:textSize="14sp"
+                    android:text="@string/todo" />
+                <TextView
+                    android:id="@+id/daily_button"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical">
-                    <TextView
-                        android:id="@+id/todo_button"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        style="@style/Chip.NoPadding"
-                        android:gravity="start|center_vertical"
-                        android:paddingHorizontal="20dp"
-                        android:textColor="@color/watch_white"
-                        android:fontFamily="sans-serif-medium"
-                        android:textSize="14sp"
-                        android:text="@string/todo" />
-                    <TextView
-                        android:id="@+id/daily_button"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        style="@style/Chip.NoPadding"
-                        android:gravity="start|center_vertical"
-                        android:paddingHorizontal="20dp"
-                        android:textColor="@color/watch_white"
-                        android:fontFamily="sans-serif-medium"
-                        android:textSize="14sp"
-                        android:text="@string/daily" />
-                    <TextView
-                        android:id="@+id/habit_button"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        style="@style/Chip.NoPadding"
-                        android:gravity="start|center_vertical"
-                        android:paddingHorizontal="20dp"
-                        android:textColor="@color/watch_white"
-                        android:fontFamily="sans-serif-medium"
-                        android:textSize="14sp"
-                        android:text="@string/habit" />
-                </LinearLayout>
+                    style="@style/Chip.NoPadding"
+                    android:gravity="start|center_vertical"
+                    android:paddingHorizontal="20dp"
+                    android:textColor="@color/watch_white"
+                    android:fontFamily="sans-serif-medium"
+                    android:textSize="14sp"
+                    android:text="@string/daily" />
+                <TextView
+                    android:id="@+id/habit_button"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/Chip.NoPadding"
+                    android:gravity="start|center_vertical"
+                    android:paddingHorizontal="20dp"
+                    android:textColor="@color/watch_white"
+                    android:fontFamily="sans-serif-medium"
+                    android:textSize="14sp"
+                    android:text="@string/habit" />
             </LinearLayout>
-        </FrameLayout>
-    </com.habitrpg.wearos.habitica.ui.views.HabiticaScrollView>
-</FrameLayout>
\ No newline at end of file
+        </LinearLayout>
+    </FrameLayout>
+</com.habitrpg.wearos.habitica.ui.views.HabiticaScrollView>
diff --git a/wearos/src/main/res/layout/empty_task_list.xml b/wearos/src/main/res/layout/empty_task_list.xml
new file mode 100644
index 000000000..15168f9b8
--- /dev/null
+++ b/wearos/src/main/res/layout/empty_task_list.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+    <include layout="@layout/row_section_header" android:id="@+id/header" />
+    <TextView
+        android:id="@+id/description_view"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        style="@style/Text.Body1"
+        android:gravity="center"
+        android:textColor="@color/watch_gray_200"
+        android:paddingHorizontal="@dimen/spacing_xlarge"
+        android:layout_marginTop="36dp"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/row_habit.xml b/wearos/src/main/res/layout/row_habit.xml
index 1b878f9af..3984c6a48 100644
--- a/wearos/src/main/res/layout/row_habit.xml
+++ b/wearos/src/main/res/layout/row_habit.xml
@@ -33,7 +33,7 @@
                 android:ellipsize="end"
                 tools:text="Task Title"
                 android:textColor="@color/watch_white"
-                style="@style/Text.Body2"/>
+                style="@style/Text.Body1"/>
         </LinearLayout>
     </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/row_todo.xml b/wearos/src/main/res/layout/row_todo.xml
index a5a9dc7ff..58c4fcb43 100644
--- a/wearos/src/main/res/layout/row_todo.xml
+++ b/wearos/src/main/res/layout/row_todo.xml
@@ -34,7 +34,7 @@
                 android:ellipsize="end"
                 tools:text="Task Title"
                 android:textColor="@color/watch_white"
-                style="@style/Text.Body2"/>
+                style="@style/Text.Body1"/>
         </LinearLayout>
     </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/wearos/src/main/res/values/styles.xml b/wearos/src/main/res/values/styles.xml
index e551a3830..db0021c85 100644
--- a/wearos/src/main/res/values/styles.xml
+++ b/wearos/src/main/res/values/styles.xml
@@ -23,7 +23,7 @@
         <item name="android:paddingHorizontal">@dimen/row_padding_horizontal</item>
         <item name="android:paddingVertical">@dimen/row_padding_vertical</item>
         <item name="android:background">@drawable/row_background</item>
-        <item name="android:textSize">14sp</item>
+        <item name="android:textSize">16sp</item>
         <item name="android:textColor">@color/watch_white</item>
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:gravity">center</item>
@@ -35,6 +35,7 @@
 
     <style name="ChipButton.Icon" parent="ChipButton">
         <item name="android:gravity">start|center_vertical</item>
+        <item name="android:textSize">14sp</item>
         <item name="android:drawablePadding">8dp</item>
     </style>
 

From 2d1591f8a3450370bacef848c34fadc2ebf67e50 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 7 Jul 2022 09:51:02 +0200
Subject: [PATCH 21/39] Task result screen improvements

---
 .../habitica/ui/activities/TaskResultActivity.kt      |  6 +++++-
 wearos/src/main/res/layout/task_reward_drop.xml       | 11 ++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt
index b17c9969b..facc561ac 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt
@@ -126,7 +126,11 @@ class TaskResultActivity : BaseActivity<ActivityTaskResultBinding, TaskResultVie
                 layoutParams.columnSpec = GridLayout.spec(0, 3, GridLayout.CENTER)
                 currentRow += 1
             } else {
-                layoutParams.columnSpec = GridLayout.spec(currentColumn, 1)
+                if (chips.size == 2) {
+                    layoutParams.columnSpec = GridLayout.spec(currentColumn, 3, GridLayout.CENTER)
+                } else {
+                    layoutParams.columnSpec = GridLayout.spec(currentColumn, 1)
+                }
                 if (currentColumn > 0) {
                     layoutParams.marginStart = margin
                 }
diff --git a/wearos/src/main/res/layout/task_reward_drop.xml b/wearos/src/main/res/layout/task_reward_drop.xml
index 7154eb740..6602ce475 100644
--- a/wearos/src/main/res/layout/task_reward_drop.xml
+++ b/wearos/src/main/res/layout/task_reward_drop.xml
@@ -18,8 +18,13 @@
         android:gravity="center"
         android:textColor="@color/watch_white"
         />
-    <com.habitrpg.common.habitica.views.PixelArtView
-        android:id="@+id/image_view"
+    <FrameLayout
         android:layout_width="40dp"
-        android:layout_height="40dp" />
+        android:layout_height="40dp">
+        <com.habitrpg.common.habitica.views.PixelArtView
+            android:id="@+id/image_view"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:layout_gravity="center" />
+    </FrameLayout>
 </LinearLayout>
\ No newline at end of file

From d24b32fe870a27048f75ccfb5f50f885b39b0cb7 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 7 Jul 2022 09:51:07 +0200
Subject: [PATCH 22/39] remove unused images

---
 wearos/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 1420 -> 0 bytes
 .../main/res/mipmap-hdpi/ic_launcher_round.webp  | Bin 3014 -> 0 bytes
 wearos/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 876 -> 0 bytes
 .../main/res/mipmap-mdpi/ic_launcher_round.webp  | Bin 1958 -> 0 bytes
 .../src/main/res/mipmap-xhdpi/ic_launcher.webp   | Bin 1942 -> 0 bytes
 .../main/res/mipmap-xhdpi/ic_launcher_round.webp | Bin 4272 -> 0 bytes
 .../src/main/res/mipmap-xxhdpi/ic_launcher.webp  | Bin 2866 -> 0 bytes
 .../res/mipmap-xxhdpi/ic_launcher_round.webp     | Bin 6630 -> 0 bytes
 .../src/main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 3694 -> 0 bytes
 .../res/mipmap-xxxhdpi/ic_launcher_round.webp    | Bin 9132 -> 0 bytes
 10 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 wearos/src/main/res/mipmap-hdpi/ic_launcher.webp
 delete mode 100644 wearos/src/main/res/mipmap-hdpi/ic_launcher_round.webp
 delete mode 100644 wearos/src/main/res/mipmap-mdpi/ic_launcher.webp
 delete mode 100644 wearos/src/main/res/mipmap-mdpi/ic_launcher_round.webp
 delete mode 100644 wearos/src/main/res/mipmap-xhdpi/ic_launcher.webp
 delete mode 100644 wearos/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
 delete mode 100644 wearos/src/main/res/mipmap-xxhdpi/ic_launcher.webp
 delete mode 100644 wearos/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
 delete mode 100644 wearos/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
 delete mode 100644 wearos/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp

diff --git a/wearos/src/main/res/mipmap-hdpi/ic_launcher.webp b/wearos/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index 4f052bb675ef59aa28642bf82b72c1fa5975b736..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1420
zcmV;71#|jRNk&G51pok7MM6+kP&iC?1pojqN5ByfHHUzN;Qw)15D`i8BSFgcKXURr
z_O_*I@*n?NlRo*g9e)C112H&209VkkSr`Rq;K2tD5K#q4;nqbC3NWzFi5(YnM8b%P
zh>GaJQ6ou?9M9j{^X;nkSR8?K8%dHPl^4gLoyyEKbELitZ^xPLwA!|1`Q6=-O7aaX
za)@L)D^N);$z77nU<2qn_Dp~j{r}fVxd-m<?(XjH?(XjH?(XjH?(XjHu4(`OnR$LY
zH<%m131~YNhq_m=3vA}0LgEfzq`Q-8J_o=ek!KrHIR{)ovs)t(>6$qPH?a1>xrTK=
z$wt~H7zh9gS5$7J7FjF~1OO~lO=sJ-RUNY1>i-0A?;Swm|1m1xrvN^RO6O5?(tppQ
zSn49_R?@auJ4xR^o!*i2h&e00j#$rPMG*_qFAtR_hx4F!QlyvSFZrk}zV{n|;(N%3
z?$T1JTa{w@cpVtcT;?X|-Otw0B0fH%12+4?d)UnPI&78H*=E0(g#j2h>qtwJZFb9b
zgqvlo$40Y?alK6R*l5?gGy8fmd_Ll$$m3S1rjhdz6FGV~#i6CEZS=gwLo{xt12P5B
zip4aupJKu7+QvAXraH7yR&DE5Fr5Y*>N(L{X2#f`>|K9b3~o|Uc7`!y=iM<1MASDh
zf#;;hetfzN*wSmh<_-5GaW+e`@$+U2DKVP{C=tCVUri_9Nw@s~Xu1CYbC(&DO2ruJ
zDdL?BsMGJnm^Hoi4lK!?1Zef5Kh|qMNP^GtJP9}r5O-^33=z1S0;n7!>Kge7-08dk
zmy18nXh(1j^He5GB60hkHKkOTO?DU;9jj9`Q~L#N2IIaJS87Zp5S9U)2+Mts$Z?Tc
z(<~dXFAj3`jI3ilOPDgdpZ4@>=zIW3OrKYXF&1cEwXD}J`cO|25fyH(9{Xj$go_4x
zI?U*G7+@(Krb9gCLuLTbdSPU4LysXGcQXfjO3qY3N<a249{L+>PAny)qD_*ba^vRP
zWPtVyy9bU$+AfJR7y?RHo74eG<{nQ2L?n|P>Syj5OG<?gImjSunWSkB6$Pcilrb9S
zNqc$$Eb0BSNJ5Q)wXqKW7jE=Q&~M*ll;0CBZ}XK{BZUbLlL51zE`8Q7FjD~)tX@_h
zG8IsEYkNhOXp+NZ0HEc<hbGR;ir!OFwo{PBcJ#^=aE?eb_FF#y089Ikobm=)9T;de
zLB4yFnK93@gyQ~wd@6ed){D#l9O}7k5=ltSvy1`wksgzrJ)DgzwTe!{ZnUcx_Gag6
zeqt(sn~FkJE{1Lc%>8itZ5rnH11Q)$685t*J%KrO4KK0)+6~SUD)w7}Ik#(F=2!Lr
z9=1x7P=V&eoQ3^(9huwNLX7Za*=l9)QHw0gi+EJk$=YrJ(0RdSo*Kn)qGu&72LCKk
zkOwQ$VhYYiS>f7p8UXa!Z;d=ijam6>>9~-iTGlxfK7cbSx8Eah%ba69_Y7<b%FXSk
zf&Z)j|IYU!^K&k*GMnDdyHB+nfQ}2pkN$k2=9xHeRn;#{&Gxb8E|DAH>HqbL)+q{8
z044764*#t9dHI(dJsRl<QtTPn{(<Qe7_Txj1?aV(_cf=ctX#F4WTkWDrN@u*2auhP
z3sYm(G|N({RN5u-dl+MM59UzMb<Bm9Iv>Zlp8H~jk|vL%n#7oDDs3YYXgKKnZ0LXD
z>Kea48v-B!G$1tT;hwujVV7;xFF^F<J%r##1B~8kW^J@Drw!hMoW7qGHtKh8F$(`+
zW*81a0T2dchWDsuUdi6Pi<61sU?M*zz508;xjh1|$jEnKOMn0n1H=J|<i9TgJ}~6>
a7!ttZ85+3R4o<^M{%Ze`Q+-#+y;K0&mZ?_&

diff --git a/wearos/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/wearos/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index 066112991c1b5761fc8c0c8fa78ba95b33f1a6fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3014
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
ItEfB)0L=HzzW@LL

diff --git a/wearos/src/main/res/mipmap-mdpi/ic_launcher.webp b/wearos/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index b87d05363a8ef29fbdf0d865f8a54e85a093dd8e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 876
zcmV-y1C#txNk&Fw0{{S5MM6+kP&iCi0{{RoFTe{B&jz85BuP^2@~6A^PNiwcjU>sD
zq&P$#dHTHQFUf0xe<~f0BuR>-I6jr>|Npzw7OUKGB-^Ue_x+DM<lyNM1_}C>ox4Y+
ziYirwDymdvRqt*#O4ty|uu*I%Nuj{T-GU)0lnnsb0OffGz}@=%J^}Lk@8WJ1#<p$@
z1rf<@fwEhJA?_9_ltk=u8#f@?mI8@V5cq$_^9)eJb8A~0pd^Ko{QkRu4RKq^bF0|6
zThEQV^*jS^Yzu}BfdBtP7zzM^yRofF*Z`P>L0AeU84M5v&PtRbQ2<CWBuY>q5hN&e
zquN#PNL8VHt438+UfukX+9R8)w<^~DU;3sf-XAypdZ_k#_kX?2%{||Bnnh~YY|p8+
zJLQzsMm6na&hD}GetZ1h|Nla5lq0pXvFC98|MfT7|HG}sZnu&Ce!kE9_VMfM<KK^$
z)aUQN@BIw&w{1JW=FM-m?PlAyZQHEbR<`T?WX(34xAggYv^}5W==b-I=>G(;?y{qc
zT$)oMEeM!^l+T|&BYp}dRRhQuFRQD_t6zetMz0iM#n(1^9qdVssBdZ}M!j<HBkRy~
z$<MW-8RSyA`-OGseQ2>rtBG2ReCv)XZdvVA;suM{<Vh#3g#;e6vrO;Y{9eOH^gT|s
z*oFH~I94voR*eaF;Q(e*-H79G2_CkmU`>n*2V~T8D(s5l0Q@JWosH!{<k3Q!+)Uu`
zsQ74a?lL($f&(7&(rMOB5x|K>)1o<?2l{dVu9M11l2?q+7dza!X|H4w?ByFTXAN;N
zCD&46L+b6Z?q)($$XsWM(j(J*gc<~A(Bz)><D&`%O7<`C(3AUUfKBViZb#A5Ko_p>
zzLN?#xCDoMxN+DevYgom#4K*?wp38%E!bLGGQdR8d9u|ji$zg?jcd}>-tNIy$oky@
z%7<#kr;400R=6loHjD!S*9DLga)xYo&l$@`dUC*Z<hX5Vb6xsO*+*1yb@R;8LkH<D
zyf$a>AZ#H5P+3}7pj#{|3JXw5_n-fv#UianpK2}gU9W?EtyAionu$@bJp94hHBz;E
z)1X+e@vXhe^lbmUdwl-^NF^S<|7&X?Vej<oC;4wDdzBfZ&B2jewyDf?dnY+qcL@NB
C|HkzI

diff --git a/wearos/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/wearos/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index ea8d0062bb608b800bae0567fbf4f7d800d5b99b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1958
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

diff --git a/wearos/src/main/res/mipmap-xhdpi/ic_launcher.webp b/wearos/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 7dddfeb13ec5f8d81faa4e218b337dc36d064f34..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1942
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

diff --git a/wearos/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/wearos/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 618438ce0427194bf358a117e87f1db43181146f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4272
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
SBqXD#TyEr5E=Q5{FNOfK`ba?l

diff --git a/wearos/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/wearos/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 0debd86b5e8ab0c32a391cd59aec4b2eba72ec5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2866
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
QjiQjjC{mRQRt9BLrIEo(&Hw-a

diff --git a/wearos/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/wearos/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index c56f1c90fdfb4a6d846406e0f187b1c7e397f7c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6630
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

diff --git a/wearos/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/wearos/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
deleted file mode 100644
index afcc165804cc6475f3ea449867867541c4a91dca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3694
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
M;fX66$ZNU?05_r{`v3p{

diff --git a/wearos/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/wearos/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 0f31f5c5016eae64188e7a2ae9809cf354399421..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9132
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


From a8d533e57036353fbe6ed7f8a732d68fcbeabca9 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 7 Jul 2022 10:45:03 +0200
Subject: [PATCH 23/39] fix task list style issues

---
 wearos/src/main/res/layout/activity_tasklist.xml | 4 ++--
 wearos/src/main/res/values/styles.xml            | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/wearos/src/main/res/layout/activity_tasklist.xml b/wearos/src/main/res/layout/activity_tasklist.xml
index 68bf693e6..f6039560b 100644
--- a/wearos/src/main/res/layout/activity_tasklist.xml
+++ b/wearos/src/main/res/layout/activity_tasklist.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto">
@@ -14,4 +14,4 @@
         android:layout_height="39dp"
         android:layout_gravity="center|bottom"
         app:layout_behavior="com.habitrpg.wearos.habitica.util.ScrollAwayBehavior"/>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/wearos/src/main/res/values/styles.xml b/wearos/src/main/res/values/styles.xml
index db0021c85..860ae08c4 100644
--- a/wearos/src/main/res/values/styles.xml
+++ b/wearos/src/main/res/values/styles.xml
@@ -78,6 +78,7 @@
 
     <style name="Text.Body1">
         <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="fontFamily">sans-serif-medium</item>
         <item name="android:textSize">14sp</item>
     </style>
     <style name="Text.Body2">

From 0e99d1781261da2d757a2db7a721dcd278cf1bd2 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 7 Jul 2022 10:52:12 +0200
Subject: [PATCH 24/39] slightly optimize layouts

---
 wearos/src/main/res/layout/row_daily.xml      | 50 +++++++--------
 wearos/src/main/res/layout/row_footer.xml     | 13 ++--
 wearos/src/main/res/layout/row_habit.xml      | 63 +++++++++----------
 wearos/src/main/res/layout/row_header.xml     | 20 +++---
 wearos/src/main/res/layout/row_hub.xml        | 30 ++++-----
 wearos/src/main/res/layout/row_reward.xml     |  6 +-
 .../main/res/layout/row_section_header.xml    | 14 ++---
 wearos/src/main/res/layout/row_settings.xml   | 10 +--
 wearos/src/main/res/layout/row_todo.xml       |  8 +--
 9 files changed, 90 insertions(+), 124 deletions(-)

diff --git a/wearos/src/main/res/layout/row_daily.xml b/wearos/src/main/res/layout/row_daily.xml
index 3eaced68a..95898e254 100644
--- a/wearos/src/main/res/layout/row_daily.xml
+++ b/wearos/src/main/res/layout/row_daily.xml
@@ -1,32 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/chip"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="52dp"
+    style="@style/Chip">
+    <FrameLayout
+        android:id="@+id/checkbox_wrapper"
+        android:layout_width="34dp"
+        android:layout_height="34dp"
+        android:background="@drawable/circle"
+        android:layout_marginEnd="6dp"
+        android:foreground="@drawable/task_score_feedback">
+        <ImageView
+            android:id="@+id/checkbox"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:background="@drawable/daily_square"
+            android:scaleType="center"
+            android:layout_gravity="center"/>
+    </FrameLayout>
     <LinearLayout
-        android:id="@+id/chip"
-        android:layout_width="match_parent"
-        android:layout_height="52dp"
-        style="@style/Chip">
-        <FrameLayout
-            android:id="@+id/checkbox_wrapper"
-            android:layout_width="34dp"
-            android:layout_height="34dp"
-            android:background="@drawable/circle"
-            android:layout_marginEnd="6dp"
-            android:foreground="@drawable/task_score_feedback">
-            <ImageView
-                android:id="@+id/checkbox"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:background="@drawable/daily_square"
-                android:scaleType="center"
-                android:layout_gravity="center"/>
-        </FrameLayout>
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
         <com.habitrpg.wearos.habitica.ui.views.TaskTextView
             android:id="@+id/title"
             android:layout_width="wrap_content"
@@ -36,6 +33,5 @@
             tools:text="Task Title that is long and wraps and"
             android:textColor="@color/watch_white"
             style="@style/Text.Body1"/>
-        </LinearLayout>
     </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/wearos/src/main/res/layout/row_footer.xml b/wearos/src/main/res/layout/row_footer.xml
index 7ecfef330..3a074b353 100644
--- a/wearos/src/main/res/layout/row_footer.xml
+++ b/wearos/src/main/res/layout/row_footer.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="45dp">
-
+    android:layout_height="45dp"
+    android:orientation="vertical"
+    android:gravity="center">
     <ImageView
         android:layout_width="25dp"
         android:layout_height="25dp"
-        android:layout_above="@id/text_view"
-        android:layout_centerHorizontal="true"
         android:layout_marginBottom="2dp"
         android:importantForAccessibility="no"
         android:src="@mipmap/ic_launcher" />
@@ -17,11 +16,9 @@
         android:id="@+id/text_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
         android:fontFamily="sans-serif"
         android:textColor="@color/watch_purple_200"
         android:textSize="12sp"
         tools:text="Footer Text" />
 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/row_habit.xml b/wearos/src/main/res/layout/row_habit.xml
index 3984c6a48..cba44ada1 100644
--- a/wearos/src/main/res/layout/row_habit.xml
+++ b/wearos/src/main/res/layout/row_habit.xml
@@ -1,39 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="52dp"
+    style="@style/Chip">
+
+    <FrameLayout
+        android:id="@+id/habit_button"
+        android:layout_width="34dp"
+        android:layout_height="34dp"
+        android:background="@drawable/circle"
+        android:layout_marginEnd="@dimen/spacing_medium"
+        android:foreground="@drawable/task_score_feedback">
+
+        <ImageView
+            android:id="@+id/habit_button_icon"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="center" />
+    </FrameLayout>
+
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="52dp"
-        style="@style/Chip">
-        <FrameLayout
-            android:id="@+id/habit_button"
-            android:layout_width="34dp"
-            android:layout_height="34dp"
-            android:background="@drawable/circle"
-            android:layout_marginEnd="@dimen/spacing_medium"
-            android:foreground="@drawable/task_score_feedback"
-            >
-            <ImageView
-                android:id="@+id/habit_button_icon"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:scaleType="center"/>
-        </FrameLayout>
-        <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <com.habitrpg.wearos.habitica.ui.views.TaskTextView
+            android:id="@+id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
-            <com.habitrpg.wearos.habitica.ui.views.TaskTextView
-                android:id="@+id/title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxLines="2"
-                android:ellipsize="end"
-                tools:text="Task Title"
-                android:textColor="@color/watch_white"
-                style="@style/Text.Body1"/>
-        </LinearLayout>
+            android:maxLines="2"
+            android:ellipsize="end"
+            tools:text="Task Title"
+            android:textColor="@color/watch_white"
+            style="@style/Text.Body1" />
     </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/wearos/src/main/res/layout/row_header.xml b/wearos/src/main/res/layout/row_header.xml
index edd234235..ae142b168 100644
--- a/wearos/src/main/res/layout/row_header.xml
+++ b/wearos/src/main/res/layout/row_header.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
+    android:id="@+id/text_view"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="6dp">
-    <TextView
-        android:id="@+id/text_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:textColor="@color/watch_purple_200"
-        tools:text="Header Text"
-        style="@style/Text.SubHeader1"/>
-</FrameLayout>
\ No newline at end of file
+    android:layout_gravity="center"
+    android:gravity="center"
+    android:textColor="@color/watch_purple_200"
+    tools:text="Header Text"
+    style="@style/Text.SubHeader1"
+    android:padding="6dp"/>
diff --git a/wearos/src/main/res/layout/row_hub.xml b/wearos/src/main/res/layout/row_hub.xml
index a36f68429..97cd761d5 100644
--- a/wearos/src/main/res/layout/row_hub.xml
+++ b/wearos/src/main/res/layout/row_hub.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/row_container"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-    <LinearLayout
-        android:id="@+id/row_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        style="@style/Chip">
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    style="@style/Chip">
     <ImageView
         android:id="@+id/icon_view"
         android:layout_width="36dp"
@@ -23,12 +20,11 @@
         android:layout_height="wrap_content"
         android:textColor="@color/watch_white"
         style="@style/Text.SubHeader1"/>
-        <TextView
-            android:id="@+id/detail_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            style="@style/Text.Body1"
-            android:textColor="@color/watch_purple_200"
-            android:layout_marginEnd="@dimen/spacing_medium"/>
-    </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+    <TextView
+        android:id="@+id/detail_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        style="@style/Text.Body1"
+        android:textColor="@color/watch_purple_200"
+        android:layout_marginEnd="@dimen/spacing_medium"/>
+</LinearLayout>
diff --git a/wearos/src/main/res/layout/row_reward.xml b/wearos/src/main/res/layout/row_reward.xml
index 6f602e0a6..dd7e47777 100644
--- a/wearos/src/main/res/layout/row_reward.xml
+++ b/wearos/src/main/res/layout/row_reward.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="52dp"
         style="@style/Chip">
@@ -17,4 +14,3 @@
             android:textColor="@color/watch_white"
             style="@style/Text.Body1"/>
     </LinearLayout>
-</FrameLayout>
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/row_section_header.xml b/wearos/src/main/res/layout/row_section_header.xml
index 8bb6d86a2..1af97509d 100644
--- a/wearos/src/main/res/layout/row_section_header.xml
+++ b/wearos/src/main/res/layout/row_section_header.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView 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"
-    android:padding="6dp">
-    <TextView
         android:id="@+id/text_view"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
+    android:gravity="center"
         android:textColor="@color/watch_purple_200"
         tools:text="Header Text"
-        style="@style/Text.Body1"/>
-</FrameLayout>
\ No newline at end of file
+        style="@style/Text.Body1"
+        android:layout_margin="6dp"/>
diff --git a/wearos/src/main/res/layout/row_settings.xml b/wearos/src/main/res/layout/row_settings.xml
index b8e9d84c5..4bcbfaa38 100644
--- a/wearos/src/main/res/layout/row_settings.xml
+++ b/wearos/src/main/res/layout/row_settings.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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="wrap_content"
-    android:layout_gravity="center">
-    <LinearLayout
         android:id="@+id/row"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -23,5 +18,4 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1" />
-    </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+    </LinearLayout>
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/row_todo.xml b/wearos/src/main/res/layout/row_todo.xml
index 58c4fcb43..231b3c047 100644
--- a/wearos/src/main/res/layout/row_todo.xml
+++ b/wearos/src/main/res/layout/row_todo.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="52dp"
         style="@style/Chip">
@@ -36,5 +33,4 @@
                 android:textColor="@color/watch_white"
                 style="@style/Text.Body1"/>
         </LinearLayout>
-    </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+    </LinearLayout>
\ No newline at end of file

From 24aeaab80ad57bc5582328f2b4c0b441ca87b7d2 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 7 Jul 2022 11:09:43 +0200
Subject: [PATCH 25/39] Task list improvements

---
 .../habitica/ui/adapters/TaskListAdapter.kt   |  12 +++++-----
 .../ui/viewHolders/HeaderTaskViewHolder.kt    |  15 ++++++++++++
 .../main/res/drawable-mdpi/done_sparkles.png  | Bin 0 -> 536 bytes
 .../main/res/drawable-xhdpi/done_sparkles.png | Bin 0 -> 966 bytes
 .../res/drawable-xxhdpi/done_sparkles.png     | Bin 0 -> 1357 bytes
 .../main/res/layout/row_section_header.xml    |  16 ++++++-------
 .../src/main/res/layout/row_task_header.xml   |  22 ++++++++++++++++++
 wearos/src/main/res/values/strings.xml        |   1 +
 8 files changed, 52 insertions(+), 14 deletions(-)
 create mode 100644 wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/HeaderTaskViewHolder.kt
 create mode 100644 wearos/src/main/res/drawable-mdpi/done_sparkles.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/done_sparkles.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/done_sparkles.png
 create mode 100644 wearos/src/main/res/layout/row_task_header.xml

diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt
index 47e74595e..f627c9552 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt
@@ -2,10 +2,10 @@ package com.habitrpg.wearos.habitica.ui.adapters
 
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.habitrpg.android.habitica.databinding.RowSectionHeaderBinding
+import com.habitrpg.android.habitica.databinding.RowTaskHeaderBinding
 import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.wearos.habitica.models.tasks.Task
-import com.habitrpg.wearos.habitica.ui.viewHolders.HeaderSectionViewHolder
+import com.habitrpg.wearos.habitica.ui.viewHolders.HeaderTaskViewHolder
 import com.habitrpg.wearos.habitica.ui.viewHolders.tasks.TaskViewHolder
 
 open class TaskListAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>(), BaseAdapter {
@@ -25,7 +25,7 @@ open class TaskListAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>(), Ba
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         val inflater = parent.context.layoutInflater
-        return HeaderSectionViewHolder(RowSectionHeaderBinding.inflate(inflater, parent, false).root)
+        return HeaderTaskViewHolder(RowTaskHeaderBinding.inflate(inflater, parent, false).root)
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
@@ -38,14 +38,14 @@ open class TaskListAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>(), Ba
             holder.itemView.setOnClickListener {
                 onTaskTapped?.invoke(item)
             }
-        } else if (holder is HeaderSectionViewHolder){
+        } else if (holder is HeaderTaskViewHolder){
             if (position == 0) {
-                holder.bind(title)
+                holder.bind(title, data.firstOrNull() is String)
                 holder.itemView.setOnClickListener {
                     onRefresh?.invoke()
                 }
             } else {
-                holder.bind(data[position - 1] as String)
+                holder.bind(data[position - 1] as String, false)
             }
         }
     }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/HeaderTaskViewHolder.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/HeaderTaskViewHolder.kt
new file mode 100644
index 000000000..ff3556700
--- /dev/null
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/HeaderTaskViewHolder.kt
@@ -0,0 +1,15 @@
+package com.habitrpg.wearos.habitica.ui.viewHolders
+
+import android.view.View
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.RecyclerView
+import com.habitrpg.android.habitica.databinding.RowTaskHeaderBinding
+
+class HeaderTaskViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    fun bind(title: String, showDone: Boolean) {
+        binding.header.textView.text = title
+        binding.doneView.isVisible = showDone
+    }
+
+    val binding = RowTaskHeaderBinding.bind(itemView)
+}
diff --git a/wearos/src/main/res/drawable-mdpi/done_sparkles.png b/wearos/src/main/res/drawable-mdpi/done_sparkles.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e75cfebed96541b5869df86acdcb13ac066fc9b
GIT binary patch
literal 536
zcmV+z0_XjSP)<h;3K|Lk000e1NJLTq001Qb000;W1^@s6eR?!-00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0j)_yK~#7F?Uuhz
z!cY{(zuUmxQ4<sU2J#3cPDY2i^QW2+-Ox9vPe9#GS`v3LN_4^U2)==AL?)c2J)RZ>
zl!8Jp;=pfcZ*SV$ujf1WoB|Rd&r~4+1v2q_HhDQ62}wZ`93>6p7eUzO%O(;aFH(Nb
z8jSR$(UKyHyh0g@D2^tCLyf$N1rbO9Tc)#R4iB{{x3nOH%imrVS+|8>vT&qWPzDrK
zW(W#V5%_QO2ntCQsgNjt2qrI89GmWf=n_iGW<g!dNn%l-&{NLl<;wjFx)8h978XR_
z?h`2sVT7VpQ!f4s)F@cw<sBqMTJelf6t)mjTFsh7kZEdUmTatm*xkp1G7xExhdWpS
z!$ha!6Nf9bhJJ<CqDg60EFR<j)rEMsYx`Tz<MX3P1%8!}I=;3IHM9}SLI`#u?HTos
zW7ON$gec)&HMtU>e|t;~ZDe86x4H4y;p$JB=pCFe{Abaf5H%1Mm)QJJx&oPk9@-iL
z7(5)<Mz^(tjp4he70<At9!Aky0=2!(7N4?_z&p0>r)Eb-CARBS!yjVYyv$AyGSAj+
aB90H=Ka5GLkw%ID0000<MNUMnLSTZg4&1f?

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/done_sparkles.png b/wearos/src/main/res/drawable-xhdpi/done_sparkles.png
new file mode 100644
index 0000000000000000000000000000000000000000..7169deeb3911e72fab4d1af4ea3bf98bdcdc837a
GIT binary patch
literal 966
zcmV;%13CPOP)<h;3K|Lk000e1NJLTq002q=001xu1^@s6wrT9v00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH16xT%K~#7F?V8U{
z6Hye#zcUmUx{#H|#KiIh@&-=bV#2WJ&!Ax30Z%}A0@|G+Mu*6rE^OF{Q=b5Q0%l=?
z;)aDL1nC^lo!Ua_ziFY&opyf7orZgvkbXJm-0$84kPv^^wM}S(0ZkE+(%`Zid}@HU
zLZN(~4L<$y1~h=6A^)T4ur@)Qq0Dv(5u#^ARimj2(;6a1JE4MTGU(ZrX_MU<6A_|c
zMEPY?p6P~pHX^N6TGc3trZK5a`)DSVf{dIz@|1Br+%j4S6$k`>8O$s4<5=ex;J_GJ
zzfHj+7mD4vwa@}Jyc`I&C4!aEXCf1dKhIcFv{l_n<NB1uLP$z(7tkkChyW2uB7x>{
zGn`07eg&mU=p)fZ)ZVNue_i>bG<t<3^)Rw3sds`tqd|=le^fD)W*4tXss#ca;Fi$F
z9#oDk%8|E8N#<|j{8pkk&S-bm<Gs186z1kfmI%*$`Z;q$nM!z#3w#je!B{(?g2K#L
zZ&+Z;BSN&iW>N5$Sr-=t-lOLq#}Og=UfdC1L{+m0OSnKqm5f7ZKqSsQG%Bk6uKd;T
zQn^`3NJvQN9=3<4e)R04_|?*~yl!Dg=t(Gkxwt0Vb`C>CS3W98HDh!`oU&b+G13?k
zLJK7#r9q<w5$P!g0BiRsjnmVU!t{8k+tE6q0x@8iGE|Ws1Cb2lzN|>U%{S4|DWNBb
zFKOJlyJ77dX2OV7Cloo3#|x@RW1=?6esvWC1(W)Y6C#!yMy$qS&VMr^iia@JB|+l`
z*P0qitbJ?umuVHhxBNa$!-VZOQjdbxc4wbNl%@BZvAYJbia(?WNK?&M=>TVc>Y}V=
zKC!)MiU=-3K{kEZ+(JySc8}-bv(tQ)lsK8f<b%2nPfH&~&byLyJysD4&au4|i!_wo
z&TK7`qP%)lBt-|qnF`yYmfaCMm0eR`tm5$m{E?lOzaW88n0(|kTWTv5Id465Ml}OG
z8A2)xtvQ24(}FytrgA>0MVH}`mJQV&Za8H}WS$1@dF15!-pam73X_kO5Ngyi#rpKq
zk!+|mUC)1CODGT3{|{g;i9pkF6Q~`97Y}U_OKodY?Yva@h+^cWz^`Bc3B)QM*|-kk
o)Lph;XOYmJxNQ3g2?+zqKjs}TA(5aH#sB~S07*qoM6N<$f~0(}HUIzs

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/done_sparkles.png b/wearos/src/main/res/drawable-xxhdpi/done_sparkles.png
new file mode 100644
index 0000000000000000000000000000000000000000..77d80b52b1f16c4080b95cd80b5da85f78284bc2
GIT binary patch
literal 1357
zcmV-T1+w~yP)<h;3K|Lk000e1NJLTq003_Q002k`1^@s6_-w2000009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1ma0VK~#7F?VQbW
z8$}SuyGKfq;v^1);-)u<@&*!|0vtAX8_R+CYUc^OegY{s3aH8&xLZ{aav?}>fOrBn
zRZx5#P|mit>6w)hSzcMYt5vcy+rKK8q}{O&``3S_yXONy5Cmas(6HO2XP^4u5DKco
z^uh<ELl&_Cj!+5lwCh0O9=~lsG(84KsD|^j>*gRF88IEedGQupw{UU#7#zTT=S5R5
z;cA<PJ8iHW_r*gvOuSBL{n+QUc=T+y%P-9px2<=d+s;F{-d%)NkA2RHx5jmIIC0-S
z0!wk%c?f$c+a24QIv_X(3(@9OKzEnzEdK`t0jSz3c7hRDf-~Y7_vmDNIj74Ej)CYA
ze)w$wCC7U4;#y^N$PZkPT}9R{Lw4gynMJf#ye*2hObCbphX=Y#4WUF>DV~WW<20ZN
zuN8cRAAD1q=(G+N!ES4DFw%pp!AKDx2Q;AiP$H}nkD2f|bjlC139rv}Bc2C5!OnLh
zC>i#SdE4(gODozO2cpd#kIP)T_}qqKD1DSU$E`e%^rUO<Ja3}&J5cpLN0k$>02eDP
zIYea9u<qL;+8pP^n`5SX2!|<}avoQ^W1DaqXA9G_Kx4GNA&hJkPUHA|9-XXjR7=sO
zoH#AsTK93{UAB@}7AmlYrMAENroFDyI4@r8ERH6x+_2kqnrbY%<um|v9(M^k1<R>~
zcqW=8TyP(a%Ut$KOLaDyC^I7vyYG^af)(hMV)XOwZy?wS{j}qOAP9mW2!bF8f{+R7
zb{n++Ak8ecumOda$5^-~;Ei8E?>z0gbLL4IDO5ZbtHr`;$2H?CH$}WHQkZ!3*})!9
zy(|c)nTmK@q!97w{^!RKQNWWgOJb3Tw?#G<kM1Azc#6eOz8f_`NW}a8kBtlDD>s_N
z!Nz>dx@g8O(tk={YXBOT-3FpI2-&ICd*0K3Zx8Oin|mEiqIlGOpf_<m<}qt_1tH)1
zTqWJ+Du`nPihLFj@(P&PZDR0Mz>X?nWtE7RfcND0*2@o(5ir+jOe@Dc48HdHm$Bh;
z0Tl6)P_@g?C8vOE`@&hJqz(C)0G;2#!0sh>MdSVW*AWMKy{mU{!cRP8RYLCho|{*!
zjXCBB2Y25Oms_uoHtGBxe`yH$Xy~NfR9%Eu(5elgCbequeU3!&&<GqwE05S(D;~Rs
z-J?1i2&l_tXHqJQ@t*v{<DE*o{VW6(b&_1CNtNee@P)Q9I}q~jrfGq?(SwQ;3kSn=
z#S892uMtj@I!WgUbj)^s2zepsazgLS`OaDKp8m-_5S^tK4&YkhG#M)_wGnIrkx%;v
z8y+uZA4WJ*!_{Nm6*_~DZ;jVAdIKw_Dc~YN3o3$l_Fn@c>}L>el14a9=CTQ=4g}fI
zXQ${8cw*k0zz3gW@TCtG!#MCli^!EH74h^L2QJH^B8~<h-Rh+IzC4HMXc3b8ZPGh$
z>VEv;<^+SjmD`24#cT`<=O5XXeR%8q>{5N0q8E^o;>067;h@F`AvJ@0@0h^E`{D24
z)#0v`s>{?AGv*OJtYSA<6oXIR>zZS^G^n;JUbygHA3W3HI%pq+jd&^GRHYtja&(*Y
zVm3t->dK2r;Dtgk0%jn)^GxK3zlv~go*dn#8UVfB7U2Xz5ClOGgthz+LQutRXkJy`
P00000NkvXXu0mjff>n6U

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/layout/row_section_header.xml b/wearos/src/main/res/layout/row_section_header.xml
index 1af97509d..2ca69496d 100644
--- a/wearos/src/main/res/layout/row_section_header.xml
+++ b/wearos/src/main/res/layout/row_section_header.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/text_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
+    android:id="@+id/text_view"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
     android:gravity="center"
-        android:textColor="@color/watch_purple_200"
-        tools:text="Header Text"
-        style="@style/Text.Body1"
-        android:layout_margin="6dp"/>
+    android:textColor="@color/watch_purple_200"
+    tools:text="Header Text"
+    style="@style/Text.Body1"
+    android:layout_margin="6dp"/>
diff --git a/wearos/src/main/res/layout/row_task_header.xml b/wearos/src/main/res/layout/row_task_header.xml
new file mode 100644
index 000000000..afeebfabb
--- /dev/null
+++ b/wearos/src/main/res/layout/row_task_header.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:gravity="center">
+    <include
+        layout="@layout/row_section_header"
+        android:id="@+id/header" />
+    <TextView
+        android:id="@+id/done_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/all_done_today"
+        android:layout_marginHorizontal="@dimen/spacing_xlarge"
+        android:drawableTop="@drawable/done_sparkles"
+        android:drawablePadding="4dp"
+        style="@style/Text.Body1"
+        android:textColor="@color/watch_gray_200"
+        android:layout_marginTop="24dp"
+        android:layout_marginBottom="32dp"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/wearos/src/main/res/values/strings.xml b/wearos/src/main/res/values/strings.xml
index 7ae3faeb5..2d3bd641b 100644
--- a/wearos/src/main/res/values/strings.xml
+++ b/wearos/src/main/res/values/strings.xml
@@ -37,4 +37,5 @@
     <string name="some_food">Some Food</string>
     <string name="continue_on_your_phone">Continue on your phone</string>
     <string name="levelup_description">You leveled up through all your hard work!</string>
+    <string name="all_done_today">All done today!</string>
 </resources>
\ No newline at end of file

From c6957adae9cf88400da034f3d2da4ac250bb19b8 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 7 Jul 2022 11:16:06 +0200
Subject: [PATCH 26/39] properly clear data when logging out

---
 .../habitica/data/repositories/TaskLocalRepository.kt |  7 +++++++
 .../habitica/data/repositories/TaskRepository.kt      |  1 +
 .../habitica/data/repositories/UserLocalRepository.kt | 11 ++++++-----
 .../habitica/data/repositories/UserRepository.kt      |  4 ++++
 .../wearos/habitica/ui/viewmodels/LoginViewModel.kt   |  4 ++--
 .../habitica/ui/viewmodels/SettingsViewModel.kt       |  2 ++
 6 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/TaskLocalRepository.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/TaskLocalRepository.kt
index d4ce7c5b3..b0d08854a 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/TaskLocalRepository.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/TaskLocalRepository.kt
@@ -106,4 +106,11 @@ class TaskLocalRepository @Inject constructor() {
             TaskType.REWARD.value to (tasks[TaskType.REWARD]?.value?.size ?: 0),
         )
     }
+
+    fun clearData() {
+        tasks.values.forEach {
+            it.value = null
+        }
+        taskCountHelperValue.value = 0
+    }
 }
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/TaskRepository.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/TaskRepository.kt
index 5f1efd5f5..03c070cc3 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/TaskRepository.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/TaskRepository.kt
@@ -78,4 +78,5 @@ class TaskRepository @Inject constructor(
 
     fun getTaskCounts() = localRepository.getTaskCounts()
     fun getActiveTaskCounts() = localRepository.getActiveTaskCounts()
+    fun clearData() = localRepository.clearData()
 }
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserLocalRepository.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserLocalRepository.kt
index b47a4d143..b353c9173 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserLocalRepository.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserLocalRepository.kt
@@ -3,18 +3,19 @@ package com.habitrpg.wearos.habitica.data.repositories
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.asFlow
 import com.habitrpg.wearos.habitica.models.user.User
-import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class UserLocalRepository @Inject constructor() {
-    private val user = MutableLiveData<User>()
-    fun getUser(): Flow<User> {
-        return user.asFlow()
-    }
+    private val user = MutableLiveData<User?>()
+    fun getUser() = user.asFlow()
 
     fun saveUser(user: User) {
         this.user.value = user
     }
+
+    fun clearData() {
+        user.value = null
+    }
 }
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserRepository.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserRepository.kt
index 891c6b133..af55d09db 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserRepository.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserRepository.kt
@@ -39,4 +39,8 @@ class UserRepository @Inject constructor(
     suspend fun runCron() {
         apiClient.runCron()
     }
+
+    fun clearData() {
+        localRepository.clearData()
+    }
 }
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt
index 9c2100d56..3c3d90950 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt
@@ -126,8 +126,8 @@ class LoginViewModel @Inject constructor(userRepository: UserRepository,
             saveTokens(userAuthResponse.apiToken, userAuthResponse.id)
         } catch (e: Exception) {
         }
-        val user = userRepository.retrieveUser()
-        taskRepository.retrieveTasks(user?.tasksOrder)
+        val user = userRepository.retrieveUser(true)
+        taskRepository.retrieveTasks(user?.tasksOrder, true)
         onLoginCompleted()
     }
 
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SettingsViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SettingsViewModel.kt
index 6a75c919f..23e902ded 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SettingsViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SettingsViewModel.kt
@@ -26,6 +26,8 @@ class SettingsViewModel @Inject constructor(userRepository: UserRepository,
             clear()
         }
         apiClient.updateAuthenticationCredentials(null, null)
+        userRepository.clearData()
+        taskRepository.clearData()
     }
 
     fun resyncData() {

From 19217707dcd1e2fc3d4e519d0713af41435ca78b Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 7 Jul 2022 11:44:04 +0200
Subject: [PATCH 27/39] Fix crash

---
 .../habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 d6ba0758b..0f87a1f1c 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
@@ -44,6 +44,7 @@ import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
@@ -308,7 +309,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
         if (shopItem.isValid && !shopItem.locked) {
             val gemsLeft = if (shopItem.limitedNumberLeft != null) shopItem.limitedNumberLeft else 0
             if ((gemsLeft == 0 && shopItem.purchaseType == "gems") || shopItem.canAfford(user, purchaseQuantity)) {
-                GlobalScope.launch {
+                MainScope().launch(Dispatchers.Main) {
                     remainingPurchaseQuantity { quantity ->
                         if (quantity >= 0) {
                             if (quantity < purchaseQuantity) {

From 5db99ba7d956760affb27fec535fc2afa05ffa04 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 7 Jul 2022 15:54:17 +0200
Subject: [PATCH 28/39] Better apk and aab naming

---
 Habitica/build.gradle                         | 19 +++++++------------
 .../res/layout/dialog_hatch_pet_button.xml    |  7 +++++--
 .../res/layout/dialog_pet_suggest_hatch.xml   |  6 ++++--
 .../android/habitica/modules/UserModule.java  |  7 ++++++-
 .../tasks/BaseTasksRecyclerViewAdapter.kt     |  6 +++---
 .../common/habitica/api/HostConfig.kt         | 12 +++++-------
 version.properties                            |  2 +-
 wearos/build.gradle                           |  3 +++
 .../data/repositories/UserLocalRepository.kt  |  3 ++-
 9 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index d5035923b..9886eeef7 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -78,7 +78,7 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     androidTestImplementation 'androidx.test:runner:1.4.0'
     androidTestImplementation 'androidx.test:rules:1.4.0'
-    debugImplementation 'androidx.fragment:fragment-testing:1.4.1'
+    debugImplementation 'androidx.fragment:fragment-testing:1.5.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test:core-ktx:1.4.0'
     androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3'
@@ -108,15 +108,13 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.4.2'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.4.2'
-    implementation "androidx.fragment:fragment-ktx:1.4.1"
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.5.0'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.5.0'
+    implementation "androidx.fragment:fragment-ktx:1.5.0"
     implementation "androidx.paging:paging-runtime-ktx:3.1.1"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.6'
-
     implementation 'com.willowtreeapps:signinwithapplebutton:0.3'
 
     implementation project(':shared')
@@ -149,9 +147,6 @@ android {
         buildConfigField "String", "TESTING_LEVEL", "\"production\""
         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'
 
-        println app_version_code
-        println app_version_name
-
         versionCode app_version_code
         versionName app_version_name
 
@@ -159,6 +154,9 @@ android {
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'
+
+        def formattedDate = new Date().format('yyMMdd')
+        archivesBaseName = "Habitica-${formattedDate}${versionCode}"
     }
 
     buildFeatures {
@@ -266,9 +264,6 @@ android {
 
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
-
-        // Flag to enable support for the new language APIs
-        coreLibraryDesugaringEnabled true
     }
 
     kotlinOptions {
diff --git a/Habitica/res/layout/dialog_hatch_pet_button.xml b/Habitica/res/layout/dialog_hatch_pet_button.xml
index 895be21a2..1fa18d8aa 100644
--- a/Habitica/res/layout/dialog_hatch_pet_button.xml
+++ b/Habitica/res/layout/dialog_hatch_pet_button.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="horizontal"
     android:layout_width="wrap_content"
     android:layout_height="60dp"
     android:background="@drawable/button_background_primary"
-    android:gravity="center">
+    android:gravity="center"
+    android:padding="6dp">
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -18,5 +20,6 @@
     <com.habitrpg.android.habitica.ui.views.CurrencyView
         android:id="@+id/currencyView"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        app:fontFamily="sans-serif-medium"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_pet_suggest_hatch.xml b/Habitica/res/layout/dialog_pet_suggest_hatch.xml
index e07ce4887..d64694e68 100644
--- a/Habitica/res/layout/dialog_pet_suggest_hatch.xml
+++ b/Habitica/res/layout/dialog_pet_suggest_hatch.xml
@@ -52,12 +52,14 @@
                 android:id="@+id/shimmer_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                app:shimmer_repeat_delay="8000">
+                app:shimmer_repeat_delay="8000"
+                app:shimmer_base_color="@color/text_dimmed"
+                app:shimmer_highlight_color="@color/content_background"
+                app:shimmer_highlight_alpha="0.8">
             <com.habitrpg.common.habitica.views.PixelArtView
                 android:id="@+id/pet_view"
                 android:layout_width="@dimen/gear_image_size"
                 android:layout_height="@dimen/gear_image_size"
-                android:alpha="0.1"
                 android:layout_gravity="center" />
             </com.facebook.shimmer.ShimmerFrameLayout>
         </FrameLayout>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserModule.java b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserModule.java
index e6e231245..3de77ecbe 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserModule.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserModule.java
@@ -3,6 +3,7 @@ package com.habitrpg.android.habitica.modules;
 import android.content.Context;
 import android.content.SharedPreferences;
 
+import com.habitrpg.android.habitica.BuildConfig;
 import com.habitrpg.android.habitica.data.TaskRepository;
 import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
@@ -28,7 +29,11 @@ public class UserModule {
     @Named(NAMED_USER_ID)
     @UserScope
     public String providesUserID(SharedPreferences sharedPreferences) {
-        return sharedPreferences.getString("UserID", "");
+        if (BuildConfig.DEBUG && !BuildConfig.TEST_USER_ID.isEmpty()) {
+            return BuildConfig.TEST_USER_ID;
+        } else {
+            return sharedPreferences.getString("UserID", "");
+        }
     }
 
     @Provides
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.kt
index b32719226..981c9e5e0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.kt
@@ -8,11 +8,11 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.common.habitica.models.tasks.TaskType
 import com.habitrpg.android.habitica.proxy.AnalyticsManager
 import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.viewHolders.BindableViewHolder
 import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel
+import com.habitrpg.common.habitica.models.tasks.TaskType
 import javax.inject.Inject
 
 abstract class BaseTasksRecyclerViewAdapter<VH : BindableViewHolder<Task>>(
@@ -60,13 +60,13 @@ abstract class BaseTasksRecyclerViewAdapter<VH : BindableViewHolder<Task>>(
         if (taskType != task.type)
             return
         var i = 0
-        while (i < this.content?.size ?: 0) {
+        while (i < (this.content?.size ?: 0)) {
             if (content?.get(i)?.id == task.id) {
                 break
             }
             ++i
         }
-        if (i < content?.size ?: 0) {
+        if (i < (content?.size ?: 0)) {
             content?.set(i, task)
         }
         filter()
diff --git a/common/src/main/java/com/habitrpg/common/habitica/api/HostConfig.kt b/common/src/main/java/com/habitrpg/common/habitica/api/HostConfig.kt
index 6fe0952bf..246f86e58 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/api/HostConfig.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/api/HostConfig.kt
@@ -7,12 +7,6 @@ import androidx.core.content.edit
 import com.habitrpg.common.habitica.BuildConfig
 import com.habitrpg.common.habitica.helpers.KeyHelper
 
-/**
- * The configuration of the host<br></br>
- * Currently, the Port isn't used at all.
- *
- * @author MagicMicky
- */
 class HostConfig {
     var address: String
     var port: String
@@ -30,6 +24,11 @@ class HostConfig {
         this.port = BuildConfig.PORT
         if (BuildConfig.DEBUG) {
             this.address = BuildConfig.BASE_URL
+            if (BuildConfig.TEST_USER_ID.isNotBlank()) {
+                userID = BuildConfig.TEST_USER_ID
+                apiKey = BuildConfig.TEST_USER_KEY
+                return
+            }
         } else {
             val address = sharedPreferences.getString("server_url", null)
             if (address != null && address.isNotEmpty()) {
@@ -39,7 +38,6 @@ class HostConfig {
             }
         }
         this.userID = sharedPreferences.getString(context.getString(com.habitrpg.common.habitica.R.string.SP_userID), null) ?: ""
-
         this.apiKey = loadAPIKey(sharedPreferences, keyHelper)
     }
 
diff --git a/version.properties b/version.properties
index 2c9269b28..3ba3383af 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
 NAME=4.0
-CODE=4180
\ No newline at end of file
+CODE=4190
\ No newline at end of file
diff --git a/wearos/build.gradle b/wearos/build.gradle
index cfce73bd7..af5452bc0 100644
--- a/wearos/build.gradle
+++ b/wearos/build.gradle
@@ -18,6 +18,9 @@ android {
         versionCode app_version_code + 1
         versionName app_version_name
         buildConfigField "String", "TESTING_LEVEL", "\"production\""
+
+        def formattedDate = new Date().format('yyMMdd')
+        archivesBaseName = "Habitica-WearOS-${formattedDate}${versionCode}"
     }
 
     signingConfigs {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserLocalRepository.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserLocalRepository.kt
index b353c9173..20c2dd4a5 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserLocalRepository.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/UserLocalRepository.kt
@@ -3,13 +3,14 @@ package com.habitrpg.wearos.habitica.data.repositories
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.asFlow
 import com.habitrpg.wearos.habitica.models.user.User
+import kotlinx.coroutines.flow.filterNotNull
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class UserLocalRepository @Inject constructor() {
     private val user = MutableLiveData<User?>()
-    fun getUser() = user.asFlow()
+    fun getUser() = user.asFlow().filterNotNull()
 
     fun saveUser(user: User) {
         this.user.value = user

From 2ea0757985233fd92d62586d9346c219592c18d9 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 7 Jul 2022 17:18:25 +0200
Subject: [PATCH 29/39] Better error display

---
 wearos/src/main/AndroidManifest.xml           |   2 +-
 .../wearos/habitica/MainApplication.kt        |  10 ----
 .../wearos/habitica/data/ApiClient.kt         |   8 +---
 .../habitica/ui/activities/BaseActivity.kt    |   7 ++-
 .../ui/activities/ConfirmationActivity.kt     |  35 ++++++++++++++
 .../habitica/ui/activities/RYAActivity.kt     |  44 +++++++++++++-----
 .../ConfirmactionActivityViewModel.kt         |  22 +++++++++
 .../main/res/drawable-mdpi/disconnected.png   | Bin 0 -> 577 bytes
 wearos/src/main/res/drawable-mdpi/error.png   | Bin 0 -> 693 bytes
 .../main/res/drawable-xhdpi/disconnected.png  | Bin 0 -> 1084 bytes
 wearos/src/main/res/drawable-xhdpi/error.png  | Bin 0 -> 1347 bytes
 .../main/res/drawable-xxhdpi/disconnected.png | Bin 0 -> 1494 bytes
 wearos/src/main/res/drawable-xxhdpi/error.png | Bin 0 -> 1938 bytes
 .../main/res/layout/activity_confirmation.xml |  18 +++++++
 wearos/src/main/res/layout/activity_rya.xml   |  11 +++++
 wearos/src/main/res/values/strings.xml        |   1 +
 16 files changed, 126 insertions(+), 32 deletions(-)
 create mode 100644 wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/ConfirmationActivity.kt
 create mode 100644 wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ConfirmactionActivityViewModel.kt
 create mode 100644 wearos/src/main/res/drawable-mdpi/disconnected.png
 create mode 100644 wearos/src/main/res/drawable-mdpi/error.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/disconnected.png
 create mode 100644 wearos/src/main/res/drawable-xhdpi/error.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/disconnected.png
 create mode 100644 wearos/src/main/res/drawable-xxhdpi/error.png
 create mode 100644 wearos/src/main/res/layout/activity_confirmation.xml

diff --git a/wearos/src/main/AndroidManifest.xml b/wearos/src/main/AndroidManifest.xml
index 795289991..225c637e6 100644
--- a/wearos/src/main/AndroidManifest.xml
+++ b/wearos/src/main/AndroidManifest.xml
@@ -51,7 +51,7 @@
         <activity android:name="com.habitrpg.wearos.habitica.ui.activities.ContinuePhoneActivity" />
         <activity android:name="com.habitrpg.wearos.habitica.ui.activities.LevelupActivity" />
 
-        <activity android:name="androidx.wear.activity.ConfirmationActivity" />
+        <activity android:name="com.habitrpg.wearos.habitica.ui.activities.ConfirmationActivity" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt
index 0de723f56..9472780e5 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt
@@ -8,7 +8,6 @@ import com.google.firebase.ktx.Firebase
 import com.habitrpg.android.habitica.BuildConfig
 import com.habitrpg.common.habitica.extensions.setupCoil
 import com.habitrpg.common.habitica.helpers.MarkdownParser
-import com.habitrpg.common.habitica.models.tasks.TaskType
 import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
 import com.habitrpg.wearos.habitica.data.repositories.UserRepository
 import com.habitrpg.wearos.habitica.ui.activities.BaseActivity
@@ -18,8 +17,6 @@ import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -43,13 +40,6 @@ class MainApplication : Application() {
                     intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                     startActivity(intent)
                 } else if (it.needsCron && BaseActivity.currentActivityClassName != RYAActivity::class.java.name) {
-                    val dueDailies = taskRepository.getTasks(TaskType.DAILY)
-                        .map { it.filter { task -> task.isDisplayedActive } }
-                        .first()
-                    if (dueDailies.isEmpty()) {
-                        userRepository.runCron()
-                        return@onEach
-                    }
                     val intent = Intent(this@MainApplication, RYAActivity::class.java)
                     intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                     startActivity(intent)
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt
index 604c0acd3..6c3ae574d 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt
@@ -157,12 +157,7 @@ class ApiClient @Inject constructor(
     }
 
     private suspend fun <T: Any> process(call: suspend () -> Response<WearableHabitResponse<T>>): NetworkResult<T> {
-        val response: Response<WearableHabitResponse<T>>
-        try {
-            response = call.invoke()
-        } catch (t: Exception) {
-            return NetworkResult.Error(t, false)
-        }
+        val response: Response<WearableHabitResponse<T>> = call.invoke()
 
         val wasCached = response.headers()["was-cached"] == "true"
 
@@ -170,6 +165,7 @@ class ApiClient @Inject constructor(
             val errorBody = response.errorBody()
             @Suppress("BlockingMethodInNonBlockingContext")
             NetworkResult.Error(Exception((response.message() + errorBody?.string())), !wasCached)
+            throw(java.lang.Exception(response.message()))
         } else {
             val body = response.body()
             return if (body?.data != null) {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt
index 109a2fe32..a38df5e3b 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt
@@ -8,11 +8,11 @@ import androidx.activity.ComponentActivity
 import androidx.core.view.children
 import androidx.lifecycle.lifecycleScope
 import androidx.viewbinding.ViewBinding
-import androidx.wear.activity.ConfirmationActivity
 import com.google.android.gms.tasks.Tasks
 import com.google.android.gms.wearable.CapabilityClient
 import com.google.android.gms.wearable.MessageClient
 import com.google.android.gms.wearable.Wearable
+import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ActivityWrapperBinding
 import com.habitrpg.wearos.habitica.managers.LoadingManager
 import com.habitrpg.wearos.habitica.ui.viewmodels.BaseViewModel
@@ -44,9 +44,8 @@ abstract class BaseActivity<B: ViewBinding, VM: BaseViewModel> : ComponentActivi
 
         viewModel.errorValues.observe(this) {
             val intent = Intent(this, ConfirmationActivity::class.java).apply {
-                putExtra(ConfirmationActivity.EXTRA_ANIMATION_TYPE, ConfirmationActivity.FAILURE_ANIMATION)
-                putExtra(ConfirmationActivity.EXTRA_MESSAGE, it.title)
-                putExtra(ConfirmationActivity.EXTRA_ANIMATION_DURATION_MILLIS, 3000)
+                putExtra("text", it.title)
+                putExtra("icon", R.drawable.error)
             }
             startActivity(intent)
         }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/ConfirmationActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/ConfirmationActivity.kt
new file mode 100644
index 000000000..a09846b28
--- /dev/null
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/ConfirmationActivity.kt
@@ -0,0 +1,35 @@
+package com.habitrpg.wearos.habitica.ui.activities
+
+import android.os.Bundle
+import androidx.activity.viewModels
+import androidx.lifecycle.lifecycleScope
+import com.habitrpg.android.habitica.databinding.ActivityConfirmationBinding
+import com.habitrpg.wearos.habitica.ui.viewmodels.ConfirmactionActivityViewModel
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
+
+@AndroidEntryPoint
+class ConfirmationActivity:
+    BaseActivity<ActivityConfirmationBinding, ConfirmactionActivityViewModel>() {
+    override val viewModel: ConfirmactionActivityViewModel by viewModels()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        binding = ActivityConfirmationBinding.inflate(layoutInflater)
+        super.onCreate(savedInstanceState)
+
+        binding.root.setOnClickListener {
+            finish()
+        }
+
+        lifecycleScope.launch {
+            delay(4.toDuration(DurationUnit.SECONDS))
+            finish()
+        }
+
+        binding.textView.setCompoundDrawablesWithIntrinsicBounds(0, viewModel.icon, 0, 0)
+        binding.textView.text = viewModel.text
+    }
+}
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt
index 8cf2b9868..c15619ab9 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt
@@ -1,7 +1,7 @@
 package com.habitrpg.wearos.habitica.ui.activities
 
 import android.os.Bundle
-import android.widget.FrameLayout
+import android.widget.LinearLayout
 import androidx.activity.viewModels
 import androidx.core.view.isVisible
 import com.habitrpg.android.habitica.R
@@ -22,6 +22,10 @@ class RYAActivity : BaseActivity<ActivityRyaBinding, RYAViewModel>() {
         super.onCreate(savedInstanceState)
 
         viewModel.tasks.observe(this) {
+            if (it.isEmpty()) {
+                runCron()
+                return@observe
+            }
             createTaskListViews(it)
         }
 
@@ -39,15 +43,33 @@ class RYAActivity : BaseActivity<ActivityRyaBinding, RYAViewModel>() {
         }
 
         binding.startDayButton.setOnClickListener {
-            startAnimatingProgress()
-            binding.startDayButton.isEnabled = false
-            viewModel.runCron {
-                stopAnimatingProgress()
-                if (it) {
-                    finish()
-                } else {
-                    binding.startDayButton.isEnabled = true
-                }
+            runCron()
+        }
+    }
+
+    private fun runCron() {
+        startAnimatingProgress()
+        binding.startDayButton.isEnabled = false
+        binding.startingTextView.isVisible = true
+        binding.startDayButton.isVisible = false
+        binding.taskView.isVisible = false
+        binding.descriptionView.isVisible = false
+        binding.titleView.isVisible = false
+        binding.phoneDescriptionView.isVisible = false
+        binding.ryaButton.isVisible = false
+        binding.phoneButton.isVisible = false
+        viewModel.runCron {
+            stopAnimatingProgress()
+            if (it) {
+                finish()
+            } else {
+                binding.startDayButton.isEnabled = true
+                binding.startingTextView.isVisible = false
+                binding.startDayButton.isVisible = true
+                binding.taskView.isVisible = true
+                binding.descriptionView.isVisible = true
+                binding.titleView.isVisible = true
+                binding.phoneDescriptionView.isVisible = true
             }
         }
     }
@@ -61,7 +83,7 @@ class RYAActivity : BaseActivity<ActivityRyaBinding, RYAViewModel>() {
                 viewModel.tappedTask(task)
             }
             holder.onTaskScore = { viewModel.tappedTask(task) }
-            val layoutParams = taskBinding.chip.layoutParams as FrameLayout.LayoutParams
+            val layoutParams = taskBinding.chip.layoutParams as LinearLayout.LayoutParams
             layoutParams.marginStart = 0
             layoutParams.marginEnd = 0
             taskBinding.chip.layoutParams = layoutParams
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ConfirmactionActivityViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ConfirmactionActivityViewModel.kt
new file mode 100644
index 000000000..992e2a0aa
--- /dev/null
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ConfirmactionActivityViewModel.kt
@@ -0,0 +1,22 @@
+package com.habitrpg.wearos.habitica.ui.viewmodels
+
+import androidx.lifecycle.SavedStateHandle
+import com.habitrpg.android.habitica.R
+import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
+import com.habitrpg.wearos.habitica.data.repositories.UserRepository
+import com.habitrpg.wearos.habitica.managers.LoadingManager
+import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+@HiltViewModel
+class ConfirmactionActivityViewModel @Inject constructor(
+    savedStateHandle: SavedStateHandle,
+    userRepository: UserRepository,
+    taskRepository: TaskRepository,
+    exceptionBuilder: ExceptionHandlerBuilder,
+    loadingManager: LoadingManager
+) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, loadingManager) {
+    val icon: Int = savedStateHandle.get("icon") ?: R.drawable.error
+    val text: String? = savedStateHandle.get("text")
+}
diff --git a/wearos/src/main/res/drawable-mdpi/disconnected.png b/wearos/src/main/res/drawable-mdpi/disconnected.png
new file mode 100644
index 0000000000000000000000000000000000000000..c882861888650362a25fffa0f4c0fb8ca7b860c8
GIT binary patch
literal 577
zcmV-H0>1r;P)<h;3K|Lk000e1NJLTq000*N000#T1^@s6t>Sg700009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0oF-GK~#7FtyRl$
z!Y~ls6}jX_2~a`EB@<_2usWavpn^;)04fPoz@!2h81Uo-CAb71bMSbxl0O)OKN)xz
zN!Ie-uJp73Ft+QT>2~c+;m*LV@*F@=@d{@4z?$a+HflFU6e9rYaX_2LfX5>dEc?=0
zRFa#_l{e$rv?#FSY9fMJ#qa%)KuT%(rQ}rt8?|2`B4-XR0{R5h;kna90P~A70i_OY
zDW8KhPARYRfbf+Qac#$vmE?s?uin8~GOnjG0ScupZ8yI!PT3sV+A&N#$aeX>t6UUP
z>oc84&>9x^MNF*A{5?Q?d7ZO}3IQo!jy(8!-a;5$C4Y#m*h$y|zPJUG&WUJQCy<g8
zU{4<tA8S^D&^|s9gB#Lg_uYA&*wUKy<=eQSKnjPCb(O{mf%uVTz?PciU7=AY5D|Tw
zN;$FYqmENs2e}k7YYt+fVOdH|T(nUhzh+}m!zZ92njDdC2MBaD`iM^=Ek|2WyXIDb
z6f6=5?j7r7-PW$TML;`6yC$JO#*NF}A0Yc^;6go|T$&fXh|SS8<nbe-RYBl?$O-5+
z&Q^BMdP{QKBPzbqTHYkS;39-OpsbrVwqh0ZYu4?;ETZTx317hcW#;e)VIvfEYH%7-
P00000NkvXXu0mjfoVN4T

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-mdpi/error.png b/wearos/src/main/res/drawable-mdpi/error.png
new file mode 100644
index 0000000000000000000000000000000000000000..949ad831e462c67f82a4d924d3d52f27a4199789
GIT binary patch
literal 693
zcmV;m0!safP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0!m3lK~#7FomFja
z(?AfNoqW(ArOFZ98>BZVC!h!w$$}`|6EvKl_6cZDu(3iDL4nW{&>PSj;3HU~e~9B<
zX6?1JcI`OIlPq~Z=6QDK%`<}r2q6YNIJ`h)uW9HgddyP903MZ;!3vTG&fTysp4AZ^
zbdN5jR1+EwpaqPn>wn3U&pD48iG^4=eeC^$O?JB?T*>&Aojq$I4V6?k4AjF4dTB;o
zSUVInWXLY7du?)-k%~bdU;ef?65+=W{QMfWU?%Q7s=-y6{O^gr7Sy8`ouez8G?9!~
zNoV5Q*?jip%$^(Za}T8C)|Au5!%3R4xq?6WiUj44#uQ-TR(!nxM3HTf{5^j+wbwt3
zy9r&*Co_yF>tpOg=hQw*l{EVpbL!r6nA3%3n8}nOj`Iz=P_QSIWJRpjK9cZ<#UcqG
z_C!q0V(~b-ctsPep&P=UIDo`%kd(L;q}?fGcNm%X_86v{z(}nRacv8`ndpzV5z%Sw
zEK?na`A7jfZ3?W@u?+?|+`PjhO3ChviL6bZLF*V1mP&S(siy0QQ5CV;`7j2Y>eS7g
zGbgcEgQS%W;6_C`7Qy#Y=OQTtIe!yLOTUUbXde6++ktE7cnVZNXZ(pWDYd%ZOWo>O
zY24_V7!z8O2_+>HB9VLU=&cW1a2qV?_@xgOCREtwf;>Yu*rslrT;p0fy2y35iDa9u
zZJRCRyP!m>QECvqu#%k<x^sU=LR}wUAK$I~`&d&%nmsw6HYwvL0~4SLLL$76;b~g^
b*X8&R%Ig`VTZmaG00000NkvXXu0mjfU!^gj

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/disconnected.png b/wearos/src/main/res/drawable-xhdpi/disconnected.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9cea6e0ce1e3cd1bc7d938b9ed1464c0de40f31
GIT binary patch
literal 1084
zcmV-C1jGA@P)<h;3K|Lk000e1NJLTq001rk001fo1^@s6%qVFg00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1JOxDK~#7F-B?{x
z)IbpK8MX?1Vm*P}z~ym4Wak9J34{}XC)o7_=m}g;0GwbFBP>3_4Gbq>t+K4OjMH{!
z|C7moiXXo!*kmT@eChObf71X9@Z4`*&mDB(2|!E_m^7g2O-6e=yY2Vzh!GNBB0ZnU
zO<wEkCcw{D16KAx$Xx)lK?a)RSsc>w4L!*JgLtmg))~}*koXsU*%v~*waliHXTl9R
zIs(MwInhk`WVaufwU0_|4xuDwp;DB*rw1Jncv^sP6h0!pdtLGi$mszYI3PoxV^<*b
zYzsDk(G5Qw%435Zby_wVi0D8O&ugul4Y8_evISL8A{hwVV0rR56d=zG{&nd*j9+BW
z0<_2;En3)s1Q-gNUA6TAst_+jUc%~ufoJ`+1?TFkV<}8GX<bM(o7-yp2C5J*N<J^N
z9&9uO&=<0L-`VN3736?Sn=HCu^FXP#A0RL}-!k3twAX<gkXaWn`Ee16pce8LyP}cH
zW@@N#fsrtxxP)$sh0<Z;>Os$DJHWN)S;fifajh>}o-@!5F}h17&8Xmc10!n|S%F`B
z8MnrXd+yayL&$47>_A?WB(IcWuR3va*>z!w_*iUV?pzvqS}F3h_-~_QD?+Si-8Um{
zRfq{NXeg#Jo^MN#M?gP5276zf!6%)PVZy~Z$*tcZ84gvpbC#xpDq;X@M0yB`<-Wjz
zb@c@;P?`3!VFuz%v^dz{e=C5!gaqT$>mTl@wqu*5im9yR$DW6pHY1@^$=;GPBzxOh
z9Vc&^M4G{iE5P5XuCPf3*>m;f@$^(mz+>BWq#O35pT~y#Brk<Hxu8@X9@EK7%Qa43
zvBRiB-hk`_SJBBIWtn}e%$Qy;<O%-@&$+yds<omLbBa`bUa-QZiZKk7v`I`+a%WR#
z*l?I~xZ39ED|He?7M9&d)=GX7u1<8EQgVxl`*HipJC!`BlROnWH#$aHaNSB=hP{z$
zsE>TYZpk3HmhsMF&Mb>M$WzvP6T21hhfI=|bVGNVGpnEqc~+`m30n$fN3!9ByxF9j
zdCi8$Ew=I~O&-mGZP<V~TM$`zo!ph;EtYi1(5<m;w{k-?=}R8jr}Fh}h;aW^r+ql@
z)`l&$FyTKOvdPbs;w+D|m_ky5@Q|>C%{<J&2^REIOw00uq}ZlrX0=>i2|46Jta5U-
z3UIVZZ_hXS@DRw6DpT7N4C-d>3Ensh`J##xNGE|!EGWz}iQgBBw)-9paYhmHnJu{c
zL}IVfn3#hfmB*)8@;tRdcGPwco(h<}N39F^-|!DosA?S9S%dBX0000<MNUMnLSTYz
Cd-MAM

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xhdpi/error.png b/wearos/src/main/res/drawable-xhdpi/error.png
new file mode 100644
index 0000000000000000000000000000000000000000..a335b288ac155b6f706834ca8efe0b415423131e
GIT binary patch
literal 1347
zcmV-J1-$x+P)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1lUPLK~#7F)maTv
z+c*?{lG7|RZJF!|)|{Z(6KryWFiScMlm?%GaDs#rket8?v}AUHp*Lvu1Wiv+?+G^3
zpP4q;Qr~k77)P>Ylfv|y$=I>vr{^cVPwzc3xC30*t(2|D4UkY}jQ>Vg2~dIgF9ZYd
z@Zw1j?-`flZ@!o~&ZY+i!Jq(+-P4-ISqGJ?K>^^PV=2UN+j%~KoXDl{YxkdB;Jkyk
zHY^7o2yu`{aU+FM(JJHou&6~1;LXHk-DIiotPZb-7kg;ccRx^Bf?ej1K8%jfJ6Ro5
zEqroxeki4E!##pA+1q;A+}F128b(KFu8^<`CWDX@Aq(Km1Ok}M;L((xm%z8N6&XWT
z(MkU>o+ZWx+b{ogG-EBo(6Un@WZ#F+J;!mTV1SW3vIST*BgfS!y`b=Dc-|2pyO0Xe
zpNTJBQ$>?--HQrZzs->v)A}(X_qUv8@7A;1f=1!uPmw`ZUEgt<V^{)+&rxX?Qml>R
z)#KycVhL3CE$HEKaryhQlqHZXlv#)QZm0z3a2Wr8ZQ*EBa5e9dvh_^^o(yRa{9U?7
zM;rXLv(e9bCtTZeW7(?q_|mws@Z1rUz-e(zl%@3#5TIaIrC%VRcXD)knDrjXrZIHw
zGPc%3g+uFVz78Gmz;qd4-vwrolC>#F%6gZ^5CU|wQ8{t{Zd@yj+ipwK(euUU9+*R;
zSS3?of)7>~FKXuD)?RoaiqR4}1|~(Rs|XxtJ>+&(8|g?h#Y+&>bOJa8W4LGdP}0t5
z86G!iNz_!0wB2srA<!-gvNDaWY~)bo7Kdl5wm`^#;emkc@?O~>m`xV8Rc#iC2|N(E
zZfwq;aj8)_0Df=Imc$G|XRL}gfXBt}L4IgHa+>SoS0K>!uViK%d4R+}TzDv9uuN(s
zg_Xj}aA`#LaqKu7?P#}}&VLw&%1`@w<>2hvy0#Kh$W*F#D2xXnx8sr0c)4R*#dOBP
zAPl6MLU^d~13@asrlJg&f_dsjuH@(Y0OfzG=VA5e*gb1tkbI%)FcY7C&Fe6fstX|+
z(ZELWa2#n_4->&U#|UYxd%47)<XVfAykhXu%^MHLQKlqS1BM$)m~os8&)#YxwkcY9
z&BV$S^_6+>zpBl2ro!SPfBFs-n;FFyTdj?H$io;n9B5=zezBfpR$~Y&@HK@7&Enw|
zzDhB#t!ks<Azg2By5ZReUFT%xssqX(3n!KHwp$x(S?@*}v@Qw0mceh70xiK)Do)M-
zSrB4D20BXS#zC^9bYCa;dIj97OQfu2f>DK$GT;D8bCv-AO;$`Dv4S>ZhQti9<Y1U?
z)1uezG?d*gxsY;^G9F-gVJ-gA3#F=8?rEEGmP$o9NcXG%v0uDY<)SmMcCzYsVaDES
zcH_^K#X$V>ZdTn3qU!k!^FGrv3sQ8Yw7Q40M2coGhv;v&o-cfmw%qz^csgLfbm@Om
z$e2<pt0X3Y&!<<hbQtkj7?aSU4Q}<O<yHxD_@dR^)r_Twp{17$wPml6dB$O~rk4eY
zHMAFr@@f)BhcXd+kT?I3kTW_4+sD(Si9ug;{4~d2NrWM(1ugWB1{6T#qz6U#ypY0I
zAet({QzU;;ivoT-Q8t){DHt8rNbw&X+RTD4Z|;(meg~WZKYoA@lF9%8002ovPDHLk
FV1gl{eq#Ut

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/disconnected.png b/wearos/src/main/res/drawable-xxhdpi/disconnected.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4a65c77b9fec463e7e8de2e755ff3fcba47cb01
GIT binary patch
literal 1494
zcmV;{1u6Q8P)<h;3K|Lk000e1NJLTq002b*002G+1^@s6eQ4Gz00009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1#3w}K~#7F<(gY|
z8b=U@s~U1_KLxMAXa&KKNWq#}L6j9pS%L8i1S>FJfs_?QS-}h<5_VpstU&A_ddNAF
zkI{6hhKmLPeVLgajp2V0q8l1Ms=KTHZh#dU^uHVr`om+`QsL7l7zoIyGi~j(_M2VU
zGA%$^0P@&l>%h#RtOWAdD>pDfFz^Ia8Wj{jNq~j~S)&h8pS9C-Bl>?tgWg6m>PH|$
z-`~520u@6!4=xW7@efVU)L?>OSg#5=1S#9}Mm4Y(g9^V%==y$h1dcV26asTfU=B6C
zt-!=E5Kic!2RVs8@TqG!i)%_a3_$k<48g>^SNh1%iKdq9?)$qvaG(V!K@ilc_=3P-
zL-Q&nm}!JC;5s-Jo{gpakayH9ZOPvs7#NKu_<4fCRZng^7+lw|&0tW~=n71ni%9sL
z9)@FhdF}geZy)<!)v9n$<H-X+`~|FF;`La*@RRSCMyTtMFBtqtJJP3?-weS}=fUs@
z5x5SkoAgJNy`T4YKR^a)p|J7-lSPAI*ntTgz2w+$`K=IAN|<z_c)T6UuRe{YPPZj=
zTvgW;T^%8#w={@;YTyqaA%l#du*v{tk7^(xrLPAg8$9hGrHrAl$^r%?{;KOo>(C*j
zlob>fgNY_Phgxo@QpgLorkgjQiX2kN8VYZjVzO20<q*smzIJreD1yoXq>$n6Lm=Sp
zXbQsvTRGa5`m`en^^P=ZdCeWLlr~ZZ{m<{Kcy}W>$4F}dIEt7E?t7YOsq+sCmRbvi
zldafFkg}Ic`R@P>uWy{is`^ynKXq=kLMx#p(sB>-lmjs2tNa7XAw?Z5wFD)50jJ3!
zat4E%^gyQg9t%+NsA#2x-yk-gRh{w!^8jL`Y8NOD`@v;92ri7L(E^kT$PQ#I@gL$!
z6)3?g4va>1-Xy9hu4s+CG0Aij#`OhNqv8aNL{mf}Cr?YI|4hbFmvOtMalGj`Hd1;o
z^GG2eh83v%G?uS+xIp8~a-Da<1C}gelHwoihNso4#uy4m323JcM+Z<zzS}l6aY_yb
zcv`I*H-=&qB~*mjm_sv_9So1lhk?nbL=gPVt8!ia!l;`D$V_DiLx+GTyavwx7Xrqf
z<~5_1zt@3`Dmj?i^dvJDQs|taqUxnXZaRs}4rQjIb|uyY<tCKJG>kposf{V9%6y~h
zCm;$TM->?{Y)HNHo2QfUr2ggtR^#!I5*n%MN2Rxsy<n>%BW5z5nfX4JFJD`mOnIs3
zHD+R^vW=;(%_?x`JsT8O@nD)Gs?Gic<xsLAbmY>QG&U-JSCXNswSwY};A>Q>PH9XU
zTNMdLS5=cg^O}xPWM9<@v6}j*z(!@tV+3tII+NxoneDk$5nu$Z8OnCVe?<g%1{x)^
zJ=by#hQ9QBRr>?kn_}uIgrJu9SN}58`K*mxf#H)0(Bwq|9<I%=jKbua!?);FH|zZm
zQ{|c9u^q|o8>khZ6UBMTJAap_P^ftU`AgWY;{8>Y!)qJm8!_Tm_dYmf@Oa~zY(22E
z_2LV^JO?9_>k%0w=$Jy7+)c@N)r@|C9sVH}@6p;^j47+qf{8t&i5sv~>>1s>F1zf(
zESxzn)jqVo98p52ziLrtY1Wu0Yt`)WTx)HCL2%gv&7NL*8AJ^KeR|ZP^h)}{=eEG;
z*wOv^VwA#<F}N~1tn<m?cfHP7f-!d05^(mx{q5=eWdSCY)i?#zm>4oxqjRGl;h9CB
z#e<xzO(*{Ab12UX&>I7Vl^2+eg2KuJ%(EKTE@XTGI*Qf?#KuL+Ov;E!)H$oPu~1km
w!DxW6Hg5VPHJeKFTFwB-R_Q$WVtgh2f4enhZhmHQdjJ3c07*qoM6N<$f=<-6`Tzg`

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable-xxhdpi/error.png b/wearos/src/main/res/drawable-xxhdpi/error.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf4000989d1c19038dd9f291cba33757dfc5ffda
GIT binary patch
literal 1938
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
Y57}^NYSS<WHvj+t07*qoM6N<$f)#3ST>t<8

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/layout/activity_confirmation.xml b/wearos/src/main/res/layout/activity_confirmation.xml
new file mode 100644
index 000000000..5b4c7543a
--- /dev/null
+++ b/wearos/src/main/res/layout/activity_confirmation.xml
@@ -0,0 +1,18 @@
+<?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:gravity="center">
+    <TextView
+        android:id="@+id/text_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/spacing_xlarge"
+        tools:visibility="visible"
+        style="@style/Text.Body1"
+        android:textColor="@color/gray_200"
+        android:drawablePadding="@dimen/spacing_medium"
+        android:gravity="center"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/activity_rya.xml b/wearos/src/main/res/layout/activity_rya.xml
index ed3ca84d5..7dcefdfd2 100644
--- a/wearos/src/main/res/layout/activity_rya.xml
+++ b/wearos/src/main/res/layout/activity_rya.xml
@@ -57,6 +57,7 @@
             android:layout_marginTop="2dp"
             android:visibility="gone"/>
         <TextView
+            android:id="@+id/phone_description_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/checklist_disclaimer"
@@ -64,5 +65,15 @@
             android:gravity="center"
             style="@style/Text.Body1"
             android:layout_marginTop="@dimen/spacing_medium" />
+        <TextView
+            android:id="@+id/starting_text_view"
+            android:layout_width="match_parent"
+            android:layout_height="400dp"
+            android:text="@string/starting_your_day"
+            style="@style/Text.SubHeader1"
+            android:textColor="@color/gray_500"
+            android:gravity="center"
+            android:layout_margin="@dimen/spacing_xlarge"
+            android:visibility="gone"/>
     </LinearLayout>
 </com.habitrpg.wearos.habitica.ui.views.HabiticaScrollView>
\ No newline at end of file
diff --git a/wearos/src/main/res/values/strings.xml b/wearos/src/main/res/values/strings.xml
index 2d3bd641b..56cd1da5d 100644
--- a/wearos/src/main/res/values/strings.xml
+++ b/wearos/src/main/res/values/strings.xml
@@ -38,4 +38,5 @@
     <string name="continue_on_your_phone">Continue on your phone</string>
     <string name="levelup_description">You leveled up through all your hard work!</string>
     <string name="all_done_today">All done today!</string>
+    <string name="starting_your_day">Starting your Day...</string>
 </resources>
\ No newline at end of file

From a90925f81a002b1dd701bd64077d8b3aed89b2fd Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 7 Jul 2022 17:28:43 +0200
Subject: [PATCH 30/39] github action fixes

---
 .github/prepare-workflow    | 3 ++-
 habitica.properties.example | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/prepare-workflow b/.github/prepare-workflow
index 7e117d5fa..ba73ad72e 100755
--- a/.github/prepare-workflow
+++ b/.github/prepare-workflow
@@ -1,4 +1,5 @@
 chmod +x gradlew
 cp habitica.properties.example habitica.properties
 cp habitica.resources.example habitica.resources
-cp Habitica/google-services.json.example Habitica/google-services.json
\ No newline at end of file
+cp Habitica/google-services.json.example Habitica/google-services.json
+cp Habitica/google-services.json.example wearos/google-services.json
diff --git a/habitica.properties.example b/habitica.properties.example
index dd5474b4d..00bdf2597 100644
--- a/habitica.properties.example
+++ b/habitica.properties.example
@@ -8,3 +8,5 @@ ANDROID_TESTING_UUID=
 APPLE_AUTH_CLIENT_ID=
 DEBUG_USER_ID=
 DEBUG_API_KEY=
+TEST_USER_ID=
+TEST_USER_KEY=

From 46c8b9efa1ddbdbb8af367383e2e2e973cd4b086 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Mon, 11 Jul 2022 12:48:01 +0200
Subject: [PATCH 31/39] Implement input chooser activity

---
 .../receivers/DeviceCommunicationService.kt   | 12 +--
 version.properties                            |  2 +-
 wearos/src/main/AndroidManifest.xml           |  1 +
 .../wearos/habitica/MainApplication.kt        |  4 +-
 .../wearos/habitica/data/ApiClient.kt         |  2 +-
 .../habitica/ui/activities/BaseActivity.kt    |  7 +-
 .../ui/activities/ContinuePhoneActivity.kt    | 18 ++++-
 .../habitica/ui/activities/InputActivity.kt   | 74 +++++++++++++++++++
 .../habitica/ui/activities/LoginActivity.kt   |  2 +-
 .../habitica/ui/activities/SplashActivity.kt  | 17 +++--
 .../ui/activities/TaskFormActivity.kt         | 44 +++++------
 .../ui/viewmodels/ContinuePhoneViewModel.kt   | 13 +++-
 .../habitica/ui/viewmodels/InputViewModel.kt  | 20 +++++
 .../src/main/res/drawable/ic_microphone.xml   |  5 ++
 wearos/src/main/res/layout/activity_input.xml | 53 +++++++++++++
 .../main/res/layout/activity_task_form.xml    |  1 +
 16 files changed, 229 insertions(+), 46 deletions(-)
 create mode 100644 wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/InputActivity.kt
 create mode 100644 wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/InputViewModel.kt
 create mode 100644 wearos/src/main/res/drawable/ic_microphone.xml
 create mode 100644 wearos/src/main/res/layout/activity_input.xml

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/DeviceCommunicationService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/DeviceCommunicationService.kt
index a3e2eb3fe..5ced9de91 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/DeviceCommunicationService.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/DeviceCommunicationService.kt
@@ -26,17 +26,18 @@ class DeviceCommunicationService : WearableListenerService() {
         super.onMessageReceived(event)
         when (event.path) {
             DeviceCommunication.REQUEST_AUTH -> processAuthRequest(event)
-            DeviceCommunication.SHOW_REGISTER -> openActivity(LoginActivity::class.java)
-            DeviceCommunication.SHOW_LOGIN -> openActivity(LoginActivity::class.java)
-            DeviceCommunication.SHOW_RYA -> openActivity(MainActivity::class.java)
+            DeviceCommunication.SHOW_REGISTER -> openActivity(event, LoginActivity::class.java)
+            DeviceCommunication.SHOW_LOGIN -> openActivity(event, LoginActivity::class.java)
+            DeviceCommunication.SHOW_RYA -> openActivity(event, MainActivity::class.java)
             DeviceCommunication.SHOW_TASK_EDIT -> openTaskForm(event)
         }
     }
 
-    private fun openActivity(activityClass: Class<*>) {
+    private fun openActivity(event: MessageEvent, activityClass: Class<*>) {
         val intent = Intent(this, activityClass)
         intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
         startActivity(intent)
+        messageClient.sendMessage(event.sourceNodeId, "/action_completed", null)
     }
 
     private fun openTaskForm(event: MessageEvent) {
@@ -44,7 +45,8 @@ class DeviceCommunicationService : WearableListenerService() {
         val startIntent = Intent(this, TaskFormActivity::class.java).apply {
             putExtra(TaskFormActivity.TASK_ID_KEY, taskID)
         }
-         startActivity(startIntent)
+        startActivity(startIntent)
+        messageClient.sendMessage(event.sourceNodeId, "/action_completed", null)
     }
 
     private fun processAuthRequest(event: MessageEvent) {
diff --git a/version.properties b/version.properties
index 3ba3383af..d89172c60 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
 NAME=4.0
-CODE=4190
\ No newline at end of file
+CODE=4200
\ No newline at end of file
diff --git a/wearos/src/main/AndroidManifest.xml b/wearos/src/main/AndroidManifest.xml
index 225c637e6..72cf9cb4a 100644
--- a/wearos/src/main/AndroidManifest.xml
+++ b/wearos/src/main/AndroidManifest.xml
@@ -52,6 +52,7 @@
         <activity android:name="com.habitrpg.wearos.habitica.ui.activities.LevelupActivity" />
 
         <activity android:name="com.habitrpg.wearos.habitica.ui.activities.ConfirmationActivity" />
+        <activity android:name="com.habitrpg.wearos.habitica.ui.activities.InputActivity" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt
index 9472780e5..dfd35ac60 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/MainApplication.kt
@@ -58,7 +58,9 @@ class MainApplication : Application() {
     }
 
     private fun logLaunch() {
-        Firebase.analytics.logEvent("wear_launched", null)
+        if (!BuildConfig.DEBUG) {
+            Firebase.analytics.logEvent("wear_launched", null)
+        }
     }
 
     private fun setupFirebase() {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt
index 6c3ae574d..626569909 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt
@@ -123,7 +123,7 @@ class ApiClient @Inject constructor(
                 val responseBuilder = response.newBuilder()
                 responseBuilder.header("was-cached", (response.networkResponse == null).toString())
                 if (request.method == "GET") {
-                    if (response.code == 504) {
+                    if (response.code == 504 || response.request.header("x-api-user") != hostConfig.userID) {
                         // Cache miss. Network might be down, but retry call without cache to be sure.
                         chain.proceed(request.newBuilder()
                             .header("Cache-Control", "no-cache")
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt
index a38df5e3b..62890276a 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt
@@ -87,9 +87,12 @@ abstract class BaseActivity<B: ViewBinding, VM: BaseViewModel> : ComponentActivi
         }
     }
 
-    internal fun openRemoteActivity(url: String) {
+    internal fun openRemoteActivity(url: String, keepActive: Boolean = false) {
         sendMessage("open_activity", url, null)
-        startActivity(Intent(this, ContinuePhoneActivity::class.java))
+        startActivity(Intent(this, ContinuePhoneActivity::class.java)
+            .apply {
+                putExtra("keep_active", keepActive)
+            })
     }
 
     internal fun sendMessage(
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/ContinuePhoneActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/ContinuePhoneActivity.kt
index 1011af0b6..9334208d5 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/ContinuePhoneActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/ContinuePhoneActivity.kt
@@ -20,7 +20,7 @@ import kotlin.time.toDuration
 class ContinuePhoneActivity : BaseActivity<ActivityContinuePhoneBinding, ContinuePhoneViewModel>() {
     override val viewModel: ContinuePhoneViewModel by viewModels()
 
-    private var secondsToShow = 2
+    private var secondsToShow = 5
 
     override fun onCreate(savedInstanceState: Bundle?) {
         binding = ActivityContinuePhoneBinding.inflate(layoutInflater)
@@ -29,16 +29,23 @@ class ContinuePhoneActivity : BaseActivity<ActivityContinuePhoneBinding, Continu
 
     override fun onStart() {
         super.onStart()
+        messageClient.addListener(viewModel)
 
         binding.root.setOnClickListener {
             finish()
         }
 
-        lifecycleScope.launch {
-            delay(secondsToShow.toDuration(DurationUnit.SECONDS))
+        viewModel.onActionCompleted = {
             finish()
         }
 
+        if (!viewModel.keepActive) {
+            lifecycleScope.launch {
+                delay(secondsToShow.toDuration(DurationUnit.SECONDS))
+                finish()
+            }
+        }
+
         val alphaAnimation = AlphaAnimation(0f, 1f)
         val translateAnimation = TranslateAnimation((-20f).dpToPx(this), 0f, 0f, 0f)
         val set = AnimationSet(true)
@@ -51,4 +58,9 @@ class ContinuePhoneActivity : BaseActivity<ActivityContinuePhoneBinding, Continu
         set.addAnimation(translateAnimation)
         binding.iconView.startAnimation(set)
     }
+
+    override fun onDestroy() {
+        messageClient.removeListener(viewModel)
+        super.onDestroy()
+    }
 }
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/InputActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/InputActivity.kt
new file mode 100644
index 000000000..7190ed278
--- /dev/null
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/InputActivity.kt
@@ -0,0 +1,74 @@
+package com.habitrpg.wearos.habitica.ui.activities
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.speech.RecognizerIntent
+import android.view.inputmethod.EditorInfo
+import android.view.inputmethod.InputMethodManager
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.activity.viewModels
+import androidx.core.view.postDelayed
+import com.habitrpg.android.habitica.databinding.ActivityInputBinding
+import com.habitrpg.wearos.habitica.ui.viewmodels.InputViewModel
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class InputActivity: BaseActivity<ActivityInputBinding, InputViewModel>() {
+    override val viewModel: InputViewModel by viewModels()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        binding = ActivityInputBinding.inflate(layoutInflater)
+        super.onCreate(savedInstanceState)
+        binding.titleView.text = viewModel.title
+
+        binding.speechInput.setOnClickListener {
+            showSpeechInput()
+        }
+        binding.keyboardInput.setOnClickListener {
+            showKeyboard()
+        }
+
+        binding.editText.setOnEditorActionListener { _, actionId, _ ->
+            if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE) {
+                if (binding.editText.text?.isNotEmpty() == true) {
+                    returnInput(binding.editText.text.toString())
+                }
+            }
+            false
+        }
+    }
+
+    private fun returnInput(inputString: String?) {
+        val data = Intent()
+        data.putExtra("input", inputString)
+        setResult(Activity.RESULT_OK, data)
+        finish()
+    }
+
+    private fun showKeyboard() {
+        binding.editText.hint = binding.titleView.text
+        binding.editText.requestFocus()
+        binding.editText.postDelayed(100) {
+            val imm: InputMethodManager =
+                getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+            imm.showSoftInput(binding.editText, InputMethodManager.SHOW_FORCED)
+        }
+    }
+
+    private val speechInputResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+        if (it.resultCode == Activity.RESULT_OK) {
+            val spokenText: String? = it.data?.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)?.firstOrNull()
+            returnInput(spokenText)
+        }
+    }
+
+    private fun showSpeechInput() {
+        val intent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH).apply {
+            putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM)
+            putExtra(RecognizerIntent.EXTRA_PROMPT, binding.titleView.text)
+        }
+        speechInputResult.launch(intent)
+    }
+}
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/LoginActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/LoginActivity.kt
index 7ac08bc65..43fd23a86 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/LoginActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/LoginActivity.kt
@@ -87,7 +87,7 @@ class LoginActivity: BaseActivity<ActivityLoginBinding, LoginViewModel>() {
     }
 
     private fun openRegisterOnPhone() {
-        openRemoteActivity(DeviceCommunication.SHOW_REGISTER)
+        openRemoteActivity(DeviceCommunication.SHOW_REGISTER, true)
     }
 
     private fun openLoginOnPhone() {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SplashActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SplashActivity.kt
index dde4ac344..f9c85abb2 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SplashActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SplashActivity.kt
@@ -30,8 +30,13 @@ class SplashActivity: BaseActivity<ActivitySplashBinding, SplashViewModel>() {
                 startLoginActivity()
             }
         }
+    }
 
+    override fun onStart() {
+        super.onStart()
         messageClient.addListener(viewModel)
+
+        if (!viewModel.hasAuthentication) {
             sendMessage("provide_auth", "/request/auth", null) {
                 if (it) {
                     showAccountLoader(true)
@@ -40,6 +45,13 @@ class SplashActivity: BaseActivity<ActivitySplashBinding, SplashViewModel>() {
                     startLoginActivity()
                 }
             }
+        }
+    }
+
+
+    override fun onStop() {
+        messageClient.removeListener(viewModel)
+        super.onStop()
     }
 
     private fun startMainActivity() {
@@ -64,9 +76,4 @@ class SplashActivity: BaseActivity<ActivitySplashBinding, SplashViewModel>() {
             binding.textView.isVisible = show
         }
     }
-
-    override fun onPause() {
-        messageClient.removeListener(viewModel)
-        super.onPause()
-    }
 }
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskFormActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskFormActivity.kt
index 6dfcd5ffe..072e683cc 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskFormActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskFormActivity.kt
@@ -1,17 +1,14 @@
 package com.habitrpg.wearos.habitica.ui.activities
 
 import android.app.Activity
-import android.content.Context
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.os.Bundle
-import android.view.inputmethod.EditorInfo
-import android.view.inputmethod.InputMethodManager
 import android.widget.TextView
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
-import androidx.core.view.postDelayed
 import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ActivityTaskFormBinding
@@ -45,23 +42,16 @@ class TaskFormActivity : BaseActivity<ActivityTaskFormBinding, TaskFormViewModel
         binding = ActivityTaskFormBinding.inflate(layoutInflater)
         super.onCreate(savedInstanceState)
 
-        binding.editText.setOnEditorActionListener { _, actionId, _ ->
-            if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE) {
-                if (binding.editText.text?.isNotEmpty() == true) {
-                    binding.editTaskWrapper.isVisible = false
-                    binding.taskConfirmationWrapper.isVisible = true
-                    binding.confirmationText.text = binding.editText.text
-                    binding.editText.clearFocus()
-                }
-            }
-            false
+        binding.editText.setOnClickListener {
+            it.clearFocus()
+            requestInput()
         }
+
         binding.editButton.setOnClickListener {
             binding.editTaskWrapper.isVisible = true
             binding.taskConfirmationWrapper.isVisible = false
             if (intent.extras?.containsKey("task_type") == true) {
-                binding.editText.requestFocus()
-                showKeyboard()
+                requestInput()
             }
         }
         binding.todoButton.setOnClickListener { taskType = TaskType.TODO }
@@ -91,26 +81,28 @@ class TaskFormActivity : BaseActivity<ActivityTaskFormBinding, TaskFormViewModel
             binding.taskTypeHeader.isVisible = false
             binding.taskTypeWrapper.isVisible = false
             binding.header.textView.text = getString(R.string.create_task, taskType?.value)
-            binding.editText.requestFocus()
+            requestInput()
         } else {
             taskType = TaskType.TODO
             binding.header.textView.text = getString(R.string.new_task)
         }
     }
 
-    override fun onResume() {
-        super.onResume()
-        if (binding.editText.hasFocus()) {
-            showKeyboard()
+    private val inputResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+        val input = it.data?.getStringExtra("input")
+        if (input?.isNotBlank() == true) {
+            binding.editTaskWrapper.isVisible = false
+            binding.taskConfirmationWrapper.isVisible = true
+            binding.confirmationText.text = input
+            binding.editText.setText(input)
         }
     }
 
-    private fun showKeyboard() {
-        binding.editText.postDelayed(100) {
-            val imm: InputMethodManager =
-                getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-            imm.showSoftInput(binding.editText, InputMethodManager.SHOW_FORCED)
+    private fun requestInput() {
+        val intent = Intent(this, InputActivity::class.java).apply {
+            putExtra("title", getString(R.string.task_title_hint))
         }
+        inputResult.launch(intent)
     }
 
     private fun updateTaskTypeButton(button: TextView, thisType: TaskType) {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ContinuePhoneViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ContinuePhoneViewModel.kt
index 4ddd9c3c1..bce34e5d7 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ContinuePhoneViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ContinuePhoneViewModel.kt
@@ -1,5 +1,8 @@
 package com.habitrpg.wearos.habitica.ui.viewmodels
 
+import androidx.lifecycle.SavedStateHandle
+import com.google.android.gms.wearable.MessageClient
+import com.google.android.gms.wearable.MessageEvent
 import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
 import com.habitrpg.wearos.habitica.data.repositories.UserRepository
 import com.habitrpg.wearos.habitica.managers.LoadingManager
@@ -9,10 +12,18 @@ import javax.inject.Inject
 
 @HiltViewModel
 class ContinuePhoneViewModel @Inject constructor(
+    savedStateHandle: SavedStateHandle,
     userRepository: UserRepository,
     taskRepository: TaskRepository,
     exceptionBuilder: ExceptionHandlerBuilder,
     loadingManager: LoadingManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, loadingManager) {
+) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, loadingManager), MessageClient.OnMessageReceivedListener {
+    val keepActive = savedStateHandle.get<Boolean>("keep_active") ?: false
+    var onActionCompleted: (() -> Unit)? = null
 
+    override fun onMessageReceived(event: MessageEvent) {
+        when (event.path) {
+            "/action_completed" -> onActionCompleted?.invoke()
+        }
+    }
 }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/InputViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/InputViewModel.kt
new file mode 100644
index 000000000..4a5661809
--- /dev/null
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/InputViewModel.kt
@@ -0,0 +1,20 @@
+package com.habitrpg.wearos.habitica.ui.viewmodels
+
+import androidx.lifecycle.SavedStateHandle
+import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
+import com.habitrpg.wearos.habitica.data.repositories.UserRepository
+import com.habitrpg.wearos.habitica.managers.LoadingManager
+import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+@HiltViewModel
+class InputViewModel @Inject constructor(
+    savedStateHandle: SavedStateHandle,
+    userRepository: UserRepository,
+    taskRepository: TaskRepository,
+    exceptionBuilder: ExceptionHandlerBuilder,
+    loadingManager: LoadingManager
+) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, loadingManager) {
+    val title = savedStateHandle.get<String>("title") ?: ""
+}
diff --git a/wearos/src/main/res/drawable/ic_microphone.xml b/wearos/src/main/res/drawable/ic_microphone.xml
new file mode 100644
index 000000000..05ab75366
--- /dev/null
+++ b/wearos/src/main/res/drawable/ic_microphone.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,14c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zM17.3,11c0,3 -2.54,5.1 -5.3,5.1S6.7,14 6.7,11L5,11c0,3.41 2.72,6.23 6,6.72L11,21h2v-3.28c3.28,-0.48 6,-3.3 6,-6.72h-1.7z"/>
+</vector>
diff --git a/wearos/src/main/res/layout/activity_input.xml b/wearos/src/main/res/layout/activity_input.xml
new file mode 100644
index 000000000..b7b1c97d3
--- /dev/null
+++ b/wearos/src/main/res/layout/activity_input.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+<LinearLayout
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:orientation="vertical"
+    android:gravity="center">
+    <TextView
+        android:id="@+id/title_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:layout_marginBottom="@dimen/spacing_large"/>
+    <LinearLayout
+        android:id="@+id/picker_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <ImageView
+            android:id="@+id/speech_input"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:src="@drawable/ic_microphone"
+            android:tint="@color/watch_black"
+            android:scaleType="center"
+            android:background="@drawable/circle"
+            android:backgroundTint="@color/watch_purple_100"
+            android:layout_marginEnd="16dp"/>
+        <ImageView
+            android:id="@+id/keyboard_input"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:src="@drawable/ic_keyboard"
+            android:tint="@color/watch_black"
+            android:scaleType="center"
+            android:background="@drawable/circle"
+            android:backgroundTint="@color/watch_purple_100"/>
+        <FrameLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone">
+        <EditText
+            android:id="@+id/edit_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+        </FrameLayout>
+    </LinearLayout>
+</LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/activity_task_form.xml b/wearos/src/main/res/layout/activity_task_form.xml
index 8d7e7a697..1e6158e8b 100644
--- a/wearos/src/main/res/layout/activity_task_form.xml
+++ b/wearos/src/main/res/layout/activity_task_form.xml
@@ -65,6 +65,7 @@
                 android:paddingHorizontal="18dp"
                 android:hint="@string/task_title_hint"
                 android:background="@drawable/row_background_outline"
+                android:focusable="false"
                 android:inputType="textCapSentences" />
             <TextView
                 android:id="@+id/task_type_header"

From 7126bc7832f395bec1622616029c91be3881b491 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 12 Jul 2022 18:48:19 +0200
Subject: [PATCH 32/39] implement disconnected state

---
 Habitica/res/layout/activity_armoire.xml      |   1 +
 .../habitica/ui/activities/ArmoireActivity.kt |   7 +-
 .../habitica/ui/activities/DeathActivity.kt   |   2 +-
 .../habitica/widget/TaskListFactory.kt        |   2 +-
 .../wearos/habitica/data/ApiClient.kt         |  17 +-
 .../habitica/managers/AppStateManager.kt      |  22 +++
 .../habitica/managers/LoadingManager.kt       |  20 ---
 .../wearos/habitica/modules/AppModule.kt      |   7 +-
 .../habitica/ui/activities/BaseActivity.kt    |  16 +-
 .../habitica/ui/activities/MainActivity.kt    |   7 +
 .../habitica/ui/activities/RYAActivity.kt     |  19 ++-
 .../ui/activities/SettingsActivity.kt         |   8 +-
 .../ui/activities/TaskListActivity.kt         |  10 ++
 .../ui/activities/TaskResultActivity.kt       |   5 +-
 .../habitica/ui/adapters/BaseAdapter.kt       |  52 +++++-
 .../wearos/habitica/ui/adapters/HubAdapter.kt |  25 +--
 .../habitica/ui/adapters/SettingsAdapter.kt   |  25 +--
 .../habitica/ui/adapters/TaskListAdapter.kt   |  33 ++--
 .../ui/viewHolders/DisconnectedViewHolder.kt  |   6 +
 .../ui/viewHolders/HeaderTaskViewHolder.kt    |   3 +-
 .../ui/viewHolders/HeaderViewHolder.kt        |  11 +-
 .../habitica/ui/viewmodels/AvatarViewModel.kt |   6 +-
 .../habitica/ui/viewmodels/BaseViewModel.kt   |   8 +-
 .../ConfirmactionActivityViewModel.kt         |   6 +-
 .../ui/viewmodels/ContinuePhoneViewModel.kt   |   6 +-
 .../habitica/ui/viewmodels/FaintViewModel.kt  |   6 +-
 .../ui/viewmodels/HabitDirectionViewModel.kt  |   6 +-
 .../habitica/ui/viewmodels/InputViewModel.kt  |   6 +-
 .../ui/viewmodels/LevelupViewModel.kt         |   6 +-
 .../habitica/ui/viewmodels/LoginViewModel.kt  |   6 +-
 .../habitica/ui/viewmodels/MainViewModel.kt   |   6 +-
 .../habitica/ui/viewmodels/RYAViewModel.kt    |  10 +-
 .../ui/viewmodels/SettingsViewModel.kt        |  10 +-
 .../habitica/ui/viewmodels/SplashViewModel.kt |   6 +-
 .../habitica/ui/viewmodels/StatsViewModel.kt  |   6 +-
 .../ui/viewmodels/TaskDetailViewModel.kt      |   6 +-
 .../ui/viewmodels/TaskFormViewModel.kt        |   6 +-
 .../ui/viewmodels/TaskListViewModel.kt        |   6 +-
 .../ui/viewmodels/TaskResultViewModel.kt      |   6 +-
 .../habitica/ui/views/HabiticaRecyclerView.kt |   4 +-
 .../util/HabiticaCoroutineExceptionhandler.kt |   6 +-
 wearos/src/main/res/layout/activity_rya.xml   | 149 +++++++++---------
 .../src/main/res/layout/empty_task_list.xml   |   1 +
 .../src/main/res/layout/row_disconnected.xml  |  12 ++
 wearos/src/main/res/layout/row_header.xml     |  23 ++-
 .../src/main/res/layout/row_task_header.xml   |   3 +
 wearos/src/main/res/values/strings.xml        |   1 +
 47 files changed, 358 insertions(+), 257 deletions(-)
 create mode 100644 wearos/src/main/java/com/habitrpg/wearos/habitica/managers/AppStateManager.kt
 delete mode 100644 wearos/src/main/java/com/habitrpg/wearos/habitica/managers/LoadingManager.kt
 create mode 100644 wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/DisconnectedViewHolder.kt
 create mode 100644 wearos/src/main/res/layout/row_disconnected.xml

diff --git a/Habitica/res/layout/activity_armoire.xml b/Habitica/res/layout/activity_armoire.xml
index 15e6339d5..0bde38bc3 100644
--- a/Habitica/res/layout/activity_armoire.xml
+++ b/Habitica/res/layout/activity_armoire.xml
@@ -85,6 +85,7 @@
             tools:text="+21 Experience"
             android:textStyle="bold"
             android:textSize="28sp"
+            android:gravity="center"
             android:textColor="@color/text_primary"/>
         <TextView
             android:id="@+id/subtitle_view"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
index f98d13c19..c9d4c5205 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
@@ -26,7 +26,6 @@ import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.ads.AdButton
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaBottomSheetDialog
 import com.plattysoft.leonids.ParticleSystem
-import kotlinx.coroutines.launch
 import java.util.Locale
 import javax.inject.Inject
 
@@ -156,10 +155,8 @@ class ArmoireActivity : BaseActivity() {
         binding.titleView.alpha = 0f
         binding.subtitleView.alpha = 0f
 
-        lifecycleScope.launch {
-            if (binding.iconWrapper.isAttachedToWindow) {
-                Animations.circularReveal(binding.iconWrapper, 300)
-            }
+        binding.iconWrapper.post {
+            Animations.circularReveal(binding.iconWrapper, 300)
         }
 
         binding.leftSparkView.startAnimating()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt
index e1487ef8b..358ab7c21 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt
@@ -105,7 +105,7 @@ class DeathActivity: BaseActivity() {
             .setSpeedRange(0.01f, 0.03f)
             .setFadeOut(4000, AccelerateInterpolator())
             .setSpeedModuleAndAngleRange(0.01f, 0.03f, startAngle, startAngle+80)
-            .emit(550, 680, 3, 6000)
+            .emit(550, 690, 3, 6000)
 
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt
index 1d8c2cf9d..5fb927d14 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt
@@ -85,7 +85,7 @@ abstract class TaskListFactory internal constructor(
             remoteView.setInt(R.id.checkbox_background, "setBackgroundResource", task.lightTaskColor)
             val fillInIntent = Intent()
             fillInIntent.putExtra(TaskListWidgetProvider.TASK_ID_ITEM, task.id)
-            //remoteView.setOnClickFillInIntent(R.id.checkbox_background, fillInIntent)
+            remoteView.setOnClickFillInIntent(R.id.checkbox_background, fillInIntent)
         }
         return remoteView
     }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt
index 626569909..27f3ed7b3 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt
@@ -8,6 +8,7 @@ import com.habitrpg.common.habitica.api.HostConfig
 import com.habitrpg.common.habitica.api.Server
 import com.habitrpg.common.habitica.models.auth.UserAuth
 import com.habitrpg.common.habitica.models.auth.UserAuthSocial
+import com.habitrpg.wearos.habitica.managers.AppStateManager
 import com.habitrpg.wearos.habitica.models.NetworkResult
 import com.habitrpg.wearos.habitica.models.WearableHabitResponse
 import com.habitrpg.wearos.habitica.models.tasks.Task
@@ -27,6 +28,7 @@ import javax.inject.Inject
 class ApiClient @Inject constructor(
     private val converter: Converter.Factory,
     private val hostConfig: HostConfig,
+    private val appStateManager: AppStateManager,
     private val context: Context
 ) {
     val userID: String
@@ -88,8 +90,8 @@ class ApiClient @Inject constructor(
                     if (hasNetwork(context)) {
                         cacheControl.maxAge(5, TimeUnit.MINUTES)
                     } else {
+                        appStateManager.isAppConnected.value = false
                         cacheControl.maxAge(1, TimeUnit.DAYS)
-                            .onlyIfCached()
                     }
                 } else {
                     cacheControl.noCache()
@@ -162,13 +164,16 @@ class ApiClient @Inject constructor(
         val wasCached = response.headers()["was-cached"] == "true"
 
         return if (!response.isSuccessful) {
-            val errorBody = response.errorBody()
-            @Suppress("BlockingMethodInNonBlockingContext")
-            NetworkResult.Error(Exception((response.message() + errorBody?.string())), !wasCached)
-            throw(java.lang.Exception(response.message()))
+            appStateManager.isAppConnected.value = false
+            if (response.code() == 504) {
+                NetworkResult.Error(Exception(), !wasCached)
+            } else {
+                throw(java.lang.Exception(response.message()))
+            }
         } else {
             val body = response.body()
-            return if (body?.data != null) {
+            if (body?.data != null) {
+                appStateManager.isAppConnected.value = true
                 NetworkResult.Success(body.data!!, !wasCached)
             } else {
                 NetworkResult.Error(Exception("response.body() can't be null"), !wasCached)
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/managers/AppStateManager.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/managers/AppStateManager.kt
new file mode 100644
index 000000000..38ea8c547
--- /dev/null
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/managers/AppStateManager.kt
@@ -0,0 +1,22 @@
+package com.habitrpg.wearos.habitica.managers
+
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AppStateManager @Inject constructor() {
+    private val _isLoading = MutableStateFlow(false)
+    val isLoading: StateFlow<Boolean> = _isLoading
+
+    val isAppConnected = MutableStateFlow(true)
+
+    fun startLoading() {
+        _isLoading.value = true
+    }
+
+    fun endLoading() {
+        _isLoading.value = false
+    }
+}
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/managers/LoadingManager.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/managers/LoadingManager.kt
deleted file mode 100644
index 74187bb53..000000000
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/managers/LoadingManager.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.habitrpg.wearos.habitica.managers
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class LoadingManager @Inject constructor() {
-    private val _isLoading = MutableLiveData<Boolean>()
-    val isLoading: LiveData<Boolean> = _isLoading
-
-    fun startLoading() {
-        _isLoading.value = true
-    }
-
-    fun endLoading() {
-        _isLoading.value = false
-    }
-}
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/modules/AppModule.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/modules/AppModule.kt
index 1a0e21233..c1dab7e00 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/modules/AppModule.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/modules/AppModule.kt
@@ -9,11 +9,12 @@ import com.habitrpg.common.habitica.helpers.AppTestingLevel
 import com.habitrpg.common.habitica.helpers.KeyHelper
 import com.habitrpg.shared.habitica.HLogger
 import com.habitrpg.wearos.habitica.data.ApiClient
+import com.habitrpg.wearos.habitica.managers.AppStateManager
+import com.habitrpg.wearos.habitica.models.tasks.WrappedTasklistAdapter
 import com.habitrpg.wearos.habitica.util.AttributeAdapter
 import com.habitrpg.wearos.habitica.util.FrequencyAdapter
 import com.habitrpg.wearos.habitica.util.TaskTypeAdapter
 import com.habitrpg.wearos.habitica.util.customDateAdapter
-import com.habitrpg.wearos.habitica.models.tasks.WrappedTasklistAdapter
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import dagger.Module
@@ -62,11 +63,13 @@ class AppModule {
     fun providesApiHClient(
         hostConfig: HostConfig,
         @ApplicationContext context: Context,
-        converter: Converter.Factory
+        converter: Converter.Factory,
+        appStateManager: AppStateManager
     ): ApiClient {
         return ApiClient(
             converter,
             hostConfig,
+            appStateManager,
             context
         )
     }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt
index 62890276a..7e252ac59 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt
@@ -14,7 +14,7 @@ import com.google.android.gms.wearable.MessageClient
 import com.google.android.gms.wearable.Wearable
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ActivityWrapperBinding
-import com.habitrpg.wearos.habitica.managers.LoadingManager
+import com.habitrpg.wearos.habitica.managers.AppStateManager
 import com.habitrpg.wearos.habitica.ui.viewmodels.BaseViewModel
 import com.habitrpg.wearos.habitica.ui.views.IndeterminateProgressView
 import kotlinx.coroutines.Dispatchers
@@ -23,7 +23,7 @@ import javax.inject.Inject
 
 abstract class BaseActivity<B: ViewBinding, VM: BaseViewModel> : ComponentActivity() {
     @Inject
-    lateinit var loadingManager: LoadingManager
+    lateinit var appStateManager: AppStateManager
 
     val messageClient: MessageClient by lazy { Wearable.getMessageClient(this) }
     private val capabilityClient: CapabilityClient by lazy { Wearable.getCapabilityClient(this) }
@@ -50,11 +50,13 @@ abstract class BaseActivity<B: ViewBinding, VM: BaseViewModel> : ComponentActivi
             startActivity(intent)
         }
 
-        loadingManager.isLoading.observe(this) {
-            if (it) {
-                startAnimatingProgress()
-            } else {
-                stopAnimatingProgress()
+        lifecycleScope.launch {
+            appStateManager.isLoading.collect {
+                if (it) {
+                    startAnimatingProgress()
+                } else {
+                    stopAnimatingProgress()
+                }
             }
         }
     }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt
index 746aa6de7..0485bc183 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt
@@ -7,6 +7,7 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
 import androidx.wear.widget.WearableLinearLayoutManager
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ActivityMainBinding
@@ -16,6 +17,7 @@ import com.habitrpg.wearos.habitica.ui.adapters.HubAdapter
 import com.habitrpg.wearos.habitica.ui.viewmodels.MainViewModel
 import com.habitrpg.wearos.habitica.util.HabiticaScrollingLayoutCallback
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
 
 @AndroidEntryPoint
 class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
@@ -34,6 +36,11 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
                 WearableLinearLayoutManager(this@MainActivity, HabiticaScrollingLayoutCallback())
             adapter = this@MainActivity.adapter
         }
+        lifecycleScope.launch {
+            appStateManager.isAppConnected.collect {
+                adapter.isDisconnected = !it
+            }
+        }
     }
 
     override fun onStart() {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt
index c15619ab9..29805e348 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.widget.LinearLayout
 import androidx.activity.viewModels
 import androidx.core.view.isVisible
+import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ActivityRyaBinding
 import com.habitrpg.android.habitica.databinding.RowDailyBinding
@@ -12,6 +13,9 @@ import com.habitrpg.wearos.habitica.models.tasks.Task
 import com.habitrpg.wearos.habitica.ui.viewHolders.tasks.DailyViewHolder
 import com.habitrpg.wearos.habitica.ui.viewmodels.RYAViewModel
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import java.util.Date
 
 @AndroidEntryPoint
 class RYAActivity : BaseActivity<ActivityRyaBinding, RYAViewModel>() {
@@ -47,7 +51,10 @@ class RYAActivity : BaseActivity<ActivityRyaBinding, RYAViewModel>() {
         }
     }
 
+    lateinit var startTime: Date
+
     private fun runCron() {
+        startTime = Date()
         startAnimatingProgress()
         binding.startDayButton.isEnabled = false
         binding.startingTextView.isVisible = true
@@ -59,10 +66,18 @@ class RYAActivity : BaseActivity<ActivityRyaBinding, RYAViewModel>() {
         binding.ryaButton.isVisible = false
         binding.phoneButton.isVisible = false
         viewModel.runCron {
-            stopAnimatingProgress()
             if (it) {
-                finish()
+                lifecycleScope.launch {
+                    val elapsed = Date().time - startTime.time
+                    if (elapsed <= 1000) {
+                        // always show it at least 1 second
+                        delay(1000 - elapsed)
+                    }
+                    stopAnimatingProgress()
+                    finish()
+                }
             } else {
+                stopAnimatingProgress()
                 binding.startDayButton.isEnabled = true
                 binding.startingTextView.isVisible = false
                 binding.startDayButton.isVisible = true
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt
index 39400b40f..696cd020f 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt
@@ -6,6 +6,7 @@ import android.content.pm.PackageManager
 import android.os.Bundle
 import android.widget.Button
 import androidx.activity.viewModels
+import androidx.lifecycle.lifecycleScope
 import androidx.wear.widget.WearableLinearLayoutManager
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ActivitySettingsBinding
@@ -14,7 +15,7 @@ import com.habitrpg.wearos.habitica.ui.adapters.SettingsItem
 import com.habitrpg.wearos.habitica.ui.viewmodels.SettingsViewModel
 import com.habitrpg.wearos.habitica.util.HabiticaScrollingLayoutCallback
 import dagger.hilt.android.AndroidEntryPoint
-
+import kotlinx.coroutines.launch
 
 @AndroidEntryPoint
 class SettingsActivity: BaseActivity<ActivitySettingsBinding, SettingsViewModel>() {
@@ -31,6 +32,11 @@ class SettingsActivity: BaseActivity<ActivitySettingsBinding, SettingsViewModel>
         }
 
         adapter.data = buildSettings()
+        lifecycleScope.launch {
+            appStateManager.isAppConnected.collect {
+                adapter.isDisconnected = !it
+            }
+        }
     }
 
     private fun logout() {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt
index 20fce3a98..beef36c00 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt
@@ -6,6 +6,8 @@ import android.os.Bundle
 import android.view.View
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
+import androidx.core.view.isVisible
+import androidx.lifecycle.lifecycleScope
 import androidx.wear.widget.WearableLinearLayoutManager
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ActivityTasklistBinding
@@ -22,6 +24,7 @@ import com.habitrpg.wearos.habitica.ui.adapters.ToDoListAdapter
 import com.habitrpg.wearos.habitica.ui.viewmodels.TaskListViewModel
 import com.habitrpg.wearos.habitica.util.HabiticaScrollingLayoutCallback
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
 
 @AndroidEntryPoint
 class TaskListActivity : BaseActivity<ActivityTasklistBinding, TaskListViewModel>() {
@@ -43,6 +46,7 @@ class TaskListActivity : BaseActivity<ActivityTasklistBinding, TaskListViewModel
             adapter = this@TaskListActivity.adapter
             emptyViewBuilder = {
                 val emptyBinding = EmptyTaskListBinding.inflate(layoutInflater)
+                emptyBinding.disconnected.root.isVisible = !appStateManager.isAppConnected.value
                 emptyBinding.header.textView.text = getTitle(viewModel.taskCount.value)
                 emptyBinding.descriptionView.text = getString(
                     R.string.no_tasks, getString(
@@ -68,6 +72,12 @@ class TaskListActivity : BaseActivity<ActivityTasklistBinding, TaskListViewModel
         viewModel.taskCount.observe(this) {
             adapter.title = getTitle(it)
         }
+        lifecycleScope.launch {
+            appStateManager.isAppConnected.collect {
+                adapter.isDisconnected = !it
+            }
+        }
+
 
         adapter.onTaskScore = {
             scoreTask(it)
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt
index facc561ac..a65969766 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt
@@ -51,7 +51,10 @@ class TaskResultActivity : BaseActivity<ActivityTaskResultBinding, TaskResultVie
 
     override fun finish() {
         if (viewModel.result?.hasLeveledUp == true) {
-            startActivity(Intent(this, LevelupActivity::class.java))
+            startActivity(Intent(this, LevelupActivity::class.java)
+                .apply {
+                    addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
+                })
         }
         super.finish()
     }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/BaseAdapter.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/BaseAdapter.kt
index 6872d56a3..1c9ebfc34 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/BaseAdapter.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/BaseAdapter.kt
@@ -1,5 +1,53 @@
 package com.habitrpg.wearos.habitica.ui.adapters
 
-interface BaseAdapter {
-    fun hasData(): Boolean
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.habitrpg.android.habitica.databinding.RowHeaderBinding
+import com.habitrpg.android.habitica.databinding.RowSpacerBinding
+import com.habitrpg.common.habitica.extensions.layoutInflater
+import com.habitrpg.wearos.habitica.ui.viewHolders.HeaderViewHolder
+import com.habitrpg.wearos.habitica.ui.viewHolders.SpacerViewHolder
+
+abstract class BaseAdapter<D: Any> : RecyclerView.Adapter<RecyclerView.ViewHolder >() {
+    var title: String = ""
+    var onRefresh: (() -> Unit)? = null
+    var isDisconnected = false
+    set(value) {
+        field = value
+        notifyItemChanged(0)
+    }
+
+    var data: List<D> = listOf()
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+    fun hasData(): Boolean = data.isNotEmpty()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        return when (viewType) {
+            TYPE_HEADER -> HeaderViewHolder(RowHeaderBinding.inflate(parent.context.layoutInflater, parent, false).root)
+            else -> SpacerViewHolder(RowSpacerBinding.inflate(parent.context.layoutInflater, parent, false).root)
+        }
+    }
+
+    override fun getItemCount(): Int {
+        var count = data.size
+        if (title.isNotBlank()) {
+            count++
+        }
+        return count
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        if (holder is HeaderViewHolder) {
+            holder.bind(title)
+            holder.setIsDisconnected(isDisconnected)
+            holder.itemView.setOnClickListener { onRefresh?.invoke() }
+        }
+    }
+
+    companion object {
+        const val TYPE_HEADER = -10
+    }
 }
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/HubAdapter.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/HubAdapter.kt
index db87be6bb..7f9a806ae 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/HubAdapter.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/HubAdapter.kt
@@ -2,41 +2,30 @@ package com.habitrpg.wearos.habitica.ui.adapters
 
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.habitrpg.android.habitica.databinding.RowHeaderBinding
 import com.habitrpg.android.habitica.databinding.RowHubBinding
 import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.wearos.habitica.models.user.MenuItem
-import com.habitrpg.wearos.habitica.ui.viewHolders.HeaderViewHolder
 import com.habitrpg.wearos.habitica.ui.viewHolders.HubViewHolder
 
-class HubAdapter: RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-    var title: String = ""
-    var onRefresh: (() -> Unit)? = null
-    var data: List<MenuItem> = listOf()
-    set(value) {
-        field = value
-        notifyDataSetChanged()
-    }
+class HubAdapter: BaseAdapter<MenuItem>() {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         val inflater = parent.context.layoutInflater
-        return if (viewType == 0) {
-            HeaderViewHolder(RowHeaderBinding.inflate(inflater, parent, false).root)
-        } else {
+        return if (viewType == 1) {
             HubViewHolder(RowHubBinding.inflate(inflater, parent, false).root)
+        } else {
+            super.onCreateViewHolder(parent, viewType)
         }
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         if (holder is HubViewHolder) {
             holder.bind(getItemAt(position - 1))
-        } else if (holder is HeaderViewHolder){
-            holder.bind(title)
-            holder.itemView.setOnClickListener { onRefresh?.invoke() }
+        } else {
+            super.onBindViewHolder(holder, position)
         }
     }
 
     private fun getItemAt(position: Int) = data.filter { !it.isHidden }[position]
-    override fun getItemViewType(position: Int) = if (position == 0) 0 else 1
-    override fun getItemCount() =  data.filter { !it.isHidden }.size + 1
+    override fun getItemViewType(position: Int) = if (position == 0) TYPE_HEADER else 1
 }
 
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/SettingsAdapter.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/SettingsAdapter.kt
index 33893c8f8..6e08aa643 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/SettingsAdapter.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/SettingsAdapter.kt
@@ -8,28 +8,21 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.RowFooterBinding
-import com.habitrpg.android.habitica.databinding.RowHeaderBinding
 import com.habitrpg.android.habitica.databinding.RowSettingsBinding
 import com.habitrpg.android.habitica.databinding.RowSpacerBinding
 import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.wearos.habitica.ui.viewHolders.BindableViewHolder
 import com.habitrpg.wearos.habitica.ui.viewHolders.FooterViewHolder
-import com.habitrpg.wearos.habitica.ui.viewHolders.HeaderViewHolder
 import com.habitrpg.wearos.habitica.ui.viewHolders.SpacerViewHolder
 
-class SettingsAdapter: RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-    var data = listOf<SettingsItem>()
-    set(value) {
-        field = value
-        notifyDataSetChanged()
-    }
+class SettingsAdapter: BaseAdapter<SettingsItem>() {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return when (viewType) {
-            0 -> { HeaderViewHolder(RowHeaderBinding.inflate(parent.context.layoutInflater, parent, false).root) }
-            1 -> { FooterViewHolder(RowFooterBinding.inflate(parent.context.layoutInflater, parent, false).root) }
-            2 -> { SpacerViewHolder(RowSpacerBinding.inflate(parent.context.layoutInflater, parent, false).root) }
-            else -> { SettingsViewHolder(RowSettingsBinding.inflate(parent.context.layoutInflater, parent, false).root) }
+            1 -> FooterViewHolder(RowFooterBinding.inflate(parent.context.layoutInflater, parent, false).root)
+            2 -> SpacerViewHolder(RowSpacerBinding.inflate(parent.context.layoutInflater, parent, false).root)
+            3 -> SettingsViewHolder(RowSettingsBinding.inflate(parent.context.layoutInflater, parent, false).root)
+            else -> super.onCreateViewHolder(parent, viewType)
         }
     }
 
@@ -38,24 +31,20 @@ class SettingsAdapter: RecyclerView.Adapter<RecyclerView.ViewHolder>() {
             is SettingsViewHolder -> {
                 holder.bind(data[position])
             }
-            is HeaderViewHolder -> {
-                holder.bind(data[position].title)
-            }
             is FooterViewHolder -> {
                 holder.bind(data[position].title)
             }
             is SpacerViewHolder -> {
                 holder.bind(16.dpToPx(holder.itemView.context))
             }
+            else -> super.onBindViewHolder(holder, position)
         }
     }
 
-    override fun getItemCount(): Int = data.size
-
     override fun getItemViewType(position: Int): Int {
         val item = data[position]
         return when (item.type) {
-            SettingsItem.Types.HEADER -> 0
+            SettingsItem.Types.HEADER -> TYPE_HEADER
             SettingsItem.Types.FOOTER -> 1
             SettingsItem.Types.SPACER -> 2
             else -> 3
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt
index f627c9552..a41703e59 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt
@@ -8,24 +8,17 @@ import com.habitrpg.wearos.habitica.models.tasks.Task
 import com.habitrpg.wearos.habitica.ui.viewHolders.HeaderTaskViewHolder
 import com.habitrpg.wearos.habitica.ui.viewHolders.tasks.TaskViewHolder
 
-open class TaskListAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>(), BaseAdapter {
-    var title: String = ""
+open class TaskListAdapter : BaseAdapter<Any>() {
     var onTaskScore: ((Task) -> Unit)? = null
     var onTaskTapped:((Task) -> Unit)? = null
-    var onRefresh:(() -> Unit)? = null
-    var data: List<Any> = listOf()
-    set(value) {
-        field = value
-        notifyDataSetChanged()
-    }
-
-    override fun hasData(): Boolean {
-        return data.isNotEmpty()
-    }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val inflater = parent.context.layoutInflater
-        return HeaderTaskViewHolder(RowTaskHeaderBinding.inflate(inflater, parent, false).root)
+        if (viewType == TYPE_HEADER) {
+            val inflater = parent.context.layoutInflater
+            return HeaderTaskViewHolder(RowTaskHeaderBinding.inflate(inflater, parent, false).root)
+        } else {
+            return super.onCreateViewHolder(parent, viewType)
+        }
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
@@ -40,26 +33,24 @@ open class TaskListAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>(), Ba
             }
         } else if (holder is HeaderTaskViewHolder){
             if (position == 0) {
-                holder.bind(title, data.firstOrNull() is String)
+                holder.bind(title, data.firstOrNull() is String, isDisconnected)
                 holder.itemView.setOnClickListener {
                     onRefresh?.invoke()
                 }
             } else {
-                holder.bind(data[position - 1] as String, false)
+                holder.bind(data[position - 1] as String, false, isDisconnected)
             }
+        } else {
+            super.onBindViewHolder(holder, position)
         }
     }
 
     override fun getItemViewType(position: Int): Int {
         return if (position == 0) {
-            0
+            TYPE_HEADER
         } else {
             val item = data[position - 1]
             if (item is Task)  1 else 0
         }
     }
-
-    override fun getItemCount(): Int {
-        return data.size + 1
-    }
 }
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/DisconnectedViewHolder.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/DisconnectedViewHolder.kt
new file mode 100644
index 000000000..d598320e2
--- /dev/null
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/DisconnectedViewHolder.kt
@@ -0,0 +1,6 @@
+package com.habitrpg.wearos.habitica.ui.viewHolders
+
+import androidx.recyclerview.widget.RecyclerView
+import com.habitrpg.android.habitica.databinding.RowDisconnectedBinding
+
+class DisconnectedViewHolder(private val binding: RowDisconnectedBinding): RecyclerView.ViewHolder(binding.root)
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/HeaderTaskViewHolder.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/HeaderTaskViewHolder.kt
index ff3556700..92341a80a 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/HeaderTaskViewHolder.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/HeaderTaskViewHolder.kt
@@ -6,9 +6,10 @@ import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.databinding.RowTaskHeaderBinding
 
 class HeaderTaskViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-    fun bind(title: String, showDone: Boolean) {
+    fun bind(title: String, showDone: Boolean, isDisconnected: Boolean) {
         binding.header.textView.text = title
         binding.doneView.isVisible = showDone
+        binding.disconnected.root.isVisible = isDisconnected
     }
 
     val binding = RowTaskHeaderBinding.bind(itemView)
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/HeaderViewHolder.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/HeaderViewHolder.kt
index 134c633bc..6e21d9480 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/HeaderViewHolder.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/HeaderViewHolder.kt
@@ -2,9 +2,9 @@ package com.habitrpg.wearos.habitica.ui.viewHolders
 
 import android.view.View
 import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.RowHeaderBinding
-import com.habitrpg.android.habitica.databinding.RowSectionHeaderBinding
 
 class HeaderViewHolder(itemView: View): BindableViewHolder<String>(itemView) {
     private val binding = RowHeaderBinding.bind(itemView)
@@ -14,13 +14,10 @@ class HeaderViewHolder(itemView: View): BindableViewHolder<String>(itemView) {
             binding.textView.setTextColor(ContextCompat.getColor(itemView.context, R.color.white))
         }
         binding.textView.text = data
+        binding.textView.isVisible = data.isNotBlank()
     }
-}
 
-class HeaderSectionViewHolder(itemView: View): BindableViewHolder<String>(itemView) {
-    private val binding = RowSectionHeaderBinding.bind(itemView)
-
-    override fun bind(data: String) {
-        binding.textView.text = data
+    fun setIsDisconnected(isDisconnected: Boolean) {
+        binding.disconnected.root.isVisible = isDisconnected
     }
 }
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/AvatarViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/AvatarViewModel.kt
index 9fa5f7411..43e1f0dff 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/AvatarViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/AvatarViewModel.kt
@@ -3,7 +3,7 @@ package com.habitrpg.wearos.habitica.ui.viewmodels
 import androidx.lifecycle.asLiveData
 import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
 import com.habitrpg.wearos.habitica.data.repositories.UserRepository
-import com.habitrpg.wearos.habitica.managers.LoadingManager
+import com.habitrpg.wearos.habitica.managers.AppStateManager
 import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
@@ -12,11 +12,11 @@ import javax.inject.Inject
 class AvatarViewModel @Inject constructor(
     userRepository: UserRepository,
     taskRepository: TaskRepository,
-    exceptionBuilder: ExceptionHandlerBuilder, loadingManager: LoadingManager
+    exceptionBuilder: ExceptionHandlerBuilder, appStateManager: AppStateManager
 ) : BaseViewModel(
     userRepository,
     taskRepository,
-    exceptionBuilder, loadingManager
+    exceptionBuilder, appStateManager
 ) {
     var user = userRepository.getUser().asLiveData()
 }
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/BaseViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/BaseViewModel.kt
index 1f2f60700..b3ed5593c 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/BaseViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/BaseViewModel.kt
@@ -5,7 +5,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
 import com.habitrpg.wearos.habitica.data.repositories.UserRepository
-import com.habitrpg.wearos.habitica.managers.LoadingManager
+import com.habitrpg.wearos.habitica.managers.AppStateManager
 import com.habitrpg.wearos.habitica.models.DisplayedError
 import com.habitrpg.wearos.habitica.util.ErrorPresenter
 import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
@@ -15,16 +15,16 @@ open class BaseViewModel(
     val userRepository: UserRepository,
     val taskRepository: TaskRepository,
     val exceptionBuilder: ExceptionHandlerBuilder,
-    val loadingManager: LoadingManager
+    val appStateManager: AppStateManager
 ): ViewModel(), ErrorPresenter {
     override val errorValues = MutableLiveData<DisplayedError>()
 
     fun retrieveFullUserData() {
         viewModelScope.launch(exceptionBuilder.userFacing(this)) {
-            loadingManager.startLoading()
+            appStateManager.startLoading()
             val user = userRepository.retrieveUser(true)
             taskRepository.retrieveTasks(user?.tasksOrder, true)
-            loadingManager.endLoading()
+            appStateManager.endLoading()
         }
     }
 }
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ConfirmactionActivityViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ConfirmactionActivityViewModel.kt
index 992e2a0aa..09820ccb1 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ConfirmactionActivityViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ConfirmactionActivityViewModel.kt
@@ -4,7 +4,7 @@ import androidx.lifecycle.SavedStateHandle
 import com.habitrpg.android.habitica.R
 import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
 import com.habitrpg.wearos.habitica.data.repositories.UserRepository
-import com.habitrpg.wearos.habitica.managers.LoadingManager
+import com.habitrpg.wearos.habitica.managers.AppStateManager
 import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
@@ -15,8 +15,8 @@ class ConfirmactionActivityViewModel @Inject constructor(
     userRepository: UserRepository,
     taskRepository: TaskRepository,
     exceptionBuilder: ExceptionHandlerBuilder,
-    loadingManager: LoadingManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, loadingManager) {
+    appStateManager: AppStateManager
+) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
     val icon: Int = savedStateHandle.get("icon") ?: R.drawable.error
     val text: String? = savedStateHandle.get("text")
 }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ContinuePhoneViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ContinuePhoneViewModel.kt
index bce34e5d7..0e762a790 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ContinuePhoneViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/ContinuePhoneViewModel.kt
@@ -5,7 +5,7 @@ import com.google.android.gms.wearable.MessageClient
 import com.google.android.gms.wearable.MessageEvent
 import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
 import com.habitrpg.wearos.habitica.data.repositories.UserRepository
-import com.habitrpg.wearos.habitica.managers.LoadingManager
+import com.habitrpg.wearos.habitica.managers.AppStateManager
 import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
@@ -16,8 +16,8 @@ class ContinuePhoneViewModel @Inject constructor(
     userRepository: UserRepository,
     taskRepository: TaskRepository,
     exceptionBuilder: ExceptionHandlerBuilder,
-    loadingManager: LoadingManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, loadingManager), MessageClient.OnMessageReceivedListener {
+    appStateManager: AppStateManager
+) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager), MessageClient.OnMessageReceivedListener {
     val keepActive = savedStateHandle.get<Boolean>("keep_active") ?: false
     var onActionCompleted: (() -> Unit)? = null
 
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/FaintViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/FaintViewModel.kt
index 7a57876cf..f91b7aced 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/FaintViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/FaintViewModel.kt
@@ -2,7 +2,7 @@ package com.habitrpg.wearos.habitica.ui.viewmodels
 
 import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
 import com.habitrpg.wearos.habitica.data.repositories.UserRepository
-import com.habitrpg.wearos.habitica.managers.LoadingManager
+import com.habitrpg.wearos.habitica.managers.AppStateManager
 import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
@@ -10,8 +10,8 @@ import javax.inject.Inject
 @HiltViewModel
 class FaintViewModel @Inject constructor(userRepository: UserRepository,
     taskRepository: TaskRepository,
-    exceptionBuilder: ExceptionHandlerBuilder, loadingManager: LoadingManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, loadingManager) {
+    exceptionBuilder: ExceptionHandlerBuilder, appStateManager: AppStateManager
+) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
     suspend fun revive() {
         userRepository.revive()
     }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/HabitDirectionViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/HabitDirectionViewModel.kt
index 146db1009..15e7bf34f 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/HabitDirectionViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/HabitDirectionViewModel.kt
@@ -4,7 +4,7 @@ import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.asLiveData
 import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
 import com.habitrpg.wearos.habitica.data.repositories.UserRepository
-import com.habitrpg.wearos.habitica.managers.LoadingManager
+import com.habitrpg.wearos.habitica.managers.AppStateManager
 import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
@@ -14,8 +14,8 @@ class HabitDirectionViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     userRepository: UserRepository,
     taskRepository: TaskRepository,
-    exceptionBuilder: ExceptionHandlerBuilder, loadingManager: LoadingManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, loadingManager) {
+    exceptionBuilder: ExceptionHandlerBuilder, appStateManager: AppStateManager
+) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
     val taskID = savedStateHandle.get<String>("task_id")
     val task = taskRepository.getTask(taskID).asLiveData()
 
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/InputViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/InputViewModel.kt
index 4a5661809..d202e45d8 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/InputViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/InputViewModel.kt
@@ -3,7 +3,7 @@ package com.habitrpg.wearos.habitica.ui.viewmodels
 import androidx.lifecycle.SavedStateHandle
 import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
 import com.habitrpg.wearos.habitica.data.repositories.UserRepository
-import com.habitrpg.wearos.habitica.managers.LoadingManager
+import com.habitrpg.wearos.habitica.managers.AppStateManager
 import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
@@ -14,7 +14,7 @@ class InputViewModel @Inject constructor(
     userRepository: UserRepository,
     taskRepository: TaskRepository,
     exceptionBuilder: ExceptionHandlerBuilder,
-    loadingManager: LoadingManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, loadingManager) {
+    appStateManager: AppStateManager
+) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
     val title = savedStateHandle.get<String>("title") ?: ""
 }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LevelupViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LevelupViewModel.kt
index bc591ef91..ee4178e56 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LevelupViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LevelupViewModel.kt
@@ -3,7 +3,7 @@ package com.habitrpg.wearos.habitica.ui.viewmodels
 import androidx.lifecycle.asLiveData
 import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
 import com.habitrpg.wearos.habitica.data.repositories.UserRepository
-import com.habitrpg.wearos.habitica.managers.LoadingManager
+import com.habitrpg.wearos.habitica.managers.AppStateManager
 import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.map
@@ -14,8 +14,8 @@ class LevelupViewModel @Inject constructor(
     userRepository: UserRepository,
     taskRepository: TaskRepository,
     exceptionBuilder: ExceptionHandlerBuilder,
-    loadingManager: LoadingManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, loadingManager) {
+    appStateManager: AppStateManager
+) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
     val level = userRepository.getUser()
         .map { it.stats?.lvl }
         .asLiveData()
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt
index 3c3d90950..1ed7b3efc 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt
@@ -27,7 +27,7 @@ import com.habitrpg.common.habitica.models.auth.UserAuthSocialTokens
 import com.habitrpg.wearos.habitica.data.ApiClient
 import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
 import com.habitrpg.wearos.habitica.data.repositories.UserRepository
-import com.habitrpg.wearos.habitica.managers.LoadingManager
+import com.habitrpg.wearos.habitica.managers.AppStateManager
 import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
@@ -43,8 +43,8 @@ class LoginViewModel @Inject constructor(userRepository: UserRepository,
     exceptionBuilder: ExceptionHandlerBuilder,
     private val keyHelper: KeyHelper?,
     val sharedPreferences: SharedPreferences,
-    val apiClient: ApiClient, loadingManager: LoadingManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, loadingManager) {
+    val apiClient: ApiClient, appStateManager: AppStateManager
+) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
     lateinit var onLoginCompleted: () -> Unit
 
     fun handleGoogleLogin(
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/MainViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/MainViewModel.kt
index 7c46794b6..29fcd0e79 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/MainViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/MainViewModel.kt
@@ -3,7 +3,7 @@ package com.habitrpg.wearos.habitica.ui.viewmodels
 import androidx.lifecycle.asLiveData
 import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
 import com.habitrpg.wearos.habitica.data.repositories.UserRepository
-import com.habitrpg.wearos.habitica.managers.LoadingManager
+import com.habitrpg.wearos.habitica.managers.AppStateManager
 import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
@@ -12,8 +12,8 @@ import javax.inject.Inject
 class MainViewModel @Inject constructor(
     userRepository: UserRepository,
     taskRepository: TaskRepository,
-    exceptionBuilder: ExceptionHandlerBuilder, loadingManager: LoadingManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, loadingManager) {
+    exceptionBuilder: ExceptionHandlerBuilder, appStateManager: AppStateManager
+) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
     val taskCounts = taskRepository.getActiveTaskCounts().asLiveData()
     val user = userRepository.getUser().asLiveData()
 }
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/RYAViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/RYAViewModel.kt
index 9f5c68aa9..da3732089 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/RYAViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/RYAViewModel.kt
@@ -6,7 +6,7 @@ import com.habitrpg.common.habitica.models.responses.TaskDirection
 import com.habitrpg.common.habitica.models.tasks.TaskType
 import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
 import com.habitrpg.wearos.habitica.data.repositories.UserRepository
-import com.habitrpg.wearos.habitica.managers.LoadingManager
+import com.habitrpg.wearos.habitica.managers.AppStateManager
 import com.habitrpg.wearos.habitica.models.tasks.Task
 import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -19,8 +19,8 @@ import javax.inject.Inject
 class RYAViewModel @Inject constructor(
     userRepository: UserRepository,
     taskRepository: TaskRepository,
-    exceptionBuilder: ExceptionHandlerBuilder, loadingManager: LoadingManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, loadingManager) {
+    exceptionBuilder: ExceptionHandlerBuilder, appStateManager: AppStateManager
+) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
     val tasks = MutableLiveData<List<Task>>()
 
     private val tasksToComplete = mutableListOf<Task>()
@@ -50,7 +50,7 @@ class RYAViewModel @Inject constructor(
 
     fun runCron(function: (Boolean) -> Unit) {
         viewModelScope.launch(exceptionBuilder.userFacing(this)) {
-            loadingManager.startLoading()
+            appStateManager.startLoading()
             for (task in tasksToComplete) {
                 taskRepository.scoreTask(null, task, TaskDirection.UP)
             }
@@ -58,7 +58,7 @@ class RYAViewModel @Inject constructor(
             val user = userRepository.retrieveUser(true)
             taskRepository.retrieveTasks(user?.tasksOrder, true)
             function(true)
-            loadingManager.endLoading()
+            appStateManager.endLoading()
         }
     }
 }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SettingsViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SettingsViewModel.kt
index 23e902ded..a3594761d 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SettingsViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SettingsViewModel.kt
@@ -6,7 +6,7 @@ import androidx.lifecycle.viewModelScope
 import com.habitrpg.wearos.habitica.data.ApiClient
 import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
 import com.habitrpg.wearos.habitica.data.repositories.UserRepository
-import com.habitrpg.wearos.habitica.managers.LoadingManager
+import com.habitrpg.wearos.habitica.managers.AppStateManager
 import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
@@ -18,8 +18,8 @@ class SettingsViewModel @Inject constructor(userRepository: UserRepository,
     exceptionBuilder: ExceptionHandlerBuilder,
     private val apiClient: ApiClient,
     private val sharedPreferences: SharedPreferences,
-    loadingManager: LoadingManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, loadingManager) {
+    appStateManager: AppStateManager
+) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
 
     fun logout() {
         sharedPreferences.edit {
@@ -32,10 +32,10 @@ class SettingsViewModel @Inject constructor(userRepository: UserRepository,
 
     fun resyncData() {
         viewModelScope.launch(exceptionBuilder.userFacing(this)) {
-            loadingManager.startLoading()
+            appStateManager.startLoading()
             val user = userRepository.retrieveUser(true)
             taskRepository.retrieveTasks(user?.tasksOrder, true)
-            loadingManager.endLoading()
+            appStateManager.endLoading()
         }
     }
 
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SplashViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SplashViewModel.kt
index d10f9c7e9..96e0cd9ea 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SplashViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SplashViewModel.kt
@@ -9,7 +9,7 @@ import com.habitrpg.common.habitica.helpers.KeyHelper
 import com.habitrpg.wearos.habitica.data.ApiClient
 import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
 import com.habitrpg.wearos.habitica.data.repositories.UserRepository
-import com.habitrpg.wearos.habitica.managers.LoadingManager
+import com.habitrpg.wearos.habitica.managers.AppStateManager
 import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
@@ -21,8 +21,8 @@ class SplashViewModel @Inject constructor(userRepository: UserRepository,
     exceptionBuilder: ExceptionHandlerBuilder,
     val apiClient: ApiClient,
     val sharedPreferences: SharedPreferences,
-    val keyHelper: KeyHelper?, loadingManager: LoadingManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, loadingManager), MessageClient.OnMessageReceivedListener {
+    val keyHelper: KeyHelper?, appStateManager: AppStateManager
+) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager), MessageClient.OnMessageReceivedListener {
     lateinit var onLoginCompleted: (Boolean) -> Unit
     val hasAuthentication: Boolean
     get() {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/StatsViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/StatsViewModel.kt
index 99f78b34f..754327b40 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/StatsViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/StatsViewModel.kt
@@ -5,7 +5,7 @@ import androidx.lifecycle.asLiveData
 import androidx.lifecycle.viewModelScope
 import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
 import com.habitrpg.wearos.habitica.data.repositories.UserRepository
-import com.habitrpg.wearos.habitica.managers.LoadingManager
+import com.habitrpg.wearos.habitica.managers.AppStateManager
 import com.habitrpg.wearos.habitica.models.user.User
 import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -16,8 +16,8 @@ import javax.inject.Inject
 @HiltViewModel
 class StatsViewModel @Inject constructor(userRepository: UserRepository,
     taskRepository: TaskRepository,
-    exceptionBuilder: ExceptionHandlerBuilder, loadingManager: LoadingManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, loadingManager) {
+    exceptionBuilder: ExceptionHandlerBuilder, appStateManager: AppStateManager
+) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
     fun retrieveUser() {
         viewModelScope.launch(exceptionBuilder.silent()) {
             userRepository.retrieveUser(true)
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskDetailViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskDetailViewModel.kt
index 30a0cd95f..d2fb107fe 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskDetailViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskDetailViewModel.kt
@@ -4,7 +4,7 @@ import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.asLiveData
 import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
 import com.habitrpg.wearos.habitica.data.repositories.UserRepository
-import com.habitrpg.wearos.habitica.managers.LoadingManager
+import com.habitrpg.wearos.habitica.managers.AppStateManager
 import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
@@ -14,8 +14,8 @@ class TaskDetailViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     taskRepository: TaskRepository,
     userRepository: UserRepository,
-    exceptionBuilder: ExceptionHandlerBuilder, loadingManager: LoadingManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, loadingManager) {
+    exceptionBuilder: ExceptionHandlerBuilder, appStateManager: AppStateManager
+) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
     val taskID = savedStateHandle.get<String>("task_id")
     val task = taskRepository.getTask(taskID).asLiveData()
 }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskFormViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskFormViewModel.kt
index 1c9526c11..89dc3d6b3 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskFormViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskFormViewModel.kt
@@ -4,7 +4,7 @@ import com.habitrpg.common.habitica.models.tasks.Frequency
 import com.habitrpg.common.habitica.models.tasks.TaskType
 import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
 import com.habitrpg.wearos.habitica.data.repositories.UserRepository
-import com.habitrpg.wearos.habitica.managers.LoadingManager
+import com.habitrpg.wearos.habitica.managers.AppStateManager
 import com.habitrpg.wearos.habitica.models.tasks.Task
 import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -14,8 +14,8 @@ import javax.inject.Inject
 class TaskFormViewModel @Inject constructor(
     userRepository: UserRepository,
     taskRepository: TaskRepository,
-    exceptionBuilder: ExceptionHandlerBuilder, loadingManager: LoadingManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, loadingManager) {
+    exceptionBuilder: ExceptionHandlerBuilder, appStateManager: AppStateManager
+) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
     suspend fun saveTask(text: CharSequence?, taskType: TaskType?) {
         if (text?.isNotBlank() != true || taskType == null) {
             return
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskListViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskListViewModel.kt
index ac6202013..17a983362 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskListViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskListViewModel.kt
@@ -9,7 +9,7 @@ import com.habitrpg.common.habitica.models.responses.TaskScoringResult
 import com.habitrpg.common.habitica.models.tasks.TaskType
 import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
 import com.habitrpg.wearos.habitica.data.repositories.UserRepository
-import com.habitrpg.wearos.habitica.managers.LoadingManager
+import com.habitrpg.wearos.habitica.managers.AppStateManager
 import com.habitrpg.wearos.habitica.models.tasks.Task
 import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -23,8 +23,8 @@ class TaskListViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     taskRepository: TaskRepository,
     userRepository: UserRepository,
-    exceptionBuilder: ExceptionHandlerBuilder, loadingManager: LoadingManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, loadingManager) {
+    exceptionBuilder: ExceptionHandlerBuilder, appStateManager: AppStateManager
+) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
     val taskType = TaskType.from(savedStateHandle.get<String>("task_type"))
     val taskCount = MutableLiveData(0)
     val tasks = taskRepository.getTasks(taskType ?: TaskType.HABIT)
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskResultViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskResultViewModel.kt
index 040417047..016fc304e 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskResultViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskResultViewModel.kt
@@ -4,7 +4,7 @@ import androidx.lifecycle.SavedStateHandle
 import com.habitrpg.common.habitica.models.responses.TaskScoringResult
 import com.habitrpg.wearos.habitica.data.repositories.TaskRepository
 import com.habitrpg.wearos.habitica.data.repositories.UserRepository
-import com.habitrpg.wearos.habitica.managers.LoadingManager
+import com.habitrpg.wearos.habitica.managers.AppStateManager
 import com.habitrpg.wearos.habitica.util.ExceptionHandlerBuilder
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
@@ -14,8 +14,8 @@ class TaskResultViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     taskRepository: TaskRepository,
     userRepository: UserRepository,
-    exceptionBuilder: ExceptionHandlerBuilder, loadingManager: LoadingManager
-) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, loadingManager) {
+    exceptionBuilder: ExceptionHandlerBuilder, appStateManager: AppStateManager
+) : BaseViewModel(userRepository, taskRepository, exceptionBuilder, appStateManager) {
     val hasDrop: Boolean
         get() {
             return result?.drop?.key?.isNotBlank() == true // || (result?.questItemsFound ?: 0) > 0
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaRecyclerView.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaRecyclerView.kt
index a810daa5f..80b021b00 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaRecyclerView.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaRecyclerView.kt
@@ -73,8 +73,8 @@ class HabiticaRecyclerView @JvmOverloads constructor(
 
     internal fun updateState(isInitial: Boolean = false) {
         state = if (actualAdapter != null && !isInitial) {
-            val emptyViewVisible = if (actualAdapter is BaseAdapter) {
-                (actualAdapter as? BaseAdapter)?.hasData() != true
+            val emptyViewVisible = if (actualAdapter is BaseAdapter<*>) {
+                (actualAdapter as? BaseAdapter<*>)?.hasData() != true
         } else {
             actualAdapter?.itemCount == 0
         }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/util/HabiticaCoroutineExceptionhandler.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/util/HabiticaCoroutineExceptionhandler.kt
index e609c6f97..0bdb6e956 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/util/HabiticaCoroutineExceptionhandler.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/util/HabiticaCoroutineExceptionhandler.kt
@@ -1,14 +1,14 @@
 package com.habitrpg.wearos.habitica.util
 
 import android.util.Log
-import com.habitrpg.wearos.habitica.managers.LoadingManager
+import com.habitrpg.wearos.habitica.managers.AppStateManager
 import com.habitrpg.wearos.habitica.models.DisplayedError
 import dagger.hilt.android.scopes.ViewModelScoped
 import kotlinx.coroutines.CoroutineExceptionHandler
 import javax.inject.Inject
 
 @ViewModelScoped
-class ExceptionHandlerBuilder @Inject constructor(val loadingManager: LoadingManager) {
+class ExceptionHandlerBuilder @Inject constructor(val appStateManager: AppStateManager) {
     fun silent(handler: ((Throwable) -> Unit)? = null): CoroutineExceptionHandler {
         return CoroutineExceptionHandler { context, throwable ->
             Log.e(context.toString(), "Error: ${throwable.cause}", throwable)
@@ -20,7 +20,7 @@ class ExceptionHandlerBuilder @Inject constructor(val loadingManager: LoadingMan
         return CoroutineExceptionHandler { _, throwable ->
             Log.e("Coroutine Error", "Error: ${throwable.cause}", throwable)
             errorPresenter.errorValues.value = throwable.message?.let { DisplayedError(it) }
-            loadingManager.endLoading()
+            appStateManager.endLoading()
         }
     }
 }
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/activity_rya.xml b/wearos/src/main/res/layout/activity_rya.xml
index 7dcefdfd2..6b1a89f3e 100644
--- a/wearos/src/main/res/layout/activity_rya.xml
+++ b/wearos/src/main/res/layout/activity_rya.xml
@@ -1,79 +1,84 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.habitrpg.wearos.habitica.ui.views.HabiticaScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<FrameLayout
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <LinearLayout
+    android:layout_height="match_parent"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <com.habitrpg.wearos.habitica.ui.views.HabiticaScrollView
+        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="vertical">
-        <TextView
-            android:id="@+id/title_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/watch_purple_200"
-            android:text="@string/day_start"
-            style="@style/Text.Body1"
-            android:gravity="center"
-            android:layout_marginHorizontal="12dp"
-            android:layout_marginBottom="10dp"/>
-        <TextView
-            android:id="@+id/description_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/rya_description"
-            android:gravity="center"
-            android:textColor="@color/watch_white"
-            style="@style/Text.SubHeader1"
-            android:layout_marginBottom="@dimen/spacing_large"/>
-        <Button
-            android:id="@+id/rya_button"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/review_dailies"
-            style="@style/ChipButton.Purple"
-            android:layout_marginBottom="@dimen/spacing_small"/>
-        <Button
-            android:id="@+id/phone_button"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/check_on_phone"
-            android:drawableStart="@drawable/handoff"
-            style="@style/ChipButton.Icon"/>
-
+        android:layout_height="match_parent">
         <LinearLayout
-            android:id="@+id/task_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:visibility="gone"/>
-        <Button
-            android:id="@+id/start_day_button"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/ChipButton.Purple"
-            android:text="@string/start_new_day"
-            android:layout_marginTop="2dp"
-            android:visibility="gone"/>
-        <TextView
-            android:id="@+id/phone_description_view"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/checklist_disclaimer"
-            android:textColor="@color/gray_400"
             android:gravity="center"
-            style="@style/Text.Body1"
-            android:layout_marginTop="@dimen/spacing_medium" />
-        <TextView
-            android:id="@+id/starting_text_view"
-            android:layout_width="match_parent"
-            android:layout_height="400dp"
-            android:text="@string/starting_your_day"
-            style="@style/Text.SubHeader1"
-            android:textColor="@color/gray_500"
-            android:gravity="center"
-            android:layout_margin="@dimen/spacing_xlarge"
-            android:visibility="gone"/>
-    </LinearLayout>
-</com.habitrpg.wearos.habitica.ui.views.HabiticaScrollView>
\ No newline at end of file
+            android:orientation="vertical">
+            <TextView
+                android:id="@+id/title_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/watch_purple_200"
+                android:text="@string/day_start"
+                style="@style/Text.Body1"
+                android:gravity="center"
+                android:layout_marginHorizontal="12dp"
+                android:layout_marginBottom="10dp"/>
+            <TextView
+                android:id="@+id/description_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/rya_description"
+                android:gravity="center"
+                android:textColor="@color/watch_white"
+                style="@style/Text.SubHeader1"
+                android:layout_marginBottom="@dimen/spacing_large"/>
+            <Button
+                android:id="@+id/rya_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/review_dailies"
+                style="@style/ChipButton.Purple"
+                android:layout_marginBottom="@dimen/spacing_small"/>
+            <Button
+                android:id="@+id/phone_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/check_on_phone"
+                android:drawableStart="@drawable/handoff"
+                style="@style/ChipButton.Icon"/>
+
+            <LinearLayout
+                android:id="@+id/task_view"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone"/>
+            <Button
+                android:id="@+id/start_day_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/ChipButton.Purple"
+                android:text="@string/start_new_day"
+                android:layout_marginTop="2dp"
+                android:visibility="gone"/>
+            <TextView
+                android:id="@+id/phone_description_view"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/checklist_disclaimer"
+                android:textColor="@color/gray_400"
+                android:gravity="center"
+                style="@style/Text.Body1"
+                android:layout_marginTop="@dimen/spacing_medium" />
+        </LinearLayout>
+    </com.habitrpg.wearos.habitica.ui.views.HabiticaScrollView>
+    <TextView
+        android:id="@+id/starting_text_view"
+        android:layout_width="match_parent"
+        android:layout_height="400dp"
+        android:text="@string/starting_your_day"
+        style="@style/Text.SubHeader1"
+        android:textColor="@color/gray_500"
+        android:gravity="center"
+        android:layout_margin="@dimen/spacing_xlarge"
+        android:visibility="gone"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/empty_task_list.xml b/wearos/src/main/res/layout/empty_task_list.xml
index 15168f9b8..53ebc5313 100644
--- a/wearos/src/main/res/layout/empty_task_list.xml
+++ b/wearos/src/main/res/layout/empty_task_list.xml
@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
+    <include layout="@layout/row_disconnected" android:id="@+id/disconnected" />
     <include layout="@layout/row_section_header" android:id="@+id/header" />
     <TextView
         android:id="@+id/description_view"
diff --git a/wearos/src/main/res/layout/row_disconnected.xml b/wearos/src/main/res/layout/row_disconnected.xml
new file mode 100644
index 000000000..c66f8f99f
--- /dev/null
+++ b/wearos/src/main/res/layout/row_disconnected.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:drawableTop="@drawable/disconnected"
+    android:text="@string/disconnected"
+    android:layout_gravity="center"
+    android:gravity="center"
+    android:padding="@dimen/spacing_medium"
+    style="@style/Text.Body1">
+
+</TextView>
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/row_header.xml b/wearos/src/main/res/layout/row_header.xml
index ae142b168..7b25fa3db 100644
--- a/wearos/src/main/res/layout/row_header.xml
+++ b/wearos/src/main/res/layout/row_header.xml
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/text_view"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:gravity="center"
-    android:textColor="@color/watch_purple_200"
-    tools:text="Header Text"
-    style="@style/Text.SubHeader1"
-    android:padding="6dp"/>
+    android:orientation="vertical">
+    <include layout="@layout/row_disconnected" android:id="@+id/disconnected" />
+    <TextView
+        android:id="@+id/text_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:textColor="@color/watch_purple_200"
+        tools:text="Header Text"
+        style="@style/Text.SubHeader1"
+        android:padding="6dp"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/row_task_header.xml b/wearos/src/main/res/layout/row_task_header.xml
index afeebfabb..c3e09d344 100644
--- a/wearos/src/main/res/layout/row_task_header.xml
+++ b/wearos/src/main/res/layout/row_task_header.xml
@@ -4,6 +4,9 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:gravity="center">
+    <include
+        layout="@layout/row_disconnected"
+        android:id="@+id/disconnected" />
     <include
         layout="@layout/row_section_header"
         android:id="@+id/header" />
diff --git a/wearos/src/main/res/values/strings.xml b/wearos/src/main/res/values/strings.xml
index 56cd1da5d..5a3d9e976 100644
--- a/wearos/src/main/res/values/strings.xml
+++ b/wearos/src/main/res/values/strings.xml
@@ -39,4 +39,5 @@
     <string name="levelup_description">You leveled up through all your hard work!</string>
     <string name="all_done_today">All done today!</string>
     <string name="starting_your_day">Starting your Day...</string>
+    <string name="disconnected">Disconnected</string>
 </resources>
\ No newline at end of file

From aaf8f3eaeeea4223c43d51c52fce6d70e0f63604 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 13 Jul 2022 10:15:18 +0200
Subject: [PATCH 33/39] Improve RYA

---
 .../wearos/habitica/ui/activities/RYAActivity.kt | 15 +++------------
 wearos/src/main/res/layout/activity_rya.xml      | 16 ++++++++++------
 wearos/src/main/res/layout/task_reward_drop.xml  |  3 ++-
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt
index 29805e348..4615a8f2f 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt
@@ -30,6 +30,7 @@ class RYAActivity : BaseActivity<ActivityRyaBinding, RYAViewModel>() {
                 runCron()
                 return@observe
             }
+            binding.scrollView.isVisible = true
             createTaskListViews(it)
         }
 
@@ -58,13 +59,7 @@ class RYAActivity : BaseActivity<ActivityRyaBinding, RYAViewModel>() {
         startAnimatingProgress()
         binding.startDayButton.isEnabled = false
         binding.startingTextView.isVisible = true
-        binding.startDayButton.isVisible = false
-        binding.taskView.isVisible = false
-        binding.descriptionView.isVisible = false
-        binding.titleView.isVisible = false
-        binding.phoneDescriptionView.isVisible = false
-        binding.ryaButton.isVisible = false
-        binding.phoneButton.isVisible = false
+        binding.scrollView.isVisible = false
         viewModel.runCron {
             if (it) {
                 lifecycleScope.launch {
@@ -80,11 +75,7 @@ class RYAActivity : BaseActivity<ActivityRyaBinding, RYAViewModel>() {
                 stopAnimatingProgress()
                 binding.startDayButton.isEnabled = true
                 binding.startingTextView.isVisible = false
-                binding.startDayButton.isVisible = true
-                binding.taskView.isVisible = true
-                binding.descriptionView.isVisible = true
-                binding.titleView.isVisible = true
-                binding.phoneDescriptionView.isVisible = true
+                binding.scrollView.isVisible = true
             }
         }
     }
diff --git a/wearos/src/main/res/layout/activity_rya.xml b/wearos/src/main/res/layout/activity_rya.xml
index 6b1a89f3e..c65741e25 100644
--- a/wearos/src/main/res/layout/activity_rya.xml
+++ b/wearos/src/main/res/layout/activity_rya.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    android:layout_width="match_parent"
+<FrameLayout android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
     <com.habitrpg.wearos.habitica.ui.views.HabiticaScrollView
+        android:id="@+id/scroll_view"
         android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:visibility="gone">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -74,11 +76,13 @@
     <TextView
         android:id="@+id/starting_text_view"
         android:layout_width="match_parent"
-        android:layout_height="400dp"
+        android:layout_height="wrap_content"
         android:text="@string/starting_your_day"
         style="@style/Text.SubHeader1"
         android:textColor="@color/gray_500"
         android:gravity="center"
+        android:layout_gravity="center"
         android:layout_margin="@dimen/spacing_xlarge"
-        android:visibility="gone"/>
+        android:visibility="gone"
+        tools:visibility="visible"/>
 </FrameLayout>
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/task_reward_drop.xml b/wearos/src/main/res/layout/task_reward_drop.xml
index 6602ce475..bd27fb34d 100644
--- a/wearos/src/main/res/layout/task_reward_drop.xml
+++ b/wearos/src/main/res/layout/task_reward_drop.xml
@@ -25,6 +25,7 @@
             android:id="@+id/image_view"
             android:layout_width="80dp"
             android:layout_height="80dp"
-            android:layout_gravity="center" />
+            android:layout_gravity="center"
+            android:layout_marginTop="5dp"/>
     </FrameLayout>
 </LinearLayout>
\ No newline at end of file

From 04cf5932f845aadb757c73df05435416128eb277 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 13 Jul 2022 10:15:29 +0200
Subject: [PATCH 34/39] Fix crash

---
 .../ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt  | 6 +-----
 .../habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt    | 7 ++++---
 2 files changed, 5 insertions(+), 8 deletions(-)

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 12e0dc8f6..fa444d521 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
@@ -35,11 +35,7 @@ abstract class RealmBaseTasksRecyclerViewAdapter(
         set(value) {
             if (field == value) return
             field = value
-            if (value) {
-                notifyItemInserted(0)
-            } else {
-                notifyItemRemoved(0)
-            }
+            notifyDataSetChanged()
         }
     override var user: User? = null
         set(value) {
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 d53f4e6a8..5515a0a1e 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
@@ -27,7 +27,7 @@ import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.functions.Action
 import io.reactivex.rxjava3.schedulers.Schedulers
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 
 abstract class BaseTaskViewHolder constructor(
@@ -36,6 +36,7 @@ abstract class BaseTaskViewHolder constructor(
     var openTaskFunc: ((Pair<Task, View>) -> Unit),
     var brokenTaskFunc: ((Task) -> Unit)
 ) : BindableViewHolder<Task>(itemView), View.OnTouchListener {
+    private val scope = MainScope()
     var task: Task? = null
     var movingFromPosition: Int? = null
     var errorButtonClicked: Action? = null
@@ -108,7 +109,7 @@ abstract class BaseTaskViewHolder constructor(
         }
         notesTextView?.addEllipsesListener(object : EllipsisTextView.EllipsisListener {
             override fun ellipsisStateChanged(ellipses: Boolean) {
-                GlobalScope.launch(Dispatchers.Main.immediate) {
+                scope.launch(Dispatchers.Main.immediate) {
                     if (ellipses && notesTextView.maxLines != 3) {
                         notesTextView.maxLines = 3
                     }
@@ -209,7 +210,7 @@ abstract class BaseTaskViewHolder constructor(
         titleTextView.setTextColor(ContextCompat.getColor(context, R.color.text_primary))
 
         if (displayMode == "standard") {
-            iconViewReminder?.visibility = if (data.reminders?.size ?: 0 > 0) View.VISIBLE else View.GONE
+            iconViewReminder?.visibility = if ((data.reminders?.size ?: 0) > 0) View.VISIBLE else View.GONE
 
             iconViewChallenge?.visibility = if (task?.challengeID != null) View.VISIBLE else View.GONE
             if (task?.challengeID != null) {

From f9fad91157b67340fa0cdd281065fc1c53f84170 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 13 Jul 2022 10:15:40 +0200
Subject: [PATCH 35/39] Improve reset tutorial snackbar

---
 .../habitica/ui/fragments/support/SupportMainFragment.kt       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
index 131ec9012..89d424f90 100644
--- 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
@@ -15,6 +15,7 @@ import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import javax.inject.Inject
 import javax.inject.Named
 
@@ -59,7 +60,7 @@ class SupportMainFragment : BaseMainFragment<FragmentSupportMainBinding>() {
 
         binding?.resetTutorialButton?.setOnClickListener {
             userRepository.resetTutorial().subscribe({
-                activity?.showSnackbar(null, getString(R.string.tutorial_reset_confirmation))
+                activity?.showSnackbar(null, null, getString(R.string.tutorial_reset_confirmation), displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS)
             }, RxErrorHandler.handleEmptyError())
         }
     }

From 22b0b4f8a0f60254c1c07eaab9eccb476070d4fe Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 13 Jul 2022 10:15:47 +0200
Subject: [PATCH 36/39] Fix preferences display

---
 .../ui/fragments/preferences/BasePreferencesFragment.kt     | 2 +-
 .../ui/fragments/preferences/PreferencesFragment.kt         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/BasePreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/BasePreferencesFragment.kt
index b2da4921f..1a2d9c3d9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/BasePreferencesFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/BasePreferencesFragment.kt
@@ -28,7 +28,7 @@ abstract class BasePreferencesFragment : PreferenceFragmentCompat() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        userViewModel.user.observe(viewLifecycleOwner) { user = it }
+        userViewModel.user.observe(viewLifecycleOwner) { setUser(it) }
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
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 dd1b4a885..166658fdb 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
@@ -18,8 +18,6 @@ import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.ContentRepository
 import com.habitrpg.android.habitica.extensions.addCancelButton
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.common.habitica.helpers.AppTestingLevel
-import com.habitrpg.common.habitica.helpers.LanguageHelper
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.helpers.SoundManager
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager
@@ -32,6 +30,8 @@ import com.habitrpg.android.habitica.ui.activities.PrefsActivity
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.SnackbarActivity
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.common.habitica.helpers.AppTestingLevel
+import com.habitrpg.common.habitica.helpers.LanguageHelper
 import java.util.Locale
 import javax.inject.Inject
 
@@ -294,7 +294,7 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
 
     override fun setUser(user: User?) {
         super.setUser(user)
-        if (10 <= user?.stats?.lvl ?: 0) {
+        if (10 <= (user?.stats?.lvl ?: 0)) {
             if (user?.flags?.classSelected == true) {
                 if (user.preferences?.disableClasses == true) {
                     classSelectionPreference?.title = getString(R.string.enable_class)

From f586288c219bd56855ffec7141d075c7431dca4e Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 13 Jul 2022 12:29:44 +0200
Subject: [PATCH 37/39] Fix broken adapter behaviour

---
 .../wearos/habitica/ui/activities/MainActivity.kt  |  1 -
 .../habitica/ui/activities/SettingsActivity.kt     |  8 +-------
 .../wearos/habitica/ui/adapters/BaseAdapter.kt     | 14 +++++++-------
 .../wearos/habitica/ui/adapters/HubAdapter.kt      |  3 +--
 .../wearos/habitica/ui/adapters/SettingsAdapter.kt |  7 ++++---
 .../wearos/habitica/ui/adapters/TaskListAdapter.kt |  2 +-
 .../habitica/ui/views/HabiticaRecyclerView.kt      |  1 +
 .../wearos/habitica/ui/views/HabiticaScrollView.kt |  5 +++++
 8 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt
index 0485bc183..90489e643 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/MainActivity.kt
@@ -123,7 +123,6 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
         )
         viewModel.user.observe(this) { user ->
             adapter.title = user.profile?.name ?: ""
-            adapter.notifyItemChanged(0)
             val index = adapter.data.indexOfFirst { it.identifier == "stats" }
             adapter.data[index].detailText = getString(R.string.user_level, user.stats?.lvl ?: 0)
             adapter.notifyItemChanged(index+1)
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt
index 696cd020f..53a8515b0 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt
@@ -32,6 +32,7 @@ class SettingsActivity: BaseActivity<ActivitySettingsBinding, SettingsViewModel>
         }
 
         adapter.data = buildSettings()
+        adapter.title = getString(R.string.settings)
         lifecycleScope.launch {
             appStateManager.isAppConnected.collect {
                 adapter.isDisconnected = !it
@@ -49,13 +50,6 @@ class SettingsActivity: BaseActivity<ActivitySettingsBinding, SettingsViewModel>
 
     private fun buildSettings(): List<SettingsItem> {
         return listOf(
-            SettingsItem(
-                "header",
-                getString(R.string.settings),
-                SettingsItem.Types.HEADER,
-                null
-            ) {
-            },
             SettingsItem(
                 "sync",
                 getString(R.string.sync_data),
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/BaseAdapter.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/BaseAdapter.kt
index 1c9ebfc34..35826ab21 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/BaseAdapter.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/BaseAdapter.kt
@@ -10,6 +10,11 @@ import com.habitrpg.wearos.habitica.ui.viewHolders.SpacerViewHolder
 
 abstract class BaseAdapter<D: Any> : RecyclerView.Adapter<RecyclerView.ViewHolder >() {
     var title: String = ""
+    set(value) {
+        val previous = field
+        field = value
+        notifyItemChanged(0)
+    }
     var onRefresh: (() -> Unit)? = null
     var isDisconnected = false
     set(value) {
@@ -31,13 +36,8 @@ abstract class BaseAdapter<D: Any> : RecyclerView.Adapter<RecyclerView.ViewHolde
         }
     }
 
-    override fun getItemCount(): Int {
-        var count = data.size
-        if (title.isNotBlank()) {
-            count++
-        }
-        return count
-    }
+    override fun getItemCount() = data.size + 1
+    protected fun getItemAt(position: Int) = data[position - 1]
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         if (holder is HeaderViewHolder) {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/HubAdapter.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/HubAdapter.kt
index 7f9a806ae..519cd2096 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/HubAdapter.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/HubAdapter.kt
@@ -19,13 +19,12 @@ class HubAdapter: BaseAdapter<MenuItem>() {
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         if (holder is HubViewHolder) {
-            holder.bind(getItemAt(position - 1))
+            holder.bind(getItemAt(position))
         } else {
             super.onBindViewHolder(holder, position)
         }
     }
 
-    private fun getItemAt(position: Int) = data.filter { !it.isHidden }[position]
     override fun getItemViewType(position: Int) = if (position == 0) TYPE_HEADER else 1
 }
 
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/SettingsAdapter.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/SettingsAdapter.kt
index 6e08aa643..3f6e0f52b 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/SettingsAdapter.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/SettingsAdapter.kt
@@ -29,10 +29,10 @@ class SettingsAdapter: BaseAdapter<SettingsItem>() {
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         when (holder) {
             is SettingsViewHolder -> {
-                holder.bind(data[position])
+                holder.bind(getItemAt(position))
             }
             is FooterViewHolder -> {
-                holder.bind(data[position].title)
+                holder.bind(getItemAt(position).title)
             }
             is SpacerViewHolder -> {
                 holder.bind(16.dpToPx(holder.itemView.context))
@@ -42,7 +42,8 @@ class SettingsAdapter: BaseAdapter<SettingsItem>() {
     }
 
     override fun getItemViewType(position: Int): Int {
-        val item = data[position]
+        if (position == 0) return TYPE_HEADER
+        val item = getItemAt(position)
         return when (item.type) {
             SettingsItem.Types.HEADER -> TYPE_HEADER
             SettingsItem.Types.FOOTER -> 1
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt
index a41703e59..b64e4f429 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt
@@ -23,7 +23,7 @@ open class TaskListAdapter : BaseAdapter<Any>() {
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         if (holder is TaskViewHolder) {
-            val item = data[position - 1] as Task
+            val item = getItemAt(position) as Task
             holder.bind(item)
             holder.onTaskScore = {
                 onTaskScore?.invoke(item)
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaRecyclerView.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaRecyclerView.kt
index 80b021b00..3d7cd9ab0 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaRecyclerView.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaRecyclerView.kt
@@ -17,6 +17,7 @@ class HabiticaRecyclerView @JvmOverloads constructor(
         post {
             setPadding(0, (height * 0.1).toInt(), 0, (height * 0.25).toInt())
             scrollToPosition(0)
+            requestFocus()
         }
     }
 
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaScrollView.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaScrollView.kt
index 822578f7a..6ce11019d 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaScrollView.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/HabiticaScrollView.kt
@@ -11,6 +11,11 @@ class HabiticaScrollView @JvmOverloads constructor(
     context: Context, attrs: AttributeSet? = null
 ) : NestedScrollView(context, attrs) {
 
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        requestFocus()
+    }
+
     override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
         super.onLayout(changed, l, t, r, b)
         if (changed) {

From a768f5cfa58ddc95f653a1a6c0772789a9fa2115 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 13 Jul 2022 12:36:12 +0200
Subject: [PATCH 38/39] fix sprite display

---
 wearos/src/main/res/layout/task_reward_drop.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wearos/src/main/res/layout/task_reward_drop.xml b/wearos/src/main/res/layout/task_reward_drop.xml
index bd27fb34d..cb87aad24 100644
--- a/wearos/src/main/res/layout/task_reward_drop.xml
+++ b/wearos/src/main/res/layout/task_reward_drop.xml
@@ -20,7 +20,7 @@
         />
     <FrameLayout
         android:layout_width="40dp"
-        android:layout_height="40dp">
+        android:layout_height="45dp">
         <com.habitrpg.common.habitica.views.PixelArtView
             android:id="@+id/image_view"
             android:layout_width="80dp"

From 63ac925b253ac3236cffaf2b766c18ab22aba713 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 14 Jul 2022 17:51:34 +0200
Subject: [PATCH 39/39] tweaks

---
 .../habitica/HabiticaBaseApplication.kt       |  4 +-
 .../receivers/DeviceCommunicationService.kt   |  1 +
 .../receivers/TaskAlarmBootReceiver.kt        | 10 +++--
 .../tasks/TaskRecyclerViewFragment.kt         |  8 +++-
 .../habitica/ui/viewmodels/InboxViewModel.kt  | 14 +++----
 fastlane/README.md                            |  8 ++++
 version.properties                            |  2 +-
 .../wearos/habitica/data/ApiClient.kt         | 39 ++++++++++---------
 .../habitica/ui/activities/BaseActivity.kt    |  2 +-
 .../ui/activities/TaskDetailActivity.kt       |  3 ++
 .../ui/activities/TaskListActivity.kt         |  1 +
 .../ui/activities/TaskResultActivity.kt       | 11 +++++-
 .../habitica/ui/viewmodels/LoginViewModel.kt  |  1 +
 .../habitica/ui/viewmodels/SplashViewModel.kt |  3 ++
 .../ui/views/IndeterminateProgressView.kt     |  2 +-
 wearos/src/main/res/anim/move_away.xml        | 10 +++++
 wearos/src/main/res/anim/no_animation.xml     |  5 +++
 wearos/src/main/res/anim/scale_in.xml         | 10 +++++
 wearos/src/main/res/anim/scale_out.xml        | 10 +++++
 wearos/src/main/res/anim/scale_up.xml         | 11 ++++++
 wearos/src/main/res/layout/activity_input.xml |  5 ++-
 wearos/src/main/res/values/integers.xml       |  4 ++
 22 files changed, 126 insertions(+), 38 deletions(-)
 create mode 100644 wearos/src/main/res/anim/move_away.xml
 create mode 100644 wearos/src/main/res/anim/no_animation.xml
 create mode 100644 wearos/src/main/res/anim/scale_in.xml
 create mode 100644 wearos/src/main/res/anim/scale_out.xml
 create mode 100644 wearos/src/main/res/anim/scale_up.xml
 create mode 100644 wearos/src/main/res/values/integers.xml

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
index 3c620c083..6901fe38f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
@@ -20,6 +20,7 @@ import androidx.core.content.edit
 import androidx.preference.PreferenceManager
 import com.amplitude.api.Amplitude
 import com.amplitude.api.Identify
+import com.google.android.gms.wearable.Wearable
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.installations.FirebaseInstallations
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
@@ -35,10 +36,10 @@ import com.habitrpg.android.habitica.modules.UserRepositoryModule
 import com.habitrpg.android.habitica.proxy.AnalyticsManager
 import com.habitrpg.android.habitica.ui.activities.BaseActivity
 import com.habitrpg.android.habitica.ui.activities.LoginActivity
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.common.habitica.extensions.setupCoil
 import com.habitrpg.common.habitica.helpers.LanguageHelper
 import com.habitrpg.common.habitica.helpers.MarkdownParser
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.realm.Realm
 import io.realm.RealmConfiguration
 import java.lang.ref.WeakReference
@@ -272,6 +273,7 @@ abstract class HabiticaBaseApplication : Application(), Application.ActivityLife
             }
             reloadUserComponent()
             getInstance(context)?.lazyApiHelper?.updateAuthenticationCredentials(null, null)
+            Wearable.getCapabilityClient(context).removeLocalCapability("provide_auth")
             startActivity(LoginActivity::class.java, context)
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/DeviceCommunicationService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/DeviceCommunicationService.kt
index 5ced9de91..903acde31 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/DeviceCommunicationService.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/DeviceCommunicationService.kt
@@ -45,6 +45,7 @@ class DeviceCommunicationService : WearableListenerService() {
         val startIntent = Intent(this, TaskFormActivity::class.java).apply {
             putExtra(TaskFormActivity.TASK_ID_KEY, taskID)
         }
+        startIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
         startActivity(startIntent)
         messageClient.sendMessage(event.sourceNodeId, "/action_completed", 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 68968cd6d..a7d527141 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
@@ -8,7 +8,8 @@ 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 kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -19,9 +20,12 @@ class TaskAlarmBootReceiver : BroadcastReceiver() {
     @Inject
     lateinit var sharedPreferences: SharedPreferences
 
-    override fun onReceive(context: Context, arg1: Intent) {
+    override fun onReceive(context: Context, intent: Intent) {
+        if (intent.action != Intent.ACTION_BOOT_COMPLETED) {
+            return
+        }
         HabiticaBaseApplication.userComponent?.inject(this)
-        GlobalScope.launch {
+        MainScope().launch(Dispatchers.Main) {
             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/ui/fragments/tasks/TaskRecyclerViewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
index 2063d4c2a..5f0382932 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
@@ -38,16 +38,16 @@ import com.habitrpg.android.habitica.ui.adapter.tasks.RewardsRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.adapter.tasks.TaskRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.adapter.tasks.TodosRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.common.habitica.helpers.EmptyItem
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder
 import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.common.habitica.helpers.EmptyItem
 import com.habitrpg.common.habitica.models.responses.TaskDirection
 import com.habitrpg.common.habitica.models.responses.TaskScoringResult
 import com.habitrpg.common.habitica.models.tasks.TaskType
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import kotlinx.coroutines.Job
@@ -102,6 +102,9 @@ open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBi
             recyclerSubscription.dispose()
         }
         recyclerSubscription = CompositeDisposable()
+        if (viewModel == null && parentFragment is TasksFragment) {
+            viewModel = (parentFragment as TasksFragment).viewModel
+        }
         viewModel?.let { viewModel ->
             val adapter: BaseRecyclerViewAdapter<*, *>? = when (this.taskType) {
                 TaskType.HABIT -> HabitsRecyclerViewAdapter(R.layout.habit_item_card, viewModel)
@@ -201,6 +204,7 @@ open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBi
         component.inject(this)
     }
 
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         savedInstanceState?.let { this.taskType = TaskType.from(savedInstanceState.getString(CLASS_TYPE_KEY, "")) ?: TaskType.HABIT }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt
index 620b45ef2..95489448b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt
@@ -10,21 +10,21 @@ import androidx.paging.PositionalDataSource
 import androidx.paging.toLiveData
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.SocialRepository
-import com.habitrpg.common.habitica.extensions.Optional
-import com.habitrpg.common.habitica.extensions.asOptional
 import com.habitrpg.android.habitica.extensions.filterOptionalDoOnEmpty
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.ChatMessage
+import com.habitrpg.common.habitica.extensions.Optional
+import com.habitrpg.common.habitica.extensions.asOptional
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.subjects.BehaviorSubject
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 import kotlin.math.ceil
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
 
 class InboxViewModel(recipientID: String?, recipientUsername: String?) : BaseViewModel() {
     @Inject
@@ -101,7 +101,7 @@ class MessagesDataSource(
             callback.onResult(emptyList())
             return
         }
-        GlobalScope.launch(Dispatchers.Main.immediate) {
+        MainScope().launch(Dispatchers.Main.immediate) {
             if (recipientID?.isNotBlank() != true) { return@launch }
             val page = ceil(params.startPosition.toFloat() / params.loadSize.toFloat()).toInt()
             socialRepository.retrieveInboxMessages(recipientID ?: "", page)
@@ -120,7 +120,7 @@ class MessagesDataSource(
 
     override fun loadInitial(params: LoadInitialParams, callback: LoadInitialCallback<ChatMessage>) {
         lastFetchWasEnd = false
-        GlobalScope.launch(Dispatchers.Main.immediate) {
+        MainScope().launch(Dispatchers.Main.immediate) {
             socialRepository.getInboxMessages(recipientID)
                 .map { socialRepository.getUnmanagedCopy(it) }
                 .firstElement()
diff --git a/fastlane/README.md b/fastlane/README.md
index 9db559d7a..054066702 100644
--- a/fastlane/README.md
+++ b/fastlane/README.md
@@ -23,6 +23,14 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do
 
 Runs all the tests
 
+### android testUpload
+
+```sh
+[bundle exec] fastlane android testUpload
+```
+
+
+
 ### android staff
 
 ```sh
diff --git a/version.properties b/version.properties
index d89172c60..2931e25db 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
 NAME=4.0
-CODE=4200
\ No newline at end of file
+CODE=4210
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt
index 27f3ed7b3..8d0cb2d2a 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/ApiClient.kt
@@ -97,10 +97,27 @@ class ApiClient @Inject constructor(
                     cacheControl.noCache()
                         .noStore()
                 }
-                chain.proceed(request.newBuilder().header(
+                val response = chain.proceed(request.newBuilder().header(
                     "Cache-Control",
                     cacheControl.build().toString()
-                    ).build())
+                ).build())
+                val responseBuilder = response.newBuilder()
+                responseBuilder.header("was-cached", (response.networkResponse == null).toString())
+                if (request.method == "GET") {
+                    if (response.code == 504 || response.request.header("x-api-user") != hostConfig.userID) {
+                        // Cache miss. Network might be down, but retry call without cache to be sure.
+                        response.close()
+                        chain.proceed(request.newBuilder()
+                            .header("Cache-Control", "no-cache")
+                            .build())
+                    } else {
+                        responseBuilder
+                            .header("Cache-Control", request.header("Cache-Control") ?: "")
+                            .build()
+                    }
+                } else {
+                    responseBuilder.build()
+                }
             }
             .addNetworkInterceptor { chain ->
                 val original = chain.request()
@@ -121,23 +138,7 @@ class ApiClient @Inject constructor(
                 val request = builder.method(original.method, original.body)
                     .removeHeader("Pragma")
                     .build()
-                val response = chain.proceed(request)
-                val responseBuilder = response.newBuilder()
-                responseBuilder.header("was-cached", (response.networkResponse == null).toString())
-                if (request.method == "GET") {
-                    if (response.code == 504 || response.request.header("x-api-user") != hostConfig.userID) {
-                        // Cache miss. Network might be down, but retry call without cache to be sure.
-                        chain.proceed(request.newBuilder()
-                            .header("Cache-Control", "no-cache")
-                            .build())
-                    } else {
-                        responseBuilder
-                            .header("Cache-Control", request.header("Cache-Control") ?: "")
-                            .build()
-                    }
-                } else {
-                    responseBuilder.build()
-                }
+                chain.proceed(request)
             }
             .readTimeout(2400, TimeUnit.SECONDS)
             .build()
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt
index 7e252ac59..a85525851 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt
@@ -110,7 +110,7 @@ abstract class BaseActivity<B: ViewBinding, VM: BaseViewModel> : ComponentActivi
                     CapabilityClient.FILTER_REACHABLE
                 )
             )
-            val nodeID = info.nodes.firstOrNull { it.isNearby }
+            val nodeID = info.nodes.firstOrNull()
             if (nodeID != null) {
                 function?.invoke(true)
                 Tasks.await(
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskDetailActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskDetailActivity.kt
index 983a7e867..4bc827fd1 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskDetailActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskDetailActivity.kt
@@ -1,5 +1,6 @@
 package com.habitrpg.wearos.habitica.ui.activities
 
+import android.content.Intent
 import android.os.Bundle
 import androidx.activity.viewModels
 import androidx.core.content.ContextCompat
@@ -29,6 +30,8 @@ class TaskDetailActivity : BaseActivity<ActivityTaskDetailBinding, TaskDetailVie
 
     private fun openEditFormOnPhone() {
         sendMessage("edit_task", "/tasks/edit", viewModel.taskID?.toByteArray())
+        startActivity(
+            Intent(this, ContinuePhoneActivity::class.java))
     }
 
     private fun subscribeUI() {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt
index beef36c00..e27ecbda2 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskListActivity.kt
@@ -149,6 +149,7 @@ class TaskListActivity : BaseActivity<ActivityTasklistBinding, TaskListViewModel
         startActivity(Intent(this, TaskFormActivity::class.java).apply {
             putExtra("task_type", viewModel.taskType?.value)
         })
+        overridePendingTransition(R.anim.scale_up, 0)
     }
 
     private fun configureAdapter() {
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt
index a65969766..e58279b27 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskResultActivity.kt
@@ -49,14 +49,20 @@ class TaskResultActivity : BaseActivity<ActivityTaskResultBinding, TaskResultVie
         }
     }
 
-    override fun finish() {
+    override fun onDestroy() {
         if (viewModel.result?.hasLeveledUp == true) {
             startActivity(Intent(this, LevelupActivity::class.java)
                 .apply {
                     addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
                 })
+            overridePendingTransition(R.anim.scale_in, R.anim.move_away)
         }
+        super.onDestroy()
+    }
+
+    override fun finish() {
         super.finish()
+        overridePendingTransition(0, R.anim.scale_out)
     }
 
     private fun makeChips() {
@@ -148,7 +154,7 @@ class TaskResultActivity : BaseActivity<ActivityTaskResultBinding, TaskResultVie
             it.layoutParams = layoutParams
 
             val animator = AlphaAnimation(0f, 1f)
-            animator.startOffset = (index * 150).toLong() + 200
+            animator.startOffset = (index * 150).toLong() + 600
             animator.duration = 300
             animator.fillAfter = true
             animator.fillBefore = true
@@ -197,6 +203,7 @@ class TaskResultActivity : BaseActivity<ActivityTaskResultBinding, TaskResultVie
             val intent = Intent(context, TaskResultActivity::class.java)
             intent.putExtra("result", result)
             context.startActivity(intent)
+            context.overridePendingTransition(R.anim.scale_in, R.anim.move_away)
         }
     }
 }
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt
index 1ed7b3efc..56dd8454f 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/LoginViewModel.kt
@@ -125,6 +125,7 @@ class LoginViewModel @Inject constructor(userRepository: UserRepository,
         try {
             saveTokens(userAuthResponse.apiToken, userAuthResponse.id)
         } catch (e: Exception) {
+            return
         }
         val user = userRepository.retrieveUser(true)
         taskRepository.retrieveTasks(user?.tasksOrder, true)
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SplashViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SplashViewModel.kt
index 96e0cd9ea..720775797 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SplashViewModel.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/SplashViewModel.kt
@@ -41,6 +41,9 @@ class SplashViewModel @Inject constructor(userRepository: UserRepository,
         }) {
             val (userID, apiKey) = String(event.data).split(":")
             try {
+                if (userID.isBlank() || apiKey.isBlank()) {
+                    return@launch
+                }
                 saveTokens(apiKey, userID)
             } catch (e: Exception) {
                 onLoginCompleted(false)
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/IndeterminateProgressView.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/IndeterminateProgressView.kt
index 9127735a7..0519069b7 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/IndeterminateProgressView.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/IndeterminateProgressView.kt
@@ -18,7 +18,7 @@ class IndeterminateProgressView @JvmOverloads constructor(
     context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
 ) : View(context, attrs, defStyleAttr) {
 
-    var progressBarWidth = 5f.dpToPx(context)
+    var progressBarWidth = 6f.dpToPx(context)
 
     private val rainbow = listOf(
         ContextCompat.getColor(context, R.color.black),
diff --git a/wearos/src/main/res/anim/move_away.xml b/wearos/src/main/res/anim/move_away.xml
new file mode 100644
index 000000000..e077b23bb
--- /dev/null
+++ b/wearos/src/main/res/anim/move_away.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/activity_transition_time"
+    >
+    <scale android:fromXScale="1" android:toXScale="0.8" android:pivotX="50%"
+        android:fromYScale="1" android:toYScale="0.8" android:pivotY="50%" />
+    <alpha
+        android:fromAlpha="1"
+        android:toAlpha="0.2"/>
+</set>
\ No newline at end of file
diff --git a/wearos/src/main/res/anim/no_animation.xml b/wearos/src/main/res/anim/no_animation.xml
new file mode 100644
index 000000000..c359afac9
--- /dev/null
+++ b/wearos/src/main/res/anim/no_animation.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/activity_transition_time"
+    android:fromYDelta="0"
+    android:toYDelta="0"/>
\ No newline at end of file
diff --git a/wearos/src/main/res/anim/scale_in.xml b/wearos/src/main/res/anim/scale_in.xml
new file mode 100644
index 000000000..8accfa26b
--- /dev/null
+++ b/wearos/src/main/res/anim/scale_in.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/activity_transition_time"
+    >
+    <scale android:fromXScale="0" android:toXScale="1" android:pivotX="50%"
+        android:fromYScale="0" android:toYScale="1" android:pivotY="50%" />
+    <alpha
+        android:fromAlpha="0.2"
+        android:toAlpha="1"/>
+</set>
\ No newline at end of file
diff --git a/wearos/src/main/res/anim/scale_out.xml b/wearos/src/main/res/anim/scale_out.xml
new file mode 100644
index 000000000..d27a296e0
--- /dev/null
+++ b/wearos/src/main/res/anim/scale_out.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/activity_transition_time"
+    >
+    <scale android:fromXScale="1" android:toXScale="0" android:pivotX="50%"
+        android:fromYScale="1" android:toYScale="0" android:pivotY="50%" />
+    <alpha
+        android:fromAlpha="1"
+        android:toAlpha="0.2"/>
+</set>
\ No newline at end of file
diff --git a/wearos/src/main/res/anim/scale_up.xml b/wearos/src/main/res/anim/scale_up.xml
new file mode 100644
index 000000000..727c96e76
--- /dev/null
+++ b/wearos/src/main/res/anim/scale_up.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/activity_transition_time"
+    >
+    <scale android:fromXScale="0" android:toXScale="1" android:pivotX="50%"
+        android:fromYScale="0" android:toYScale="1" android:pivotY="50%" />
+    <translate android:fromYDelta="90%" android:toYDelta="0%" />
+    <alpha
+        android:fromAlpha="0.2"
+        android:toAlpha="1"/>
+</set>
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/activity_input.xml b/wearos/src/main/res/layout/activity_input.xml
index b7b1c97d3..7ab9d41a9 100644
--- a/wearos/src/main/res/layout/activity_input.xml
+++ b/wearos/src/main/res/layout/activity_input.xml
@@ -46,7 +46,10 @@
         <EditText
             android:id="@+id/edit_text"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:imeOptions="actionDone"
+            android:inputType="text"
+            android:lines="1"/>
         </FrameLayout>
     </LinearLayout>
 </LinearLayout>
diff --git a/wearos/src/main/res/values/integers.xml b/wearos/src/main/res/values/integers.xml
new file mode 100644
index 000000000..21bf5048c
--- /dev/null
+++ b/wearos/src/main/res/values/integers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="activity_transition_time">300</integer>
+</resources>
\ No newline at end of file