fix merge

Habitica/res/values/strings.xml

@@ -813,6 +813,8 @@
     <string name="old_password">Old Password</string>
     <string name="new_password">New Password</string>
     <string name="new_password_repeat">Repeat new Password</string>
+    <string name="password_change_info">Passwords must be 8 characters or more. Changing your password will log you out of any other devices and third-party tools you may use.</string>
+    <string name="confirm_new_password">Confirm new Password</string>
     <string name="adjust_streak">Adjust Streak</string>
     <string name="adjust_counter">Adjust Counter</string>
     <string name="password_changed">Password successfully changed</string>
@@ -1566,7 +1568,8 @@
     <string name="max_gem_cap">Max Gem Cap</string>
     <string name="max_gem_cap_text">Instantly start at the max Gem Cap</string>
     <string name="max_gem_cap_text_gift">They instantly start at the Max Gem Cap</string>
-
+    <string name="chat_empty_state_title">Start chatting!</string>
+    <string name="chat_empty_state_description">Remember to be friendly and follow the Community Guidelines.</string>
     <string name="gem_cap">Gem Cap</string>
     <string name="get_12_mystic_hourglasses">Get 12 Mystic Hourglasses immediately after your first 12 month subscription!</string>
     <string name="twelve_mystic_hourglasses">12 Mystic Hourglasses</string>

Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartySeekingFragment.kt

@@ -303,7 +303,7 @@ fun PartySeekingView(
                     configManager = viewModel.configManager,
                     modifier =
                     Modifier
-                        .animateItemPlacement()
+                        .animateItem()
                         .padding(horizontal = 14.dp)
                 ) { member ->
                     scope.launchCatching({

gradle/libs.versions.toml

@@ -1,71 +1,70 @@
 [versions]
 minSdk = "26"
-targetSdk = "35"
+targetSdk = "36"
 wearOsTargetSdk = "34"
 
 accompanist = "0.34.0"
-agp = "8.8.2"
-amplitude = "1.19.4"
+agp = "8.10.1"
+amplitude = "1.21.2"
 androidTest = "1.6.1"
 androidTestMonitor = "1.7.2"
 androidTestRunner = "1.6.2"
 annotationApi = "1.3.2"
-appcompat = "1.7.0"
+appcompat = "1.7.1"
 billing = "7.1.1"
-coil = "3.0.4"
-compose = "1.7.8"
+coil = "3.2.0"
+compose = "1.8.2"
 composeActivity = "1.10.1"
 compose_compiler = "1.5.14"
 constraintlayout = "2.2.1"
-converterMoshi = "2.9.0"
+converterMoshi = "3.0.0"
 coordinatorlayout = "1.3.0"
 coreSplashscreen = "1.1.0-rc01"
-core_ktx = "1.15.0"
-coroutines = "1.10.1"
-crashlytics = "3.0.3"
+core_ktx = "1.16.0"
+coroutines = "1.10.2"
+crashlytics = "3.0.4"
 credentials = "1.5.0"
-daggerhilt = "2.55"
+daggerhilt = "2.56.2"
 desuggar = "2.1.5"
-detekt = "1.19.0"
+detekt = "1.23.8"
 deviceNames = "2.1.1"
 firebase-perf = "1.4.2"
-firebase_bom = "33.12.0"
+firebase_bom = "33.15.0"
 flexbox = "3.0.0"
-fragmentKtx = "1.8.6"
-fragmentTesting = "1.8.6"
+fragmentKtx = "1.8.8"
+fragmentTesting = "1.8.8"
 google-service = "4.4.2"
 googleid = "1.1.1"
-gson = "2.12.0"
+gson = "2.13.1"
 habitRpgPlugin = "0.1.0"
 inAppReview = "2.0.2"
 junitKtx = "1.2.1"
 kaspresso = "1.6.0"
 kotest = "5.9.1"
-kotlin = "2.1.10"
-ksp = "2.1.10-1.0.31"
-ktlintPlugin = "11.3.1"
-leakCanary = "2.10"
-lifecycle = "2.8.7"
-lifecycleRuntimeKtx = "2.8.7"
+kotlin = "2.1.21"
+ksp = "2.1.21-2.0.2"
+ktlintPlugin = "12.3.0"
+leakCanary = "2.14"
+lifecycle = "2.9.1"
+lifecycleRuntimeKtx = "2.9.1"
 markwon = "4.6.2"
 material = "1.12.0"
-material3 = "1.3.1"
-mockk = "1.13.6"
-moshiKotlin = "1.15.0"
-navigation = "2.8.9"
+material3 = "1.3.2"
+mockk = "1.14.2"
+moshiKotlin = "1.15.2"
+navigation = "2.9.0"
 okhttp = "4.12.0"
 orchestrator = "1.5.1"
-pagerIndicator = "2.4.1"
 paging = "3.3.6"
 play_auth = "21.3.0"
 play_wearables = "19.0.0"
 preferences = "1.2.1"
 realmPlugin = "10.19.0"
 recyclerview = "1.4.0"
-retrofit = "2.11.0"
+retrofit = "3.0.0"
 shimmer = "0.5.0"
 swipeRefresh = "1.1.0"
-turbine = "1.2.0"
+turbine = "1.2.1"
 wear = "1.3.0"
 wearInput = "1.1.0"
 
@@ -159,7 +158,6 @@ test-runner = { group = "androidx.test", name = "runner", version.ref = "android
 text-google-fonts = { group = "androidx.compose.ui", name = "ui-text-google-fonts", version.ref = "compose" }
 turbine = { module = "app.cash.turbine:turbine", version.ref = "turbine" }
 ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "compose" }
-viewPagerIndicator = { group = "fr.avianey.com.viewpagerindicator", name = "library", version.ref = "pagerIndicator" }
 viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycle" }
 wear = { module = "androidx.wear:wear", version.ref = "wear" }
 wear-input = { module = "androidx.wear:wear-input", version.ref = "wearInput" }

version.properties

@@ -1,2 +1,2 @@
 NAME=4.7.6
-CODE=13391
+CODE=13431