remove accompanist libraries and compose icons

2026-08-16 15:36:16 +02:00
parent 64dc66aadb
commit 37ccc83e7c
10 changed files with 23 additions and 38 deletions
--- a/app/ui/build.gradle.kts
+++ b/app/ui/build.gradle.kts
@@ -50,12 +50,10 @@ android {
            optIn.add("androidx.compose.ui.text.ExperimentalTextApi")
            optIn.add("androidx.compose.ui.unit.ExperimentalUnitApi")
            optIn.add("androidx.compose.foundation.layout.ExperimentalLayoutApi")
-            optIn.add("androidx.compose.material.ExperimentalMaterialApi")
            optIn.add("androidx.compose.material3.ExperimentalMaterial3Api")
            optIn.add("androidx.compose.material3.ExperimentalMaterial3ExpressiveApi")
            optIn.add("androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi")
            optIn.add("androidx.compose.animation.ExperimentalAnimationApi")
-            optIn.add("com.google.accompanist.pager.ExperimentalPagerApi")
            optIn.add("androidx.compose.animation.ExperimentalSharedTransitionApi")
        }
    }
@@ -92,11 +90,6 @@ dependencies {

    implementation(libs.markdown)

-    implementation(libs.accompanist.systemuicontroller)
-    implementation(libs.accompanist.pager)
-    implementation(libs.accompanist.pagerindicators)
-    implementation(libs.accompanist.flowlayout)
-
    implementation(libs.haze)

    implementation(libs.androidx.core)
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/component/view/ProgressBar.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/component/view/ProgressBar.kt
@@ -1,8 +1,8 @@
 package de.mm20.launcher2.ui.component.view

 import android.widget.ProgressBar
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.MaterialTheme
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -13,7 +13,7 @@ internal fun ComposeProgressBar(
    modifier: Modifier,
 ) {
    CircularProgressIndicator(
-        color = view.progressTintList?.defaultColor?.let { Color(it) } ?: MaterialTheme.colors.primary,
+        color = view.progressTintList?.defaultColor?.let { Color(it) } ?: MaterialTheme.colorScheme.primary,
        modifier = modifier,
    )
 }
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/scaffold/components/ClockAndWidgetsHomeComponent.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/scaffold/components/ClockAndWidgetsHomeComponent.kt
@@ -14,8 +14,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.rounded.ArrowBack
 import androidx.compose.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -35,6 +33,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
@@ -151,7 +150,7 @@ internal object ClockAndWidgetsHomeComponent : ScaffoldComponent() {
                        }
                    ) {
                        Icon(
-                            Icons.AutoMirrored.Rounded.ArrowBack,
+                            painterResource(R.drawable.arrow_back_24px),
                            stringResource(R.string.action_done)
                        )
                    }
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/scaffold/components/FeedComponent.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/scaffold/components/FeedComponent.kt
@@ -8,7 +8,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.size
-import androidx.compose.material.Icon
+import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/scaffold/components/WidgetsComponent.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/scaffold/components/WidgetsComponent.kt
@@ -14,8 +14,6 @@ import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.rounded.ArrowBack
 import androidx.compose.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -35,6 +33,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
@@ -139,7 +138,7 @@ internal class WidgetsComponent(
                            scope.launch { state.unlock() }
                        }
                    ) {
-                        Icon(Icons.AutoMirrored.Rounded.ArrowBack, stringResource(R.string.action_done))
+                        Icon(painterResource(R.drawable.arrow_back_24px), stringResource(R.string.action_done))
                    }
                },
                colors = TopAppBarDefaults.topAppBarColors(
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/ShowAllButton.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/ShowAllButton.kt
@@ -3,8 +3,6 @@ package de.mm20.launcher2.ui.launcher.search.common
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.rounded.ArrowForward
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
@@ -12,6 +10,7 @@ import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import de.mm20.launcher2.ui.R
@@ -30,7 +29,7 @@ fun ColumnScope.ShowAllButton(
    ) {
        Text(stringResource(R.string.show_all))
        Icon(
-            Icons.AutoMirrored.Rounded.ArrowForward,
+            painterResource(R.drawable.arrow_forward_20px),
            null,
            modifier = Modifier
                .padding(start = ButtonDefaults.IconSpacing)
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/filterbar/FilterBarSettingsScreen.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/filterbar/FilterBarSettingsScreen.kt
@@ -6,8 +6,6 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.rounded.ArrowBack
 import androidx.compose.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
@@ -32,7 +30,6 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation3.runtime.NavKey
-import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import de.mm20.launcher2.preferences.KeyboardFilterBarItem
 import de.mm20.launcher2.ui.R
 import de.mm20.launcher2.ui.component.dragndrop.DraggableItem
@@ -52,9 +49,6 @@ data object FilterBarSettingsRoute: NavKey
 fun FilterBarSettingsScreen() {
    val viewModel: FilterBarSettingsScreenVM = viewModel()
    val backStack = LocalBackStack.current
-    val systemUiController = rememberSystemUiController()
-    systemUiController.setStatusBarColor(MaterialTheme.colorScheme.surface)
-    systemUiController.setNavigationBarColor(Color.Black)

    val context = LocalContext.current
    val activity = LocalContext.current as? AppCompatActivity
@@ -100,8 +94,8 @@ fun FilterBarSettingsScreen() {
                        }
                    }) {
                        Icon(
-                            imageVector = Icons.AutoMirrored.Rounded.ArrowBack,
-                            contentDescription = "Back"
+                            painterResource(R.drawable.arrow_back_24px),
+                            contentDescription = stringResource(R.string.menu_back)
                        )
                    }
                },
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/SearchActionsSettingsScreen.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/SearchActionsSettingsScreen.kt
@@ -51,7 +51,6 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation3.runtime.NavKey
-import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import de.mm20.launcher2.searchactions.builders.CustomizableSearchActionBuilder
 import de.mm20.launcher2.ui.R
 import de.mm20.launcher2.ui.component.SearchActionIcon
@@ -72,9 +71,6 @@ data object SearchActionsSettingsRoute : NavKey
 fun SearchActionsSettingsScreen() {
    val viewModel: SearchActionsSettingsScreenVM = viewModel()
    val backStack = LocalBackStack.current
-    val systemUiController = rememberSystemUiController()
-    systemUiController.setStatusBarColor(MaterialTheme.colorScheme.surface)
-    systemUiController.setNavigationBarColor(Color.Black)

    val context = LocalContext.current

--- a/core/base/src/main/res/drawable/arrow_forward_20px.xml
+++ b/core/base/src/main/res/drawable/arrow_forward_20px.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M630,516L227.98,516Q212.69,516 202.34,505.71Q192,495.42 192,480.21Q192,465 202.34,454.5Q212.69,444 227.98,444L630,444L453.79,267.79Q443,257 443,242.5Q443,228 454,216.52Q465,206 479.5,206Q494,206 504.81,216.82L742.6,454.91Q748,460.32 750.5,466.63Q753,472.94 753,480.16Q753,487.37 750.5,493.69Q748,500 743,505L505,743Q494,754 480,753.5Q466,753 455,742.48Q444,731 444,716.33Q444,701.67 455,691L630,516Z"/>
+</vector>
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -27,8 +27,6 @@ androidx-core = "1.19.0"
 androidx-appcompat = "1.8.0"
 androidx-activity = "1.13.0"
 androidx-navigation3 = "1.1.6"
-
-# Careful, 2.10.0 seems to require some fixes, or jobs aren't executed
 androidx-work = "2.11.2"
 androidx-browser = "1.10.0"
 androidx-palette = "1.0.0"
@@ -91,10 +89,6 @@ androidx-work = { group = "androidx.work", name = "work-runtime-ktx", version.re
 androidx-browser = { group = "androidx.browser", name = "browser", version.ref = "androidx-browser" }
 androidx-palette = { group = "androidx.palette", name = "palette", version.ref = "androidx-palette" }

-accompanist-systemuicontroller = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version.ref = "accompanist" }
-accompanist-pager = { group = "com.google.accompanist", name = "accompanist-pager", version.ref = "accompanist" }
-accompanist-pagerindicators = { group = "com.google.accompanist", name = "accompanist-pager-indicators", version.ref = "accompanist" }
-accompanist-flowlayout = { group = "com.google.accompanist", name = "accompanist-flowlayout", version.ref = "accompanist" }
 haze = {group = "dev.chrisbanes.haze", name = "haze", version.ref = "haze" }

 androidx-constraintlayout-compose = { group = "androidx.constraintlayout", name = "constraintlayout-compose", version.ref = "androidx-constraint-layout" }