From 2aa563eb48bad1a8a584011072ebf10876df85d7 Mon Sep 17 00:00:00 2001 From: Suphon Thanakornpakapong Date: Sat, 14 May 2022 00:47:54 +0700 Subject: [PATCH] Cleanup experimental annotations --- lawnchair/src/app/lawnchair/HeadlessWidgetsManager.kt | 1 - lawnchair/src/app/lawnchair/font/FontCache.kt | 2 +- .../lawnchair/gestures/handlers/SleepGestureHandler.kt | 5 ----- .../src/app/lawnchair/override/CustomizeDialog.kt | 10 ++++------ .../src/app/lawnchair/ui/popup/LawnchairShortcut.kt | 2 -- .../lawnchair/ui/preferences/AppDrawerPreferences.kt | 2 -- .../lawnchair/ui/preferences/DebugMenuPreferences.kt | 6 ------ .../app/lawnchair/ui/preferences/DockPreferences.kt | 2 -- .../ui/preferences/ExperimentalFeaturesPreferences.kt | 3 --- .../app/lawnchair/ui/preferences/FolderPreferences.kt | 3 --- .../ui/preferences/FontSelectionPreference.kt | 3 +-- .../app/lawnchair/ui/preferences/GeneralPreferences.kt | 4 ---- .../lawnchair/ui/preferences/HiddenAppsPreferences.kt | 3 --- .../ui/preferences/HomeScreenGridPreferences.kt | 3 --- .../lawnchair/ui/preferences/HomeScreenPreferences.kt | 2 -- .../lawnchair/ui/preferences/IconPackPreferences.kt | 5 +---- .../lawnchair/ui/preferences/IconPickerPreference.kt | 4 +--- .../app/lawnchair/ui/preferences/PreferenceActivity.kt | 4 ---- .../src/app/lawnchair/ui/preferences/Preferences.kt | 5 +---- .../lawnchair/ui/preferences/PreferencesDashboard.kt | 2 -- .../lawnchair/ui/preferences/QuickstepPreferences.kt | 2 -- .../lawnchair/ui/preferences/SelectIconPreference.kt | 3 +-- .../src/app/lawnchair/ui/preferences/about/About.kt | 3 --- .../lawnchair/ui/preferences/about/ContributorRow.kt | 2 -- .../about/acknowledgements/Acknowledgements.kt | 4 +--- .../ui/preferences/components/IconShapePreference.kt | 2 -- .../ui/preferences/components/ListPreference.kt | 2 -- .../components/NotificationDotsPreference.kt | 3 --- .../ui/preferences/components/PreferenceGroup.kt | 1 - .../ui/preferences/components/PreferenceLayout.kt | 3 --- .../ui/preferences/components/PreferenceScaffold.kt | 2 -- .../preferences/components/PreferenceSearchScaffold.kt | 2 -- .../ui/preferences/components/QsbProviderPreference.kt | 4 ---- .../ui/preferences/components/ThemePreference.kt | 2 -- .../app/lawnchair/ui/preferences/components/TopBar.kt | 2 -- .../components/colorpreference/ColorPreference.kt | 4 +--- .../app/lawnchair/ui/preferences/preferenceGraph.kt | 2 +- .../app/lawnchair/ui/util/ProvideBottomSheetHandler.kt | 2 +- 38 files changed, 14 insertions(+), 102 deletions(-) diff --git a/lawnchair/src/app/lawnchair/HeadlessWidgetsManager.kt b/lawnchair/src/app/lawnchair/HeadlessWidgetsManager.kt index 79689297a8..ecb9210bf9 100644 --- a/lawnchair/src/app/lawnchair/HeadlessWidgetsManager.kt +++ b/lawnchair/src/app/lawnchair/HeadlessWidgetsManager.kt @@ -44,7 +44,6 @@ class HeadlessWidgetsManager(private val context: Context) { return subscription.flow } - @OptIn(ExperimentalCoroutinesApi::class) private fun createSubscription(info: AppWidgetProviderInfo, prefKey: String): WidgetSubscription { val subscription = WidgetSubscription(info) subscription.flow = callbackFlow { diff --git a/lawnchair/src/app/lawnchair/font/FontCache.kt b/lawnchair/src/app/lawnchair/font/FontCache.kt index 749c297d9c..abcb91c0a9 100644 --- a/lawnchair/src/app/lawnchair/font/FontCache.kt +++ b/lawnchair/src/app/lawnchair/font/FontCache.kt @@ -64,7 +64,7 @@ class FontCache private constructor(private val context: Context) { loadFontAsync(font) } - @ExperimentalCoroutinesApi + @OptIn(ExperimentalCoroutinesApi::class) fun getLoadedFont(font: Font): LoadedFont? { val deferredFont = deferredFonts[font] ?: return null if (!deferredFont.isCompleted) return null diff --git a/lawnchair/src/app/lawnchair/gestures/handlers/SleepGestureHandler.kt b/lawnchair/src/app/lawnchair/gestures/handlers/SleepGestureHandler.kt index 682729989f..e4c8faeb3b 100644 --- a/lawnchair/src/app/lawnchair/gestures/handlers/SleepGestureHandler.kt +++ b/lawnchair/src/app/lawnchair/gestures/handlers/SleepGestureHandler.kt @@ -27,7 +27,6 @@ import android.os.Build import android.provider.Settings import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.requiredWidth -import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material3.Button import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Text @@ -51,7 +50,6 @@ class SleepGestureHandler(context: Context) : GestureHandler(context) { methods.first { it.isSupported() }.sleep(launcher) } - @OptIn(ExperimentalMaterialApi::class) private val methods = listOf( SleepMethodRoot(context), SleepMethodPieAccessibility(context), @@ -74,7 +72,6 @@ class SleepMethodRoot(context: Context) : SleepGestureHandler.SleepMethod(contex } } -@ExperimentalMaterialApi class SleepMethodPieAccessibility(context: Context) : SleepGestureHandler.SleepMethod(context) { override suspend fun isSupported() = Utilities.ATLEAST_P @@ -98,7 +95,6 @@ class SleepMethodPieAccessibility(context: Context) : SleepGestureHandler.SleepM } } -@ExperimentalMaterialApi class SleepMethodDeviceAdmin(context: Context) : SleepGestureHandler.SleepMethod(context) { override suspend fun isSupported() = true @@ -132,7 +128,6 @@ class SleepMethodDeviceAdmin(context: Context) : SleepGestureHandler.SleepMethod } } -@ExperimentalMaterialApi @Composable fun ServiceWarningDialog( title: Int, diff --git a/lawnchair/src/app/lawnchair/override/CustomizeDialog.kt b/lawnchair/src/app/lawnchair/override/CustomizeDialog.kt index 197b1c7d9e..fcafdef146 100644 --- a/lawnchair/src/app/lawnchair/override/CustomizeDialog.kt +++ b/lawnchair/src/app/lawnchair/override/CustomizeDialog.kt @@ -4,14 +4,15 @@ import android.app.Activity import android.graphics.drawable.Drawable import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts -import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.foundation.Image import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* -import androidx.compose.material.* +import androidx.compose.material.MaterialTheme +import androidx.compose.material.OutlinedTextField +import androidx.compose.material.Text +import androidx.compose.material.TextFieldDefaults import androidx.compose.runtime.* import androidx.compose.ui.Alignment -import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.platform.LocalContext @@ -34,7 +35,6 @@ import com.android.launcher3.util.ComponentKey import com.google.accompanist.drawablepainter.rememberDrawablePainter import kotlinx.coroutines.launch -@ExperimentalMaterialApi @Composable fun CustomizeDialog( icon: Drawable, @@ -93,8 +93,6 @@ fun CustomizeDialog( } } -@OptIn(ExperimentalComposeUiApi::class, ExperimentalAnimationApi::class) -@ExperimentalMaterialApi @Composable fun CustomizeAppDialog( icon: Drawable, diff --git a/lawnchair/src/app/lawnchair/ui/popup/LawnchairShortcut.kt b/lawnchair/src/app/lawnchair/ui/popup/LawnchairShortcut.kt index 83e4f7f74e..3a995e3063 100644 --- a/lawnchair/src/app/lawnchair/ui/popup/LawnchairShortcut.kt +++ b/lawnchair/src/app/lawnchair/ui/popup/LawnchairShortcut.kt @@ -3,7 +3,6 @@ package app.lawnchair.ui.popup import android.content.pm.LauncherActivityInfo import android.view.View import androidx.compose.foundation.layout.PaddingValues -import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.ui.unit.dp import app.lawnchair.LawnchairLauncher import app.lawnchair.override.CustomizeAppDialog @@ -30,7 +29,6 @@ class LawnchairShortcut { itemInfo: ItemInfo ) : SystemShortcut(R.drawable.ic_edit, R.string.customize_button_text, launcher, itemInfo) { - @OptIn(ExperimentalMaterialApi::class) override fun onClick(v: View) { val outObj = Array(1) { null } val key = ComponentKey(mItemInfo.targetComponent, mItemInfo.user) diff --git a/lawnchair/src/app/lawnchair/ui/preferences/AppDrawerPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/AppDrawerPreferences.kt index 3820d3b082..44344cdf53 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/AppDrawerPreferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/AppDrawerPreferences.kt @@ -33,14 +33,12 @@ object AppDrawerRoutes { const val HIDDEN_APPS = "hiddenApps" } -@ExperimentalAnimationApi fun NavGraphBuilder.appDrawerGraph(route: String) { preferenceGraph(route, { AppDrawerPreferences() }) { subRoute -> hiddenAppsGraph(route = subRoute(AppDrawerRoutes.HIDDEN_APPS)) } } -@ExperimentalAnimationApi @Composable fun AppDrawerPreferences() { val prefs = preferenceManager() diff --git a/lawnchair/src/app/lawnchair/ui/preferences/DebugMenuPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/DebugMenuPreferences.kt index 3604d8c718..72b92781c8 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/DebugMenuPreferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/DebugMenuPreferences.kt @@ -1,8 +1,6 @@ package app.lawnchair.ui.preferences import android.content.Intent -import androidx.compose.animation.ExperimentalAnimationApi -import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.platform.LocalContext @@ -17,8 +15,6 @@ import com.android.launcher3.settings.DeveloperOptionsFragment import com.android.launcher3.settings.SettingsActivity import com.patrykmichalik.preferencemanager.Preference -@ExperimentalMaterialApi -@ExperimentalAnimationApi fun NavGraphBuilder.debugMenuGraph(route: String) { preferenceGraph(route, { DebugMenuPreferences() }) } @@ -26,8 +22,6 @@ fun NavGraphBuilder.debugMenuGraph(route: String) { /** * A screen to house unfinished preferences and debug flags */ -@ExperimentalMaterialApi -@ExperimentalAnimationApi @Composable fun DebugMenuPreferences() { val prefs = preferenceManager() diff --git a/lawnchair/src/app/lawnchair/ui/preferences/DockPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/DockPreferences.kt index 703cc2fca3..db73aaccc2 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/DockPreferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/DockPreferences.kt @@ -26,12 +26,10 @@ import app.lawnchair.preferences2.preferenceManager2 import app.lawnchair.ui.preferences.components.* import com.android.launcher3.R -@ExperimentalAnimationApi fun NavGraphBuilder.dockGraph(route: String) { preferenceGraph(route, { DockPreferences() }) } -@ExperimentalAnimationApi @Composable fun DockPreferences() { val prefs = preferenceManager() diff --git a/lawnchair/src/app/lawnchair/ui/preferences/ExperimentalFeaturesPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/ExperimentalFeaturesPreferences.kt index 494fff3c83..ee06cf4ac6 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/ExperimentalFeaturesPreferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/ExperimentalFeaturesPreferences.kt @@ -1,6 +1,5 @@ package app.lawnchair.ui.preferences -import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import androidx.navigation.NavGraphBuilder @@ -11,13 +10,11 @@ import app.lawnchair.ui.preferences.components.PreferenceLayout import app.lawnchair.ui.preferences.components.SwitchPreference import com.android.launcher3.R -@ExperimentalAnimationApi fun NavGraphBuilder.experimentalFeaturesGraph(route: String) { preferenceGraph(route, { ExperimentalFeaturesPreferences() }) } @Composable -@OptIn(ExperimentalAnimationApi::class) fun ExperimentalFeaturesPreferences() { val prefs = preferenceManager2() PreferenceLayout(label = stringResource(id = R.string.experimental_features_label)) { diff --git a/lawnchair/src/app/lawnchair/ui/preferences/FolderPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/FolderPreferences.kt index 29842c90cc..b9db017776 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/FolderPreferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/FolderPreferences.kt @@ -16,7 +16,6 @@ package app.lawnchair.ui.preferences -import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import androidx.navigation.NavGraphBuilder @@ -28,12 +27,10 @@ import app.lawnchair.ui.preferences.components.PreferenceLayout import app.lawnchair.ui.preferences.components.SliderPreference import com.android.launcher3.R -@ExperimentalAnimationApi fun NavGraphBuilder.folderGraph(route: String) { preferenceGraph(route, { FolderPreferences() }) } -@ExperimentalAnimationApi @Composable fun FolderPreferences() { PreferenceLayout(label = stringResource(id = R.string.folders_label)) { diff --git a/lawnchair/src/app/lawnchair/ui/preferences/FontSelectionPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/FontSelectionPreference.kt index 465b7c8675..1780baf9f7 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/FontSelectionPreference.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/FontSelectionPreference.kt @@ -32,7 +32,7 @@ import app.lawnchair.ui.preferences.components.* import com.android.launcher3.R import com.google.accompanist.navigation.animation.composable -@ExperimentalAnimationApi +@OptIn(ExperimentalAnimationApi::class) fun NavGraphBuilder.fontSelectionGraph(route: String) { preferenceGraph(route, {}) { subRoute -> composable( @@ -50,7 +50,6 @@ fun NavGraphBuilder.fontSelectionGraph(route: String) { } } -@ExperimentalAnimationApi @Composable fun FontSelection(fontPref: BasePreferenceManager.FontPref) { val context = LocalContext.current diff --git a/lawnchair/src/app/lawnchair/ui/preferences/GeneralPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/GeneralPreferences.kt index 9d27243d74..45ed59958f 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/GeneralPreferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/GeneralPreferences.kt @@ -34,16 +34,12 @@ object GeneralRoutes { const val ICON_PACK = "iconPack" } -@ExperimentalMaterialApi -@ExperimentalAnimationApi fun NavGraphBuilder.generalGraph(route: String) { preferenceGraph(route, { GeneralPreferences() }) { subRoute -> iconPackGraph(route = subRoute(GeneralRoutes.ICON_PACK)) } } -@ExperimentalMaterialApi -@ExperimentalAnimationApi @Composable fun GeneralPreferences() { val prefs = preferenceManager() diff --git a/lawnchair/src/app/lawnchair/ui/preferences/HiddenAppsPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/HiddenAppsPreferences.kt index 2e4b02533f..94696e2f13 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/HiddenAppsPreferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/HiddenAppsPreferences.kt @@ -17,7 +17,6 @@ package app.lawnchair.ui.preferences import androidx.compose.animation.Crossfade -import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.rememberLazyListState @@ -38,12 +37,10 @@ import app.lawnchair.util.appsList import com.android.launcher3.R import java.util.Comparator.comparing -@ExperimentalAnimationApi fun NavGraphBuilder.hiddenAppsGraph(route: String) { preferenceGraph(route, { HiddenAppsPreferences() }) } -@ExperimentalAnimationApi @Composable fun HiddenAppsPreferences() { val adapter = preferenceManager2().hiddenApps.getAdapter() diff --git a/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenGridPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenGridPreferences.kt index 1a6d6b1c72..9410531b91 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenGridPreferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenGridPreferences.kt @@ -1,7 +1,6 @@ package app.lawnchair.ui.preferences import android.content.res.Configuration -import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -31,12 +30,10 @@ import app.lawnchair.ui.preferences.components.SliderPreference import com.android.launcher3.LauncherAppState import com.android.launcher3.R -@ExperimentalAnimationApi fun NavGraphBuilder.homeScreenGridGraph(route: String) { preferenceGraph(route, { HomeScreenGridPreferences() }) } -@ExperimentalAnimationApi @Composable fun HomeScreenGridPreferences() { val isPortrait = LocalConfiguration.current.orientation == Configuration.ORIENTATION_PORTRAIT diff --git a/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt index 94b0442492..324fddf6b9 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt @@ -36,14 +36,12 @@ object HomeScreenRoutes { const val GRID = "grid" } -@ExperimentalAnimationApi fun NavGraphBuilder.homeScreenGraph(route: String) { preferenceGraph(route, { HomeScreenPreferences() }) { subRoute -> homeScreenGridGraph(route = subRoute(HomeScreenRoutes.GRID)) } } -@ExperimentalAnimationApi @Composable fun HomeScreenPreferences() { val prefs = preferenceManager() diff --git a/lawnchair/src/app/lawnchair/ui/preferences/IconPackPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/IconPackPreferences.kt index 0a763eddf4..da1ee53418 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/IconPackPreferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/IconPackPreferences.kt @@ -18,7 +18,6 @@ package app.lawnchair.ui.preferences import android.content.res.Configuration import android.graphics.drawable.Drawable -import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.foundation.Image import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.rememberLazyListState @@ -54,16 +53,14 @@ data class IconPackInfo( val icon: Drawable ) -@ExperimentalAnimationApi fun NavGraphBuilder.iconPackGraph(route: String) { preferenceGraph(route, { IconPackPreferences() }) } -@ExperimentalAnimationApi @Composable fun IconPackPreferences() { val prefs = preferenceManager() - var iconPackAdapter = prefs.iconPackPackage.getAdapter() + val iconPackAdapter = prefs.iconPackPackage.getAdapter() val themedIconsAdapter = prefs.themedIcons.getAdapter() PreferenceLayout( diff --git a/lawnchair/src/app/lawnchair/ui/preferences/IconPickerPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/IconPickerPreference.kt index 69b7dc6de7..51fc9e6d20 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/IconPickerPreference.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/IconPickerPreference.kt @@ -20,7 +20,6 @@ import androidx.compose.material3.Text import androidx.compose.runtime.* import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip -import androidx.compose.ui.layout.onSizeChanged import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.LocalLayoutDirection @@ -44,7 +43,7 @@ import kotlinx.coroutines.flow.catch import kotlinx.coroutines.launch import androidx.compose.material.MaterialTheme as Material2Theme -@ExperimentalAnimationApi +@OptIn(ExperimentalAnimationApi::class) fun NavGraphBuilder.iconPickerGraph(route: String) { preferenceGraph(route, { IconPickerPreference(packageName = "") @@ -62,7 +61,6 @@ fun NavGraphBuilder.iconPickerGraph(route: String) { } } -@ExperimentalAnimationApi @Composable fun IconPickerPreference(packageName: String) { val context = LocalContext.current diff --git a/lawnchair/src/app/lawnchair/ui/preferences/PreferenceActivity.kt b/lawnchair/src/app/lawnchair/ui/preferences/PreferenceActivity.kt index 8b655fada5..85123a96b6 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/PreferenceActivity.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/PreferenceActivity.kt @@ -21,15 +21,11 @@ import android.content.Intent import android.os.Bundle import androidx.activity.compose.setContent import androidx.appcompat.app.AppCompatActivity -import androidx.compose.animation.ExperimentalAnimationApi -import androidx.compose.material.ExperimentalMaterialApi import androidx.core.net.toUri import androidx.core.view.WindowCompat import app.lawnchair.ui.theme.LawnchairTheme import com.google.accompanist.insets.ProvideWindowInsets -@ExperimentalMaterialApi -@ExperimentalAnimationApi class PreferenceActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/lawnchair/src/app/lawnchair/ui/preferences/Preferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/Preferences.kt index 330e77f598..889e6f759f 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/Preferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/Preferences.kt @@ -17,7 +17,6 @@ package app.lawnchair.ui.preferences import androidx.compose.animation.ExperimentalAnimationApi -import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material3.Surface import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider @@ -59,8 +58,7 @@ val LocalPreferenceInteractor = staticCompositionLocalOf { error("CompositionLocal LocalPreferenceInteractor not present") } -@ExperimentalMaterialApi -@ExperimentalAnimationApi +@OptIn(ExperimentalAnimationApi::class) @Composable fun Preferences(interactor: PreferenceInteractor = viewModel()) { val navController = rememberAnimatedNavController() @@ -103,7 +101,6 @@ fun Preferences(interactor: PreferenceInteractor = viewModel Unit diff --git a/lawnchair/src/app/lawnchair/ui/preferences/PreferencesDashboard.kt b/lawnchair/src/app/lawnchair/ui/preferences/PreferencesDashboard.kt index ca3fc7fa2e..6de27efae1 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/PreferencesDashboard.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/PreferencesDashboard.kt @@ -4,7 +4,6 @@ import android.content.ComponentName import android.content.Context import android.content.pm.LauncherApps import android.os.Process -import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.material.DropdownMenuItem import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.Build @@ -27,7 +26,6 @@ import app.lawnchair.util.restartLauncher import com.android.launcher3.BuildConfig import com.android.launcher3.R -@ExperimentalAnimationApi @Composable fun PreferencesDashboard() { PreferenceLayout( diff --git a/lawnchair/src/app/lawnchair/ui/preferences/QuickstepPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/QuickstepPreferences.kt index d343387404..f1d88ce967 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/QuickstepPreferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/QuickstepPreferences.kt @@ -21,12 +21,10 @@ import com.android.launcher3.LauncherAppState import com.android.launcher3.R import com.android.launcher3.Utilities -@ExperimentalAnimationApi fun NavGraphBuilder.quickstepGraph(route: String) { preferenceGraph(route, { QuickstepPreferences() }) } -@ExperimentalAnimationApi @Composable fun QuickstepPreferences() { val prefs = preferenceManager() diff --git a/lawnchair/src/app/lawnchair/ui/preferences/SelectIconPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/SelectIconPreference.kt index e389112bb8..be12bd33c0 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/SelectIconPreference.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/SelectIconPreference.kt @@ -24,7 +24,7 @@ import com.android.launcher3.util.ComponentKey import com.google.accompanist.navigation.animation.composable import kotlinx.coroutines.launch -@ExperimentalAnimationApi +@OptIn(ExperimentalAnimationApi::class) fun NavGraphBuilder.selectIconGraph(route: String) { preferenceGraph(route, { }) { subRoute -> composable( @@ -43,7 +43,6 @@ fun NavGraphBuilder.selectIconGraph(route: String) { } } -@ExperimentalAnimationApi @Composable fun SelectIconPreference(componentKey: ComponentKey) { val context = LocalContext.current diff --git a/lawnchair/src/app/lawnchair/ui/preferences/about/About.kt b/lawnchair/src/app/lawnchair/ui/preferences/about/About.kt index bf4c26f107..58b944bde0 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/about/About.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/about/About.kt @@ -20,7 +20,6 @@ import android.content.Intent import android.net.Uri import androidx.annotation.DrawableRes import androidx.annotation.StringRes -import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.foundation.Image import androidx.compose.foundation.layout.* import androidx.compose.foundation.shape.CircleShape @@ -177,14 +176,12 @@ object AboutRoutes { const val LICENSES = "licenses" } -@ExperimentalAnimationApi fun NavGraphBuilder.aboutGraph(route: String) { preferenceGraph(route, { About() }) { subRoute -> licensesGraph(route = subRoute(AboutRoutes.LICENSES)) } } -@ExperimentalAnimationApi @Composable fun About() { val context = LocalContext.current diff --git a/lawnchair/src/app/lawnchair/ui/preferences/about/ContributorRow.kt b/lawnchair/src/app/lawnchair/ui/preferences/about/ContributorRow.kt index dbc0c58e37..fc2c7c3a0d 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/about/ContributorRow.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/about/ContributorRow.kt @@ -32,10 +32,8 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp import app.lawnchair.theme.surfaceColorAtElevation import app.lawnchair.ui.preferences.components.PreferenceTemplate -import coil.annotation.ExperimentalCoilApi import coil.compose.rememberImagePainter -@OptIn(ExperimentalCoilApi::class) @Composable fun ContributorRow(name: String, description: String, photoUrl: String, url: String, showDivider: Boolean = false) { val context = LocalContext.current diff --git a/lawnchair/src/app/lawnchair/ui/preferences/about/acknowledgements/Acknowledgements.kt b/lawnchair/src/app/lawnchair/ui/preferences/about/acknowledgements/Acknowledgements.kt index 6812fcaaab..6274a0e9b0 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/about/acknowledgements/Acknowledgements.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/about/acknowledgements/Acknowledgements.kt @@ -48,7 +48,7 @@ import com.google.accompanist.placeholder.PlaceholderHighlight import com.google.accompanist.placeholder.material.fade import com.google.accompanist.placeholder.material.placeholder -@ExperimentalAnimationApi +@OptIn(ExperimentalAnimationApi::class) fun NavGraphBuilder.licensesGraph(route: String) { preferenceGraph(route, { Acknowledgements() }) { subRoute -> composable( @@ -60,7 +60,6 @@ fun NavGraphBuilder.licensesGraph(route: String) { } } -@ExperimentalAnimationApi @Composable fun Acknowledgements() { val ossLibraries by LocalPreferenceInteractor.current.ossLibraries.collectAsState() @@ -94,7 +93,6 @@ fun OssLibraryItem(ossLibrary: OssLibrary, index: Int) { ) } -@ExperimentalAnimationApi @Composable fun NoticePage(index: Int) { val ossLibraries by LocalPreferenceInteractor.current.ossLibraries.collectAsState() diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/IconShapePreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/IconShapePreference.kt index 7c31db7bbb..180fbb0f75 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/components/IconShapePreference.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/IconShapePreference.kt @@ -16,7 +16,6 @@ package app.lawnchair.ui.preferences.components -import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.platform.LocalContext @@ -27,7 +26,6 @@ import app.lawnchair.preferences.getAdapter import app.lawnchair.preferences2.preferenceManager2 import com.android.launcher3.R -@ExperimentalMaterialApi @Composable fun IconShapePreference( ) { diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/ListPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/ListPreference.kt index 85df6d7f49..c4e10f972e 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/components/ListPreference.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/ListPreference.kt @@ -19,7 +19,6 @@ package app.lawnchair.ui.preferences.components import androidx.compose.foundation.clickable import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.itemsIndexed -import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material.RadioButton import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Text @@ -31,7 +30,6 @@ import app.lawnchair.preferences.PreferenceAdapter import app.lawnchair.ui.AlertBottomSheetContent import app.lawnchair.ui.util.bottomSheetHandler -@ExperimentalMaterialApi @Composable fun ListPreference( adapter: PreferenceAdapter, diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/NotificationDotsPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/NotificationDotsPreference.kt index a0cc547ba8..a9ebce18ce 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/components/NotificationDotsPreference.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/NotificationDotsPreference.kt @@ -26,7 +26,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.requiredWidth import androidx.compose.foundation.layout.size import androidx.compose.material.ContentAlpha -import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material3.* import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect @@ -49,7 +48,6 @@ import com.android.launcher3.util.SettingsCache import com.android.launcher3.util.SettingsCache.NOTIFICATION_BADGING_URI @Composable -@ExperimentalMaterialApi fun NotificationDotsPreference() { val bottomSheetHandler = bottomSheetHandler val context = LocalContext.current @@ -96,7 +94,6 @@ fun NotificationDotsPreference() { } @Composable -@ExperimentalMaterialApi fun NotificationAccessConfirmation(onDismissRequest: () -> Unit) { val context = LocalContext.current diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceGroup.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceGroup.kt index 9c33beb143..afad7518ac 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceGroup.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceGroup.kt @@ -30,7 +30,6 @@ import androidx.compose.ui.unit.dp import androidx.compose.material3.MaterialTheme as Material3Theme @Composable -@ExperimentalAnimationApi fun PreferenceGroup( heading: String? = null, isFirstChild: Boolean = false, diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceLayout.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceLayout.kt index 62bdb4dc81..7598787a0e 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceLayout.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceLayout.kt @@ -16,7 +16,6 @@ package app.lawnchair.ui.preferences.components -import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.foundation.ScrollState import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.ColumnScope @@ -33,7 +32,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @Composable -@ExperimentalAnimationApi fun PreferenceLayout( verticalArrangement: Arrangement.Vertical = Arrangement.Top, horizontalAlignment: Alignment.Horizontal = Alignment.Start, @@ -59,7 +57,6 @@ fun PreferenceLayout( } @Composable -@ExperimentalAnimationApi fun PreferenceLayoutLazyColumn( modifier: Modifier = Modifier, enabled: Boolean = true, diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceScaffold.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceScaffold.kt index 3eee9e1888..194f9b0d7a 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceScaffold.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceScaffold.kt @@ -1,6 +1,5 @@ package app.lawnchair.ui.preferences.components -import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.RowScope import androidx.compose.runtime.Composable @@ -13,7 +12,6 @@ import com.google.accompanist.insets.LocalWindowInsets import com.google.accompanist.insets.rememberInsetsPaddingValues import com.google.accompanist.insets.ui.Scaffold -@ExperimentalAnimationApi @Composable fun PreferenceScaffold( backArrowVisible: Boolean = true, diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceSearchScaffold.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceSearchScaffold.kt index d6594dc554..28e542952e 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceSearchScaffold.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceSearchScaffold.kt @@ -1,7 +1,6 @@ package app.lawnchair.ui.preferences.components import androidx.activity.compose.LocalOnBackPressedDispatcherOwner -import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.foundation.layout.* import androidx.compose.material.ContentAlpha import androidx.compose.material.LocalContentAlpha @@ -22,7 +21,6 @@ import com.google.accompanist.insets.statusBarsPadding import com.google.accompanist.insets.ui.LocalScaffoldPadding import com.google.accompanist.insets.ui.Scaffold -@ExperimentalAnimationApi @Composable fun PreferenceSearchScaffold( searchInput: @Composable () -> Unit, diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/QsbProviderPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/QsbProviderPreference.kt index 582ad4e86b..39758d7007 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/components/QsbProviderPreference.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/QsbProviderPreference.kt @@ -1,20 +1,16 @@ package app.lawnchair.ui.preferences.components -import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import app.lawnchair.preferences.getAdapter -import app.lawnchair.preferences2.PreferenceCollectorScope -import app.lawnchair.preferences2.PreferenceManager2 import app.lawnchair.preferences2.preferenceManager2 import app.lawnchair.qsb.QsbLayout import app.lawnchair.qsb.providers.GoogleGo import app.lawnchair.qsb.providers.QsbSearchProvider import com.android.launcher3.R -@OptIn(ExperimentalMaterialApi::class) @Composable fun QsbProviderPreference() { val adapter = preferenceManager2().hotseatQsbProvider.getAdapter() diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/ThemePreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/ThemePreference.kt index adc173a299..e7e5108c40 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/components/ThemePreference.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/ThemePreference.kt @@ -1,6 +1,5 @@ package app.lawnchair.ui.preferences.components -import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import app.lawnchair.preferences.getAdapter @@ -28,7 +27,6 @@ val themeEntries = listOf( } } -@ExperimentalMaterialApi @Composable fun ThemePreference(showDivider: Boolean = false) { ListPreference( diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/TopBar.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/TopBar.kt index f0212e1260..a86779cb0e 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/components/TopBar.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/TopBar.kt @@ -17,7 +17,6 @@ package app.lawnchair.ui.preferences.components import androidx.activity.compose.LocalOnBackPressedDispatcherOwner -import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.foundation.layout.* import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.ArrowBack @@ -35,7 +34,6 @@ import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp import com.google.accompanist.insets.statusBarsPadding -@ExperimentalAnimationApi @Composable fun TopBar( backArrowVisible: Boolean, diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/colorpreference/ColorPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/colorpreference/ColorPreference.kt index 832aa0122a..bae2091878 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/components/colorpreference/ColorPreference.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/colorpreference/ColorPreference.kt @@ -16,10 +16,8 @@ package app.lawnchair.ui.preferences.components.colorpreference -import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* -import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material.RadioButton import androidx.compose.material3.Button import androidx.compose.material3.MaterialTheme @@ -42,8 +40,8 @@ import com.google.accompanist.pager.HorizontalPager import com.google.accompanist.pager.rememberPagerState import kotlinx.coroutines.launch +@OptIn(ExperimentalPagerApi::class) @Composable -@OptIn(ExperimentalAnimationApi::class, ExperimentalMaterialApi::class, ExperimentalPagerApi::class) fun ColorPreference( adapter: PreferenceAdapter, label: String, diff --git a/lawnchair/src/app/lawnchair/ui/preferences/preferenceGraph.kt b/lawnchair/src/app/lawnchair/ui/preferences/preferenceGraph.kt index def7567db4..690860717f 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/preferenceGraph.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/preferenceGraph.kt @@ -7,7 +7,7 @@ import androidx.compose.runtime.compositionLocalOf import androidx.navigation.NavGraphBuilder import com.google.accompanist.navigation.animation.composable -@ExperimentalAnimationApi +@OptIn(ExperimentalAnimationApi::class) inline fun NavGraphBuilder.preferenceGraph( route: String, crossinline root: @Composable () -> Unit, diff --git a/lawnchair/src/app/lawnchair/ui/util/ProvideBottomSheetHandler.kt b/lawnchair/src/app/lawnchair/ui/util/ProvideBottomSheetHandler.kt index e1fd28bdb5..e09b23eff9 100644 --- a/lawnchair/src/app/lawnchair/ui/util/ProvideBottomSheetHandler.kt +++ b/lawnchair/src/app/lawnchair/ui/util/ProvideBottomSheetHandler.kt @@ -43,7 +43,7 @@ val bottomSheetHandler: BottomSheetHandler @ReadOnlyComposable get() = LocalBottomSheetHandler.current -@ExperimentalMaterialApi +@OptIn(ExperimentalMaterialApi::class) @Composable fun ProvideBottomSheetHandler( content: @Composable () -> Unit