Merge branch 'version/4.1' into Hafiz/update-sub-benefit-ui

Gemfile.lock

@@ -83,7 +83,7 @@ GEM
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-properties (1.1.2)
       java-properties
-    fastlane-plugin-semantic_release (1.14.1)
+    fastlane-plugin-semantic_release (1.18.0)
     fastlane-plugin-versioning_android (0.1.0)
     gh_inspector (1.1.3)
     google-api-client (0.38.0)

Habitica/AndroidManifest.xml

@@ -10,6 +10,7 @@
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission android:name="com.android.vending.BILLING" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
 
     <application
         android:name=".HabiticaApplication"
@@ -29,7 +30,6 @@
             android:value="@string/application_ad_id"/>
         <activity
             android:name=".ui.activities.MainActivity"
-            android:label="@string/app_name"
             android:theme="@style/LaunchAppTheme"
             android:windowSoftInputMode="stateHidden|adjustResize"
             android:configChanges="screenSize | smallestScreenSize | screenLayout | orientation"
@@ -148,6 +148,16 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".ui.activities.MainActivity" />
         </activity>
+        <activity
+            android:name=".ui.activities.TaskSummaryActivity"
+            android:parentActivityName=".ui.activities.MainActivity"
+            tools:ignore="UnusedAttribute"
+            android:configChanges="screenSize | smallestScreenSize | screenLayout | orientation"
+            android:windowSoftInputMode="stateVisible|adjustResize">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".ui.activities.MainActivity" />
+        </activity>
         <activity
             android:name=".ui.activities.GroupFormActivity"
             android:parentActivityName=".ui.activities.MainActivity"
@@ -204,9 +214,6 @@
                   android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity android:name=".ui.activities.GemPurchaseActivity"
                   android:screenOrientation="unspecified" />
-        <activity android:name=".ui.activities.VerifyUsernameActivity"
-            android:screenOrientation="unspecified"
-            android:windowSoftInputMode="stateHidden" />
         <receiver android:name=".receivers.NotificationPublisher" />
 
         <receiver android:name=".receivers.TaskReceiver" android:enabled="true" android:exported="true">
@@ -256,6 +263,12 @@
                 <action android:name="com.google.firebase.MESSAGING_EVENT"/>
             </intent-filter>
         </service>
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/ic_gryphon_white" />
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_color"
+            android:resource="@color/brand_300" />
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="@string/content_provider"

Habitica/build.gradle

@@ -35,7 +35,6 @@ dependencies {
         exclude module: 'okhttp'
     }
     implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
-    implementation "com.squareup.retrofit2:adapter-rxjava3:$retrofit_version"
 
     //Dependency Injection
     implementation "com.google.dagger:dagger:$daggerhilt_version"
@@ -43,7 +42,7 @@ dependencies {
     compileOnly 'javax.annotation:javax.annotation-api:1.3.2'
     //App Compatibility and Material Design
     implementation "androidx.appcompat:appcompat:$appcompat_version"
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'com.google.android.material:material:1.7.0'
     implementation "androidx.recyclerview:recyclerview:$recyclerview_version"
     implementation "androidx.preference:preference-ktx:$preferences_version"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
@@ -54,17 +53,11 @@ dependencies {
     implementation('com.jaredrummler:android-device-names:2.1.0')
 
     // IAP Handling / Verification
-    implementation "com.android.billingclient:billing-ktx:5.0.0"
+    implementation "com.android.billingclient:billing-ktx:5.1.0"
     implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1@aar'
-    //RxJava
-    implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
-    implementation 'io.reactivex.rxjava3:rxjava:3.1.4'
-    implementation 'io.reactivex.rxjava3:rxkotlin:3.0.1'
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
-    implementation "com.github.akarnokd:rxjava3-bridge:3.0.2"
 
     //Analytics
-    implementation "com.amplitude:android-sdk:$amplitude_version"
+    implementation "com.amplitude:analytics-android:$amplitude_version"
 
     //Tests
     testImplementation 'io.kotest:kotest-runner-junit5:5.3.0'
@@ -79,10 +72,10 @@ 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.5.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    debugImplementation 'androidx.fragment:fragment-testing:1.5.4'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
     androidTestImplementation 'androidx.test:core-ktx:1.4.0'
-    androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3'
+    androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.4'
     androidTestImplementation 'io.mockk:mockk-android:1.12.3'
     androidTestImplementation 'io.kotest:kotest-assertions-core:5.3.0'
     androidTestUtil("androidx.test:orchestrator:1.4.1")
@@ -98,7 +91,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-messaging-ktx'
     implementation 'com.google.firebase:firebase-config-ktx'
     implementation 'com.google.firebase:firebase-perf-ktx'
-    implementation 'com.google.android.gms:play-services-ads:21.1.0'
+    implementation 'com.google.android.gms:play-services-ads:21.3.0'
     implementation "com.google.android.gms:play-services-auth:$play_auth_version"
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
     implementation "com.google.android.gms:play-services-wearable:$play_wearables_version"
@@ -107,12 +100,22 @@ 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.5.1'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.5.1'
-    implementation "androidx.fragment:fragment-ktx:1.5.2"
+    implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
+    implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
+    implementation "androidx.fragment:fragment-ktx:1.5.4"
     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"
+    implementation "com.google.android.material:compose-theme-adapter:1.1.21"
+    implementation "androidx.compose.material3:material3:1.0.1"
+    implementation "com.google.accompanist:accompanist-systemuicontroller:0.27.1"
+
+    implementation 'androidx.activity:activity-compose:1.6.1'
+    implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
+    implementation "androidx.compose.material:material:$compose_version"
+    implementation "androidx.compose.animation:animation:$compose_version"
+    implementation "androidx.compose.ui:ui-tooling:$compose_version"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
 
     implementation 'com.willowtreeapps:signinwithapplebutton:0.3'
 
@@ -139,7 +142,7 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion min_sdk
         applicationId "com.habitrpg.android.habitica"
         vectorDrawables.useSupportLibrary = true
         buildConfigField "String", "STORE", "\"google\""
@@ -160,6 +163,11 @@ android {
 
     buildFeatures {
         viewBinding true
+        compose true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.4.0-alpha02"
     }
 
     signingConfigs {

Habitica/res/drawable/achievement_section_badge_bg.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/window_background" />
+    <solid android:color="?attr/colorWindowBackground" />
     <corners android:radius="12dp" />
 </shape>

Habitica/res/drawable/ad_button_background_content.xml

@@ -19,7 +19,7 @@
             android:shape="rectangle"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
-            <solid android:color="@color/content_background" />
+            <solid android:color="?attr/colorContentBackground" />
             <corners android:radius="6dp" />
         </shape>
         <ripple android:color="@color/white" />

Habitica/res/drawable/adventure_guide_menu_card_gray.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">
         <size android:width="24dp" android:height="80dp" />
-        <solid android:color="@color/window_background" />
+        <solid android:color="?attr/colorWindowBackground" />
         <corners android:topRightRadius="8dp" android:bottomRightRadius="8dp" />
     </shape>

Habitica/res/drawable/border_1f000000_white.xml

@@ -1,7 +1,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/content_background" />
+    <solid android:color="?attr/colorContentBackground" />
 
     <stroke
         android:width="0.5dip"

Habitica/res/drawable/bottom_sheet_background.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/window_background" />
+    <solid android:color="?attr/colorWindowBackground" />
     <corners android:topLeftRadius="@dimen/bottom_sheet_radius" android:topRightRadius="@dimen/bottom_sheet_radius" />
 </shape>

Habitica/res/drawable/bottom_sheet_title.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/window_background" />
+    <solid android:color="?attr/colorWindowBackground" />
     <corners android:topLeftRadius="@dimen/bottom_sheet_radius" android:topRightRadius="@dimen/bottom_sheet_radius" />
 </shape>

Habitica/res/drawable/button_background_gray_700.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/window_background" />
+    <solid android:color="?attr/colorWindowBackground" />
     <corners android:radius="@dimen/rounded_button_radius"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>

Habitica/res/drawable/class_selection_inset_arrow.xml

@@ -6,6 +6,6 @@
     android:viewportHeight="24.0">
     <path
         android:pathData="M0,12l0,12 11.5,-5.7c6.3,-3.2 11.5,-6 11.5,-6.3 0,-0.3 -5.2,-3.1 -11.5,-6.3l-11.5,-5.7 0,12z"
-        android:strokeColor="@color/content_background"
-        android:fillColor="@color/content_background"/>
+        android:strokeColor="?attr/colorContentBackground"
+        android:fillColor="?attr/colorContentBackground"/>
 </vector>

Habitica/res/drawable/edit.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M16.188,7.542 L12.458,3.812 13.479,2.792Q14,2.271 14.719,2.271Q15.438,2.271 15.958,2.792L17.208,4.042Q17.708,4.542 17.708,5.281Q17.708,6.021 17.208,6.521ZM14.958,8.771 L6.229,17.5H2.5V13.771L11.229,5.042Z"/>
+</vector>

Habitica/res/drawable/gradient_white.xml

@@ -3,6 +3,6 @@
     <gradient
         android:angle="90"
         android:endColor="@color/content_80_alpha"
-        android:startColor="@color/content_background"
+        android:startColor="?attr/colorContentBackground"
         android:type="linear" />
 </shape>

Habitica/res/drawable/habit_circle_disabled.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
     <size android:width="24dp" android:height="24dp" />
-    <stroke android:color="@color/content_background_offset" android:width="2dp" />
+    <stroke android:color="?attr/colorContentBackgroundOffset" android:width="2dp" />
 </shape>

Habitica/res/drawable/habit_scoring_circle.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
     <size android:width="32dp" android:height="32dp" />
-    <stroke android:width="2dp" android:color="@color/content_background_offset" />
+    <stroke android:width="2dp" android:color="?colorTintedBackgroundOffset" />
 </shape>

Habitica/res/drawable/icon_chat.xml

@@ -0,0 +1,5 @@
+<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="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM6,9h12v2L6,11L6,9zM14,14L6,14v-2h8v2zM18,8L6,8L6,6h12v2z"/>
+</vector>

Habitica/res/drawable/layout_rounded_bg_content.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/content_background" />
+    <solid android:color="?attr/colorContentBackground" />
     <corners android:radius="@dimen/rounded_button_radius"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>

Habitica/res/drawable/layout_rounded_bg_light_gray.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/content_background_offset" />
+    <solid android:color="?attr/colorContentBackgroundOffset" />
     <corners android:radius="@dimen/bar_radius"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>

Habitica/res/drawable/layout_rounded_bg_shopitem.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/window_background" />
+    <solid android:color="?attr/colorWindowBackground" />
     <corners android:radius="6dp"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>

Habitica/res/drawable/layout_rounded_bg_task_form.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/white" />
-    <corners android:radius="4dp" />
+    <corners android:radius="8dp" />
 </shape>

Habitica/res/drawable/layout_rounded_bg_tinted.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?colorTintedBackgroundOffset" />
+    <corners android:radius="@dimen/rounded_button_radius"/>
+    <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
+</shape>

Habitica/res/drawable/layout_rounded_bg_white.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/content_background" />
+    <solid android:color="?attr/colorContentBackground" />
     <corners android:radius="@dimen/rounded_button_radius"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>

Habitica/res/drawable/layout_rounded_bg_window.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/window_background" />
+    <solid android:color="?attr/colorWindowBackground" />
     <corners android:radius="@dimen/rounded_button_radius"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>

Habitica/res/drawable/layout_rounded_bg_window_blue_border.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/window_background" />
+    <solid android:color="?attr/colorWindowBackground" />
     <corners android:radius="@dimen/bar_radius"/>
     <stroke android:width="2dp" android:color="@color/blue_10" />
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />

Habitica/res/drawable/layout_rounded_bg_window_brand_border.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/window_background" />
+    <solid android:color="?attr/colorWindowBackground" />
     <corners android:radius="@dimen/bar_radius"/>
     <stroke android:width="2dp" android:color="@color/background_brand" />
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />

Habitica/res/drawable/layout_rounded_bg_window_red_border.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/window_background" />
+    <solid android:color="?attr/colorWindowBackground" />
     <corners android:radius="@dimen/bar_radius"/>
     <stroke android:width="2dp" android:color="@color/red_10" />
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />

Habitica/res/drawable/layout_rounded_bg_window_tint_border.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/window_background" />
+    <solid android:color="?attr/colorWindowBackground" />
     <corners android:radius="@dimen/rounded_button_radius"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
     <stroke android:color="?colorAccent" android:width="2dp" />

Habitica/res/drawable/layout_rounded_bg_window_yellow_border.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/window_background" />
+    <solid android:color="?attr/colorWindowBackground" />
     <corners android:radius="@dimen/bar_radius"/>
     <stroke android:width="2dp" android:color="@color/yellow_5" />
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />

Habitica/res/drawable/no_party_background_gradient.xml

@@ -4,8 +4,8 @@
     <gradient
         android:angle="90"
         android:centerColor="@color/transparent_white"
-        android:endColor="@color/content_background"
-        android:startColor="@color/content_background"
+        android:endColor="?attr/colorContentBackground"
+        android:startColor="?attr/colorContentBackground"
         android:type="linear"
         android:centerX="0.6"/>
 

Habitica/res/drawable/not_enough_gems_wave.xml

@@ -5,6 +5,6 @@
     android:viewportHeight="16">
   <path
       android:pathData="M0,15v-3l0.7,-0.34 1.05,-0.49 0.95,-0.43 0.84,-0.36 1.27,-0.54 1.07,-0.44 1.57,-0.63 1.28,-0.5 1.37,-0.51 0.96,-0.35 0.99,-0.35 1.03,-0.36 1.06,-0.36L15.25,6l1.7,-0.54 1.17,-0.36 1.2,-0.35 0.61,-0.18 1.24,-0.35 0.63,-0.17 1.28,-0.34c0.43,-0.11 0.87,-0.22 1.3,-0.33l1.33,-0.32a124.57,124.57 0,0 1,4.81 -1.05l1.42,-0.27C37.64,0.69 43.76,0 50,0c4.42,0 9.12,0.33 14.19,0.89l1.8,0.2 1.84,0.22 0.93,0.12 1.88,0.25 1.92,0.26 1.95,0.27 1.99,0.29 3.05,0.45 5.26,0.8 6.63,1.02 4.63,0.7 3.58,0.53 2.44,0.35 2.49,0.35 2.53,0.35 2.58,0.35 1.31,0.17 2.65,0.34c0.89,0.11 1.79,0.22 2.7,0.33l2.74,0.33 2.09,0.24 2.12,0.23 2.15,0.23 1.09,0.11 2.19,0.22 2.22,0.21 2.25,0.21 2.28,0.2 2.31,0.19c0.39,0.03 0.78,0.06 1.17,0.09l2.36,0.18 2.39,0.17 1.21,0.08 2.44,0.15 2.47,0.14 1.25,0.07 2.52,0.13 2.55,0.12c0.43,0.02 0.86,0.04 1.29,0.05l2.6,0.1 2.63,0.09 1.33,0.04 2.69,0.07c1.8,0.04 3.63,0.07 5.48,0.09l2.03,0.02h7.81c12.46,-0.09 24.81,-0.58 36.7,-1.3l3.39,-0.21 1.68,-0.11 3.35,-0.23 3.32,-0.24 1.65,-0.12 3.27,-0.25 4.04,-0.33 5.57,-0.48 3.13,-0.28 4.62,-0.43 4.52,-0.44 2.96,-0.29 4.35,-0.44 4.24,-0.44 5.46,-0.58 17.28,-1.87 3.29,-0.35 3.13,-0.32 2,-0.2 1.92,-0.19 1.84,-0.17 1.77,-0.16 2.09,-0.17 1.97,-0.14 1.48,-0.09c0.64,-0.04 1.25,-0.07 1.84,-0.1l1.14,-0.04 1.07,-0.03A57.3,57.3 0,0 1,316 2c7.31,0 12.87,1.52 16.94,3.38l0.61,0.29 0.59,0.29c0.19,0.1 0.38,0.2 0.57,0.29l0.54,0.3 0.52,0.3 0.5,0.3 0.71,0.45 0.44,0.3 0.42,0.29 0.4,0.29 0.38,0.28 0.53,0.42 0.33,0.27 0.3,0.26 0.28,0.25 0.26,0.24 0.24,0.23 0.33,0.32 0.37,0.38 0.29,0.32 0.33,0.39 0.11,0.14v3.68L174.15,15H0z"
-      android:fillColor="@color/content_background"
+      android:fillColor="?attr/colorContentBackground"
       android:fillType="evenOdd"/>
 </vector>

Habitica/res/drawable/pill_bg.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/window_background"/>
+    <solid android:color="?attr/colorWindowBackground"/>
     <corners android:radius="20dip"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>

Habitica/res/drawable/pill_bg_content.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/content_background"/>
+    <solid android:color="?attr/colorContentBackground"/>
     <corners android:radius="20dip"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>

Habitica/res/drawable/pill_bg_window.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/window_background"/>
+    <solid android:color="?attr/colorWindowBackground"/>
     <corners android:radius="20dip"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>

Habitica/res/drawable/quest_difficulty_bg.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
 
-    <solid android:color="@color/window_background" />
+    <solid android:color="?attr/colorWindowBackground" />
     <corners android:bottomLeftRadius="4dp" android:bottomRightRadius="4dp" />
 
 </shape>

Habitica/res/drawable/rounded_border_content.xml

@@ -1,6 +1,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/content_background" />
+    <solid android:color="?attr/colorContentBackground" />
     <stroke
         android:width="1dp"
         android:color="@color/offset_background"/>

Habitica/res/drawable/seekbar_thumb.xml

@@ -10,10 +10,10 @@
             <size
                 android:width="10dp"
                 android:height="10dp" />
-            <solid android:color="@color/content_background" />
+            <solid android:color="?attr/colorContentBackground" />
             <stroke
                 android:width="1dp"
-                android:color="@color/content_background_offset" />
+                android:color="?attr/colorContentBackgroundOffset" />
         </shape>
     </rotate>
 </item>

Habitica/res/drawable/subscription_box_bg.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/window_background"/>
+    <solid android:color="?attr/colorWindowBackground"/>
     <corners android:radius="8dip"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>

Habitica/res/drawable/subscription_box_bg_selected.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/window_background"/>
+    <solid android:color="?attr/colorWindowBackground"/>
     <corners android:radius="8dip"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
     <stroke android:color="@color/text_brand_neon" android:width="3dp" />

Habitica/res/drawable/system_chat_background.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <stroke android:color="@color/content_background_offset" android:width="1dp" />
+    <stroke android:color="?attr/colorContentBackgroundOffset" android:width="1dp" />
     <corners android:radius="4dp" />
 </shape>

Habitica/res/drawable/task_form_control_bg.xml

@@ -2,14 +2,14 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/content_background_offset" />
+            <solid android:color="?colorPrimaryDark" />
             <corners android:radius="4dp" android:topLeftRadius="8dp" android:topRightRadius="8dp" />
         </shape>
     </item>
 
-    <item android:bottom="4dp">
+    <item android:bottom="2dp">
         <shape android:shape="rectangle">
-            <solid android:color="@color/window_background" />
+            <solid android:color="?colorTintedBackgroundOffset" />
             <corners android:topLeftRadius="4dp" android:topRightRadius="4dp" android:bottomLeftRadius="2dp" android:bottomRightRadius="2dp" />
         </shape>
     </item>

Habitica/res/drawable/teams_title_bg.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-<solid android:color="@color/window_background" />
+<solid android:color="?attr/colorWindowBackground" />
     <corners android:radius="20dp" />
     <stroke android:color="?colorAccent" android:width="2dp" />
 </shape>

Habitica/res/layout-w600dp/activity_main.xml

@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.habitrpg.android.habitica.ui.activities.MainActivity"
-    android:background="@color/content_background">
+    android:background="?attr/colorContentBackground">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -22,7 +22,7 @@
         <View
             android:layout_width="1dp"
             android:layout_height="match_parent"
-            android:background="@color/window_background"/>
+            android:background="?attr/colorWindowBackground"/>
         <include layout="@layout/activity_main_content" android:id="@+id/content" />
     </LinearLayout>
 </androidx.drawerlayout.widget.DrawerLayout>

Habitica/res/layout/activity_armoire.xml

@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:background="@color/content_background">
+    android:background="?attr/colorContentBackground">
 <FrameLayout
     android:id="@+id/confetti_anchor"
     android:layout_width="match_parent"

Habitica/res/layout/activity_class_selection.xml

@@ -15,7 +15,7 @@
             android:layout_height="wrap_content"
             android:minHeight="?attr/actionBarSize"
             android:theme="@style/Toolbar"
-            android:background="@color/content_background"
+            android:background="?attr/colorContentBackground"
             app:layout_scrollFlags="scroll|enterAlways"
             app:title="@string/choose_class"
             app:titleTextColor="@color/text_primary"

Habitica/res/layout/activity_create_challenge.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="@color/content_background">
+    android:background="?attr/colorContentBackground">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -221,7 +221,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:nestedScrollingEnabled="false"
-            android:background="@color/content_background"
+            android:background="?attr/colorContentBackground"
             android:id="@+id/create_challenge_task_list">
 
         </androidx.recyclerview.widget.RecyclerView>

Habitica/res/layout/activity_death.xml

@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:background="@color/content_background">
+    android:background="?attr/colorContentBackground">
     <FrameLayout
         android:id="@+id/confetti_container"
         android:layout_width="match_parent"

Habitica/res/layout/activity_fixcharacter.xml

@@ -30,7 +30,7 @@
                         android:layout_height="wrap_content"
                         android:padding="@dimen/outer_inset"
                         android:text="@string/fix_character_description"
-                        android:background="@color/window_background"
+                        android:background="?attr/colorWindowBackground"
                         android:layout_marginBottom="16dp"
                         />
                     <FrameLayout
@@ -73,7 +73,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="2dp"
                         android:layout_gravity="bottom"
-                        android:background="@color/content_background_offset"
+                        android:background="?attr/colorContentBackgroundOffset"
                         android:layout_marginEnd="56dp"/>
                     </FrameLayout>
                     <FrameLayout
@@ -115,7 +115,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="2dp"
                             android:layout_gravity="bottom"
-                            android:background="@color/content_background_offset"
+                            android:background="?attr/colorContentBackgroundOffset"
                             android:layout_marginEnd="56dp"/>
                     </FrameLayout>
                     <FrameLayout
@@ -157,7 +157,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="2dp"
                             android:layout_gravity="bottom"
-                            android:background="@color/content_background_offset"
+                            android:background="?attr/colorContentBackgroundOffset"
                             android:layout_marginEnd="56dp"/>
                     </FrameLayout>
                     <FrameLayout
@@ -199,7 +199,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="2dp"
                             android:layout_gravity="bottom"
-                            android:background="@color/content_background_offset"
+                            android:background="?attr/colorContentBackgroundOffset"
                             android:layout_marginEnd="56dp"/>
                     </FrameLayout>
                     <FrameLayout
@@ -241,7 +241,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="2dp"
                             android:layout_gravity="bottom"
-                            android:background="@color/content_background_offset"
+                            android:background="?attr/colorContentBackgroundOffset"
                             android:layout_marginEnd="56dp"/>
                     </FrameLayout>
                     <FrameLayout
@@ -284,7 +284,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="2dp"
                             android:layout_gravity="bottom"
-                            android:background="@color/content_background_offset"
+                            android:background="?attr/colorContentBackgroundOffset"
                             android:layout_marginEnd="56dp"/>
                     </FrameLayout>
                 </LinearLayout>

Habitica/res/layout/activity_gem_purchase.xml

@@ -21,7 +21,7 @@
                 android:id="@+id/fragment_container"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@color/content_background"
+                android:background="?attr/colorContentBackground"
                 app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
             <com.google.android.material.appbar.AppBarLayout

Habitica/res/layout/activity_gift_gems.xml

@@ -8,7 +8,7 @@
         android:layout_height="match_parent"
         tools:context=".ui.activities.PrefsActivity"
         android:orientation="vertical"
-        android:background="@color/content_background">
+        android:background="?attr/colorContentBackground">
 
         <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
@@ -78,6 +78,6 @@
             android:layout_width="match_parent"
             android:layout_height="0px"
             android:layout_weight="1"
-            android:background="@color/content_background" />
+            android:background="?attr/colorContentBackground" />
     </LinearLayout>
 </FrameLayout>

Habitica/res/layout/activity_main.xml

@@ -7,7 +7,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.habitrpg.android.habitica.ui.activities.MainActivity"
-    android:background="@color/content_background">
+    android:background="?attr/colorContentBackground">
 
     <!-- As the main content view, the view below consumes the entire
          space available using match_parent in both dimensions. -->

Habitica/res/layout/activity_main_content.xml

@@ -28,16 +28,15 @@
             app:expandedTitleMarginStart="0dp"
             app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
-            <include
-                android:id="@+id/avatar_with_bars"
-                layout="@layout/avatar_with_bars"
+            <androidx.compose.ui.platform.ComposeView
+                android:id="@+id/header_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="?attr/actionBarSize"
                 android:layout_marginEnd="@dimen/header_border_spacing"
                 android:layout_marginStart="@dimen/header_border_spacing"
                 android:layout_marginBottom="@dimen/spacing_medium"
-                app:layout_collapseMode="parallax" />
+                app:layout_collapseMode="parallax"/>
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"

Habitica/res/layout/activity_party_invite.xml

@@ -8,7 +8,7 @@
         android:layout_height="match_parent"
         tools:context=".ui.activities.PrefsActivity"
         android:orientation="vertical"
-        android:background="@color/content_background">
+        android:background="?attr/colorContentBackground">
 
         <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
@@ -30,7 +30,7 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:layout_gravity="bottom"
-        android:background="@color/window_background"
+        android:background="?attr/colorWindowBackground"
         android:elevation="0dp"
         android:fillViewport="false"
 
@@ -48,7 +48,7 @@
         android:layout_width="match_parent"
         android:layout_height="0px"
         android:layout_weight="1"
-        android:background="@color/content_background" />
+        android:background="?attr/colorContentBackground" />
 
 </LinearLayout>
 

Habitica/res/layout/activity_report_message.xml

@@ -28,7 +28,7 @@
                 android:minHeight="?attr/actionBarSize"
                 android:theme="@style/Toolbar"
                 app:title=""
-                android:background="@color/content_background"
+                android:background="?attr/colorContentBackground"
                 app:layout_scrollFlags="scroll|enterAlways"
                 app:titleTextColor="@color/text_primary"
                 app:theme="@style/ReportMessageToolbar"