Merge branch 'main' of github.com:HabitRPG/habitica-android into main

Habitica/build.gradle

@@ -40,7 +40,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.8.0'
+    implementation 'com.google.android.material:material:1.9.0'
     implementation "androidx.recyclerview:recyclerview:$recyclerview_version"
     implementation "androidx.preference:preference-ktx:$preferences_version"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
@@ -51,7 +51,7 @@ dependencies {
     implementation('com.jaredrummler:android-device-names:2.1.1')
 
     // IAP Handling / Verification
-    implementation "com.android.billingclient:billing-ktx:5.2.0"
+    implementation "com.android.billingclient:billing-ktx:6.0.1"
     implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1@aar'
 
     implementation("io.coil-kt:coil-compose:$coil_version")
@@ -73,7 +73,7 @@ dependencies {
 
     androidTestImplementation 'androidx.test:runner:1.5.2'
     androidTestImplementation 'androidx.test:rules:1.5.0'
-    debugImplementation 'androidx.fragment:fragment-testing:1.5.7'
+    debugImplementation 'androidx.fragment:fragment-testing:1.6.1'
     androidTestImplementation 'androidx.test:core-ktx:1.5.0'
     debugImplementation "androidx.test:monitor:1.6.1"
     androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.5'
@@ -95,7 +95,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:22.0.0'
+    implementation 'com.google.android.gms:play-services-ads:22.4.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"
@@ -106,16 +106,17 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
     implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
     implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
-    implementation "androidx.fragment:fragment-ktx:1.5.7"
-    implementation "androidx.paging:paging-runtime-ktx:3.1.1"
-    implementation "androidx.paging:paging-compose:1.0.0-alpha19"
+    implementation "androidx.fragment:fragment-ktx:1.6.1"
+    implementation "androidx.paging:paging-runtime-ktx:$paging_version"
+    implementation "androidx.paging:paging-compose:$paging_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
     implementation "com.google.accompanist:accompanist-themeadapter-material:$accompanist_version"
-    implementation "androidx.compose.material3:material3:1.0.1"
+    implementation "androidx.compose.material3:material3:1.1.2"
     implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version"
+    implementation 'com.google.android.play:core:1.10.3'
 
-    implementation 'androidx.activity:activity-compose:1.7.1'
+    implementation 'androidx.activity:activity-compose:1.7.2'
     implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
     implementation "androidx.compose.material:material:$compose_version"
     implementation "androidx.compose.animation:animation:$compose_version"
@@ -142,6 +143,7 @@ android {
 
     defaultConfig {
         minSdkVersion min_sdk
+        compileSdk 34
         applicationId "com.habitrpg.android.habitica"
         vectorDrawables.useSupportLibrary = true
         buildConfigField "String", "STORE", "\"google\""
@@ -168,7 +170,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.6"
+        kotlinCompilerExtensionVersion = "1.5.3"
     }
 
     signingConfigs {

Habitica/res/drawable/ad_button_background.xml

@@ -7,7 +7,7 @@
                 android:angle="0"
                 android:startColor="@color/green_100"
                 android:endColor="@color/green_500" />
-            <corners android:radius="8dp" />
+            <corners android:radius="12dp" />
         </shape>
     </item>
     <item
@@ -20,7 +20,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
             <solid android:color="@color/brand_400" />
-            <corners android:radius="6dp" />
+            <corners android:radius="10dp" />
         </shape>
         <ripple android:color="@color/white" />
     </item>

Habitica/res/drawable/ad_button_background_content.xml

@@ -7,7 +7,7 @@
                 android:angle="0"
                 android:startColor="@color/green_100"
                 android:endColor="@color/green_500" />
-            <corners android:radius="8dp" />
+            <corners android:radius="12dp" />
         </shape>
     </item>
     <item
@@ -20,7 +20,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
             <solid android:color="?attr/colorContentBackground" />
-            <corners android:radius="6dp" />
+            <corners android:radius="10dp" />
         </shape>
         <ripple android:color="@color/white" />
     </item>

Habitica/res/drawable/armoire_background_full.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+<item android:gravity="top">
+    <bitmap android:src="@drawable/armoire_background" />
+</item>
+    <item android:top="80dp" android:gravity="bottom">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/brand_400" />
+        </shape>
+    </item>
+</layer-list>

Habitica/res/drawable/avatar_customization_subcategory_bg.xml

@@ -2,10 +2,10 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/brand" />
+            <solid android:color="@color/brand_100" />
         </shape>
     </item>
     <item android:left="0dp" android:right="0dp" android:gravity="bottom">
         <bitmap android:src="@drawable/customization_shadow" />
     </item>
-</layer-list>
+</layer-list>

Habitica/res/drawable/boss_health_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/red_50" />
-    <corners android:topLeftRadius="4dp" android:topRightRadius="4dp" />
-</shape>
+    <corners android:topLeftRadius="@dimen/rounded_button_radius" android:topRightRadius="@dimen/rounded_button_radius" />
+</shape>

Habitica/res/drawable/confetti_subs.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="14dp" android:tint="@color/background_green"
+    android:viewportHeight="14" android:viewportWidth="14"
+    android:width="14dp" >
+    <path android:fillType="evenOdd" android:pathData="M9.33333 9.33333L14 7L9.33333 4.66667L7 0L4.66667 4.66667L0 7L4.66667 9.33333L7 14L9.33333 9.33333Z" android:fillColor="@color/background_green" />
+</vector>

Habitica/res/drawable/item_indicator_subscribe.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+<item android:width="24dp" android:height="24dp">
+    <shape android:shape="oval">
+        <solid android:color="@color/green_100" />
+    </shape>
+</item>
+    <item  android:width="14dp" android:height="14dp" android:gravity="center">
+        <bitmap android:src="@drawable/indicator_subscribe"  />
+    </item>
+</layer-list>

Habitica/res/drawable/pill_bg_green.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/green_50"/>
+    <solid android:color="@color/green_100"/>
     <corners android:radius="20dip"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
-</shape>
+</shape>

Habitica/res/drawable/quest_collection_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/green_50" />
-    <corners android:topLeftRadius="4dp" android:topRightRadius="4dp" />
-</shape>
+    <corners android:topLeftRadius="@dimen/rounded_button_radius" android:topRightRadius="@dimen/rounded_button_radius" />
+</shape>

Habitica/res/drawable/quest_difficulty_bg.xml

@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
 
     <solid android:color="?attr/colorWindowBackground" />
-    <corners android:bottomLeftRadius="4dp" android:bottomRightRadius="4dp" />
+    <corners android:bottomLeftRadius="@dimen/rounded_button_radius" android:bottomRightRadius="@dimen/rounded_button_radius" />
 
-</shape>
+</shape>

Habitica/res/drawable/shop_locked.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:width="24dp" android:height="24dp">
+        <shape>
+            <solid android:color="@color/offset_background"/>
+            <corners android:radius="20dip"/>
+            <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
+        </shape>
+    </item>
+    <item android:width="10dp" android:height="12dp" android:gravity="center">
+        <bitmap android:src="@drawable/icon_lock" android:tintMode="src_atop" android:tint="@color/text_quad">
+        </bitmap>
+    </item>
+</layer-list>

Habitica/res/drawable/snackbar_background_black.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">
+    <solid android:color="@color/black" />
+    <corners android:radius="100dp" />
+    <stroke android:width="1dp" android:color="@color/black_20_alpha" />
+</shape>

Habitica/res/drawable/sub_perk_bg.xml

@@ -0,0 +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="#005737" />
+    <corners android:radius="8dp" />
+</shape>

Habitica/res/drawable/subscribe_incentive_bg.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+</selector>

Habitica/res/drawable/subscribe_incentive_bg_topround.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+ <gradient android:startColor="#72CFFF" android:endColor="#77F4C7" />
+    <corners android:topLeftRadius="24dp" android:topRightRadius="24dp" />
+</shape>

Habitica/res/drawable/subscriber_benefit_button_bg.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <gradient android:startColor="#77F4C7" android:endColor="#72CFFF" />
+            <corners android:radius="12dp" />
+        </shape>
+    </item>
+
+    <item android:left="3dp" android:right="3dp" android:top="3dp" android:bottom="3dp">
+        <shape android:shape="rectangle">
+            <gradient android:startColor="#72CFFF" android:endColor="#77F4C7" />
+            <corners android:radius="10dp" />
+        </shape>
+    </item>
+</layer-list>

Habitica/res/drawable/subscriber_benefit_snackbar_bg.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <gradient android:startColor="#77F4C7" android:endColor="#72CFFF" />
+            <corners android:radius="100dp" />
+        </shape>
+    </item>
+
+    <item android:left="3dp" android:right="3dp" android:top="3dp" android:bottom="3dp">
+        <shape android:shape="rectangle">
+            <gradient android:startColor="#72CFFF" android:endColor="#77F4C7" />
+            <corners android:radius="100dp" />
+        </shape>
+    </item>
+</layer-list>