From 5427278f3389db5179deb84e97816999f6820881 Mon Sep 17 00:00:00 2001 From: Arnau Mora Date: Fri, 6 Sep 2024 08:28:38 +0200 Subject: [PATCH 1/3] Fix deprecations Signed-off-by: Arnau Mora Gras --- .../bitfire/icsdroid/ui/screen/CalendarListScreen.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/at/bitfire/icsdroid/ui/screen/CalendarListScreen.kt b/app/src/main/java/at/bitfire/icsdroid/ui/screen/CalendarListScreen.kt index c47ea3c9..f5d40ea4 100644 --- a/app/src/main/java/at/bitfire/icsdroid/ui/screen/CalendarListScreen.kt +++ b/app/src/main/java/at/bitfire/icsdroid/ui/screen/CalendarListScreen.kt @@ -214,7 +214,7 @@ private fun CalendarListContent( modifier = Modifier .fillMaxWidth() .padding(8.dp) - .animateItemPlacement(), + .animateItem(), onAction = onRequestCalendarPermissions ) } @@ -230,7 +230,7 @@ private fun CalendarListContent( modifier = Modifier .fillMaxWidth() .padding(8.dp) - .animateItemPlacement(), + .animateItem(), onAction = onRequestNotificationPermission ) } @@ -246,7 +246,7 @@ private fun CalendarListContent( modifier = Modifier .fillMaxWidth() .padding(8.dp) - .animateItemPlacement(), + .animateItem(), onAction = onBatteryOptimizationWhitelist ) } @@ -262,7 +262,7 @@ private fun CalendarListContent( modifier = Modifier .fillMaxWidth() .padding(8.dp) - .animateItemPlacement(), + .animateItem(), onAction = onAutoRevokePermission ) } @@ -277,7 +277,7 @@ private fun CalendarListContent( modifier = Modifier .fillMaxWidth() .padding(8.dp, 16.dp, 8.dp, 8.dp) - .animateItemPlacement() + .animateItem() ) } } From 6c8ca98c599d79bc56a6c11da66f70623e9fb566 Mon Sep 17 00:00:00 2001 From: Arnau Mora Date: Fri, 6 Sep 2024 08:30:02 +0200 Subject: [PATCH 2/3] Got rid of unnecessary opt-in Signed-off-by: Arnau Mora Gras --- .../java/at/bitfire/icsdroid/ui/screen/CalendarListScreen.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/java/at/bitfire/icsdroid/ui/screen/CalendarListScreen.kt b/app/src/main/java/at/bitfire/icsdroid/ui/screen/CalendarListScreen.kt index f5d40ea4..277ba319 100644 --- a/app/src/main/java/at/bitfire/icsdroid/ui/screen/CalendarListScreen.kt +++ b/app/src/main/java/at/bitfire/icsdroid/ui/screen/CalendarListScreen.kt @@ -3,7 +3,6 @@ package at.bitfire.icsdroid.ui.screen import android.net.Uri import android.os.Build import androidx.compose.animation.AnimatedVisibility -import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row @@ -156,8 +155,7 @@ fun CalendarListScreen( @Composable @OptIn( - ExperimentalMaterial3Api::class, - ExperimentalFoundationApi::class + ExperimentalMaterial3Api::class ) private fun CalendarListContent( paddingValues: PaddingValues, From 9328e917524f65eabae6b4e4135217526802b744 Mon Sep 17 00:00:00 2001 From: Arnau Mora Gras Date: Mon, 9 Sep 2024 11:40:39 +0200 Subject: [PATCH 3/3] Optimized imports Signed-off-by: Arnau Mora Gras --- .../java/at/bitfire/icsdroid/ui/screen/CalendarListScreen.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/main/java/at/bitfire/icsdroid/ui/screen/CalendarListScreen.kt b/app/src/main/java/at/bitfire/icsdroid/ui/screen/CalendarListScreen.kt index c1d97390..95ab6221 100644 --- a/app/src/main/java/at/bitfire/icsdroid/ui/screen/CalendarListScreen.kt +++ b/app/src/main/java/at/bitfire/icsdroid/ui/screen/CalendarListScreen.kt @@ -3,8 +3,6 @@ package at.bitfire.icsdroid.ui.screen import android.net.Uri import android.os.Build import androidx.compose.animation.AnimatedVisibility -import androidx.compose.foundation.ExperimentalFoundationApi -import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxSize