* Fix regression on dav settings because CircularProgressIndicator is broken on compose 1.6.0 JetBrains/compose-multiplatform#4157

* Update AGP to 8.2.2

Author: samuelchemla

.idea/deploymentTargetDropDown.xml

@@ -80,12 +80,12 @@ dependencies {
     implementation 'androidx.activity:activity-ktx:1.8.2'
     implementation 'androidx.fragment:fragment-ktx:1.6.2'
     implementation platform('androidx.compose:compose-bom:2022.10.00')
-    implementation 'androidx.compose.ui:ui'
-    implementation 'androidx.compose.ui:ui-graphics'
-    implementation 'androidx.compose.ui:ui-tooling-preview'
-    implementation 'androidx.compose.material3:material3'
-    implementation 'androidx.compose.material:material-icons-extended:1.6.0'
-    implementation 'androidx.compose.runtime:runtime-livedata:1.6.0'
+    implementation 'androidx.compose.ui:ui:1.5.4' // CircularProgressIndicator is broken on 1.6.0 https://github.com/JetBrains/compose-multiplatform/issues/4157
+    implementation 'androidx.compose.ui:ui-graphics:1.5.4'
+    implementation 'androidx.compose.ui:ui-tooling-preview:1.5.4'
+    implementation 'androidx.compose.material3:material3:1.1.2'
+    implementation 'androidx.compose.material:material-icons-extended:1.5.4'
+    implementation 'androidx.compose.runtime:runtime-livedata:1.5.4'
     implementation 'androidx.datastore:datastore-preferences:1.0.0'
     implementation 'com.squareup.okhttp3:okhttp:4.11.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.11.0'

.idea/gradle.xml

@@ -206,4 +206,12 @@ private fun PreferencesPreview() {
     MyApplicationTheme {
         Preferences(uiState = DavSettingsUiState(), stateChangeHandler = { }, saveHandler = { })
     }
+}
+
+@Preview(name = "Light Mode", showBackground = true)
+@Composable
+private fun PreferencesPreviewWithCircularIndicator() {
+    MyApplicationTheme {
+        Preferences(uiState = DavSettingsUiState(ongoingIO = true), stateChangeHandler = { }, saveHandler = { })
+    }
 }

.idea/inspectionProfiles/Project_Default.xml

@@ -45,7 +45,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.Help
+import androidx.compose.material.icons.filled.Help
 import androidx.compose.material.icons.filled.Cancel
 import androidx.compose.material.icons.filled.CheckCircle
 import androidx.compose.material.icons.filled.Info
@@ -248,7 +248,7 @@ private fun Main(
             title = null,
             actionTitle = stringResource(R.string.about),
             statusColor = Color.Gray,
-            statusIcon = Icons.AutoMirrored.Filled.Help,
+            statusIcon = Icons.Default.Help,
             clickHandler = {
                 val i = Intent(Intent.ACTION_VIEW)
                 i.data = Uri.parse("https://github.com/phpbg/easysync#easysync")
@@ -257,17 +257,32 @@ private fun Main(
         )
 
         if (isTrial.value) {
-            val msg = if (trialRemainingDays.intValue == 0) stringResource(R.string.home_trial_over) else pluralStringResource(R.plurals.home_trial_days_left, trialRemainingDays.intValue, trialRemainingDays.intValue)
+            val msg =
+                if (trialRemainingDays.intValue == 0) stringResource(R.string.home_trial_over) else pluralStringResource(
+                    R.plurals.home_trial_days_left,
+                    trialRemainingDays.intValue,
+                    trialRemainingDays.intValue
+                )
             StatusTitleClickable(
                 title = null,
                 actionTitle = msg,
                 statusColor = Color.Gray,
                 statusIcon = Icons.Default.Info,
                 clickHandler = {
                     try {
-                        mContext.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=com.phpbg.easysync")))
+                        mContext.startActivity(
+                            Intent(
+                                Intent.ACTION_VIEW,
+                                Uri.parse("market://details?id=com.phpbg.easysync")
+                            )
+                        )
                     } catch (e: ActivityNotFoundException) {
-                        mContext.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=com.phpbg.easysync")))
+                        mContext.startActivity(
+                            Intent(
+                                Intent.ACTION_VIEW,
+                                Uri.parse("https://play.google.com/store/apps/details?id=com.phpbg.easysync")
+                            )
+                        )
                     }
                 },
             )
@@ -283,7 +298,8 @@ private fun Main(
             -1
         }
         val maxJobs = max(localCount, syncedCount) + 1
-        val jobCountPercent = if (jobCount == -1) -1 else round(100.0 * (maxJobs - jobCount) / maxJobs).toInt()
+        val jobCountPercent =
+            if (jobCount == -1) -1 else round(100.0 * (maxJobs - jobCount) / maxJobs).toInt()
         Row(
             modifier = Modifier
                 .fillMaxWidth()
@@ -346,11 +362,17 @@ private fun Main(
         ) {
             Button(onClick = {
                 scope.launch {
-                    snackbarHostState.showSnackbar(message = "Sync requested", duration = SnackbarDuration.Short)
+                    snackbarHostState.showSnackbar(
+                        message = "Sync requested",
+                        duration = SnackbarDuration.Short
+                    )
                 }
                 fullSyncNowHandler()
             }, enabled = syncEnabled) {
-                Text(text = stringResource(R.string.home_action_sync_now), style = MaterialTheme.typography.labelLarge)
+                Text(
+                    text = stringResource(R.string.home_action_sync_now),
+                    style = MaterialTheme.typography.labelLarge
+                )
             }
         }
     }

.idea/migrations.xml

@@ -5,8 +5,8 @@ buildscript {
     }
 }
 plugins {
-    id 'com.android.application' version '8.1.1' apply false
-    id 'com.android.library' version '8.1.1' apply false
+    id 'com.android.application' version '8.2.2' apply false
+    id 'com.android.library' version '8.2.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.10' apply false
     id 'com.google.devtools.ksp' version '1.9.10-1.0.13' apply false
 }

app/build.gradle

@@ -1,9 +1,9 @@
 #Mon May 29 21:37:06 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 
 # https://docs.gradle.org/current/userguide/gradle_wrapper.html#sec:verification
-distributionSha256Sum=4159b938ec734a8388ce03f52aa8f3c7ed0d31f5438622545de4f83a89b79788
+distributionSha256Sum=38f66cd6eef217b4c35855bb11ea4e9fbc53594ccccb5fb82dfd317ef8c2c5a3