From 042c0e20409cb8cf4512dbbb9af34f548e0c730e Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Sun, 21 Aug 2022 18:35:27 +0200 Subject: [PATCH] Handle experimental API opt-ins at module level --- ui/build.gradle.kts | 11 +++++++++++ .../java/de/mm20/launcher2/ui/animation/TextUnit.kt | 1 - .../de/mm20/launcher2/ui/common/RestoreBackupSheet.kt | 1 - .../ui/common/WeatherLocationSearchDialog.kt | 1 - .../java/de/mm20/launcher2/ui/component/Banner.kt | 1 - .../mm20/launcher2/ui/component/BottomSheetDialog.kt | 3 --- .../main/java/de/mm20/launcher2/ui/component/Chip.kt | 1 - .../mm20/launcher2/ui/component/ShapedLauncherIcon.kt | 1 - .../de/mm20/launcher2/ui/component/SmallMessage.kt | 1 - .../ui/component/preferences/ColorPreference.kt | 1 - .../ui/component/preferences/ListPreference.kt | 1 - .../ui/component/preferences/PreferenceScreen.kt | 1 - .../ui/component/preferences/TextPreference.kt | 1 - .../ui/component/weather/AnimatedWeatherIcon.kt | 1 - .../de/mm20/launcher2/ui/launcher/PagerScaffold.kt | 4 ---- .../de/mm20/launcher2/ui/launcher/PullDownScaffold.kt | 1 - .../de/mm20/launcher2/ui/launcher/search/SearchBar.kt | 1 - .../mm20/launcher2/ui/launcher/search/apps/AppItem.kt | 1 - .../ui/launcher/search/calendar/CalendarItem.kt | 1 - .../common/customattrs/CustomizeSearchableSheet.kt | 1 - .../ui/launcher/search/common/grid/GridItem.kt | 1 - .../ui/launcher/search/common/list/ListItem.kt | 1 - .../ui/launcher/search/contacts/ContactItem.kt | 1 - .../launcher2/ui/launcher/search/files/FileItem.kt | 1 - .../ui/launcher/search/hidden/HiddenResults.kt | 1 - .../ui/launcher/search/shortcut/ShortcutItem.kt | 1 - .../ui/launcher/search/website/WebsiteItem.kt | 1 - .../ui/launcher/search/wikipedia/WikipediaItem.kt | 1 - .../launcher2/ui/launcher/widgets/WidgetColumn.kt | 1 - .../ui/launcher/widgets/calendar/CalendarWidget.kt | 1 - .../widgets/clock/parts/BatteryPartProvider.kt | 1 - .../launcher/widgets/clock/parts/MusicPartProvider.kt | 4 ---- .../ui/launcher/widgets/music/MusicWidget.kt | 4 ---- .../launcher/widgets/picker/PickAppWidgetActivity.kt | 1 - .../de/mm20/launcher2/ui/settings/SettingsActivity.kt | 1 - .../settings/appearance/AppearanceSettingsScreen.kt | 2 -- .../launcher2/ui/settings/backup/CreateBackupSheet.kt | 1 - .../calendarwidget/CalendarWidgetSettingsScreen.kt | 1 - .../settings/clockwidget/ClockWidgetSettingsScreen.kt | 1 - .../ui/settings/crashreporter/CrashReporterScreen.kt | 1 - .../ui/settings/easteregg/EasterEggSettingsScreen.kt | 1 - .../settings/hiddenitems/HiddenItemsSettingsScreen.kt | 1 - .../launcher2/ui/settings/license/LicenseScreen.kt | 1 - .../ui/settings/websearch/WebSearchSettingsScreen.kt | 2 -- .../ui/theme/typography/fontfamily/DeviceDefault.kt | 1 - 45 files changed, 11 insertions(+), 57 deletions(-) diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts index 04f85233..97143454 100644 --- a/ui/build.gradle.kts +++ b/ui/build.gradle.kts @@ -30,6 +30,17 @@ android { kotlinOptions { jvmTarget = "1.8" + freeCompilerArgs = listOf( + "-opt-in=androidx.compose.ui.ExperimentalComposeUiApi", + "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi", + "-opt-in=androidx.compose.ui.text.ExperimentalTextApi", + "-opt-in=androidx.compose.ui.unit.ExperimentalUnitApi", + "-opt-in=androidx.compose.material.ExperimentalMaterialApi", + "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api", + "-opt-in=androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi", + "-opt-in=androidx.compose.animation.ExperimentalAnimationApi", + "-opt-in=com.google.accompanist.pager.ExperimentalPagerApi", + ) } buildFeatures { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/animation/TextUnit.kt b/ui/src/main/java/de/mm20/launcher2/ui/animation/TextUnit.kt index 275c07dd..29673482 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/animation/TextUnit.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/animation/TextUnit.kt @@ -8,7 +8,6 @@ import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.TextUnitType object TextUnitConverter : TwoWayConverter { - @OptIn(ExperimentalUnitApi::class) override val convertFromVector: (AnimationVector2D) -> TextUnit get() = { TextUnit( diff --git a/ui/src/main/java/de/mm20/launcher2/ui/common/RestoreBackupSheet.kt b/ui/src/main/java/de/mm20/launcher2/ui/common/RestoreBackupSheet.kt index 6955c103..6080169e 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/common/RestoreBackupSheet.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/common/RestoreBackupSheet.kt @@ -27,7 +27,6 @@ import de.mm20.launcher2.ui.component.BottomSheetDialog import de.mm20.launcher2.ui.component.LargeMessage import de.mm20.launcher2.ui.component.SmallMessage -@OptIn(ExperimentalMaterial3Api::class) @Composable fun RestoreBackupSheet( uri: Uri, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialog.kt b/ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialog.kt index 1ec6b396..54186518 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialog.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialog.kt @@ -23,7 +23,6 @@ import de.mm20.launcher2.ui.component.BottomSheetDialog import de.mm20.launcher2.ui.component.SmallMessage import kotlinx.coroutines.launch -@OptIn(ExperimentalMaterial3Api::class) @Composable fun WeatherLocationSearchDialog( onDismissRequest: () -> Unit diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/Banner.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/Banner.kt index 4bebae26..85f61bd0 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/Banner.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/Banner.kt @@ -10,7 +10,6 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp -@OptIn(ExperimentalMaterial3Api::class) @Composable fun Banner( modifier: Modifier = Modifier, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt index 61397c3b..2684e1f3 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt @@ -29,9 +29,6 @@ import de.mm20.launcher2.ui.ktx.toDp import de.mm20.launcher2.ui.ktx.toPixels import kotlin.math.roundToInt -@OptIn(ExperimentalComposeUiApi::class, ExperimentalMaterialApi::class, - ExperimentalMaterial3Api::class -) @Composable fun BottomSheetDialog( onDismissRequest: () -> Unit, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/Chip.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/Chip.kt index b5398c3e..8bc3e4e7 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/Chip.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/Chip.kt @@ -16,7 +16,6 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -@OptIn(ExperimentalMaterial3Api::class) @Composable fun Chip( modifier: Modifier = Modifier, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/ShapedLauncherIcon.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/ShapedLauncherIcon.kt index f2742e20..16fefb4b 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/ShapedLauncherIcon.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/ShapedLauncherIcon.kt @@ -50,7 +50,6 @@ import kotlin.math.abs import kotlin.math.pow import kotlin.math.roundToInt -@OptIn(ExperimentalFoundationApi::class) @Composable fun ShapedLauncherIcon( modifier: Modifier = Modifier, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/SmallMessage.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/SmallMessage.kt index 2466e8c5..483c8e38 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/SmallMessage.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/SmallMessage.kt @@ -11,7 +11,6 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.unit.dp -@OptIn(ExperimentalMaterial3Api::class) @Composable fun SmallMessage( modifier: Modifier = Modifier, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ColorPreference.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ColorPreference.kt index e33fa2b8..d20db0de 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ColorPreference.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ColorPreference.kt @@ -11,7 +11,6 @@ import androidx.compose.ui.unit.dp import com.godaddy.android.colorpicker.ClassicColorPicker import de.mm20.launcher2.ui.ktx.toHexString -@OptIn(ExperimentalMaterial3Api::class) @Composable fun ColorPreference( title: String, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ListPreference.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ListPreference.kt index a3edfcae..8558af7d 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ListPreference.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ListPreference.kt @@ -13,7 +13,6 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog -@OptIn(ExperimentalMaterial3Api::class) @Composable fun ListPreference( title: String, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/PreferenceScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/PreferenceScreen.kt index a2249d4b..c338c58e 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/PreferenceScreen.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/PreferenceScreen.kt @@ -19,7 +19,6 @@ import com.google.accompanist.systemuicontroller.rememberSystemUiController import de.mm20.launcher2.ui.locals.LocalNavController -@OptIn(ExperimentalMaterial3Api::class) @Composable fun PreferenceScreen( title: String, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/TextPreference.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/TextPreference.kt index 4dd2db06..91e88d2c 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/TextPreference.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/TextPreference.kt @@ -4,7 +4,6 @@ import androidx.compose.material3.* import androidx.compose.runtime.* import androidx.compose.ui.res.stringResource -@OptIn(ExperimentalMaterial3Api::class) @Composable fun TextPreference( title: String, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/weather/AnimatedWeatherIcon.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/weather/AnimatedWeatherIcon.kt index 4bc6c113..2613128f 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/weather/AnimatedWeatherIcon.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/weather/AnimatedWeatherIcon.kt @@ -60,7 +60,6 @@ fun AnimatedWeatherIcon( } } -@OptIn(ExperimentalAnimationGraphicsApi::class) @Composable private fun SunMoon(icon: WeatherIcon, night: Boolean) { val sunMoonIcon = AnimatedImageVector.animatedVectorResource(R.drawable.anim_weather_sun_moon) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt index b948b26d..6d125a6b 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt @@ -47,10 +47,6 @@ import de.mm20.launcher2.ui.launcher.widgets.WidgetColumn import de.mm20.launcher2.ui.utils.rememberNotificationShadeController import kotlin.math.roundToInt -@OptIn( - ExperimentalMaterialApi::class, ExperimentalFoundationApi::class, - ExperimentalMaterial3Api::class -) @Composable fun PagerScaffold( modifier: Modifier = Modifier, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt index 31a58aba..0fdba6c2 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt @@ -45,7 +45,6 @@ import de.mm20.launcher2.ui.modifier.verticalFadingEdges import kotlinx.coroutines.launch import kotlin.math.roundToInt -@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class) @Composable fun PullDownScaffold( modifier: Modifier = Modifier, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchBar.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchBar.kt index d7c5128f..94762ae9 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchBar.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchBar.kt @@ -148,7 +148,6 @@ fun SearchBar( ) } -@OptIn(ExperimentalAnimationGraphicsApi::class) @Composable fun SearchBar( modifier: Modifier = Modifier, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItem.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItem.kt index 1542f5a5..4037f9e6 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItem.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItem.kt @@ -320,7 +320,6 @@ fun AppItem( } } -@OptIn(ExperimentalAnimationApi::class) @Composable fun AppItemGridPopup( app: Application, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarItem.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarItem.kt index d59f295c..c99e1034 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarItem.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarItem.kt @@ -261,7 +261,6 @@ fun CalendarItem( } } -@OptIn(ExperimentalAnimationApi::class) @Composable fun CalendarItemGridPopup( calendar: CalendarEvent, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/customattrs/CustomizeSearchableSheet.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/customattrs/CustomizeSearchableSheet.kt index 64e1fe26..f362e6e1 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/customattrs/CustomizeSearchableSheet.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/customattrs/CustomizeSearchableSheet.kt @@ -35,7 +35,6 @@ import de.mm20.launcher2.ui.ktx.toPixels import de.mm20.launcher2.ui.locals.LocalGridColumns import kotlinx.coroutines.launch -@OptIn(ExperimentalMaterial3Api::class) @Composable fun CustomizeSearchableSheet( searchable: Searchable, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItem.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItem.kt index 02cbef5d..161e9397 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItem.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItem.kt @@ -111,7 +111,6 @@ fun GridItem(modifier: Modifier = Modifier, item: Searchable, showLabels: Boolea } } -@OptIn(ExperimentalComposeUiApi::class) @Composable fun ItemPopup(origin: Rect, searchable: Searchable, onDismissRequest: () -> Unit) { var show by remember { mutableStateOf(false) } diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListItem.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListItem.kt index 80991805..1a94f0fd 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListItem.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListItem.kt @@ -16,7 +16,6 @@ import de.mm20.launcher2.ui.launcher.search.contacts.ContactItem import de.mm20.launcher2.ui.launcher.search.files.FileItem import de.mm20.launcher2.ui.launcher.search.shortcut.AppShortcutItem -@OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class) @Composable fun ListItem(modifier: Modifier = Modifier, item: Searchable) { var showDetails by remember { mutableStateOf(false) } diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactItem.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactItem.kt index 01b5dd3b..70d73df0 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactItem.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactItem.kt @@ -318,7 +318,6 @@ fun ContactItem( } } -@OptIn(ExperimentalAnimationApi::class) @Composable fun ContactItemGridPopup( contact: Contact, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileItem.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileItem.kt index 69db85b1..7e7c6761 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileItem.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileItem.kt @@ -285,7 +285,6 @@ fun FileItem( } } -@OptIn(ExperimentalAnimationApi::class) @Composable fun FileItemGridPopup( file: File, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/hidden/HiddenResults.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/hidden/HiddenResults.kt index 6f3d16f7..9a1a1e06 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/hidden/HiddenResults.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/hidden/HiddenResults.kt @@ -18,7 +18,6 @@ import de.mm20.launcher2.ui.launcher.LauncherActivityVM import de.mm20.launcher2.ui.launcher.modals.HiddenItemsSheet import de.mm20.launcher2.ui.launcher.search.SearchVM -@OptIn(ExperimentalMaterial3Api::class) @Composable fun ColumnScope.HiddenResults() { val viewModel: SearchVM = viewModel() diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/shortcut/ShortcutItem.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/shortcut/ShortcutItem.kt index e7697636..4897cb0b 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/shortcut/ShortcutItem.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/shortcut/ShortcutItem.kt @@ -224,7 +224,6 @@ fun AppShortcutItem( } } -@OptIn(ExperimentalAnimationApi::class) @Composable fun ShortcutItemGridPopup( shortcut: AppShortcut, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/website/WebsiteItem.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/website/WebsiteItem.kt index 65db63a3..78fb5590 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/website/WebsiteItem.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/website/WebsiteItem.kt @@ -127,7 +127,6 @@ fun WebsiteItem( } } -@OptIn(ExperimentalAnimationApi::class) @Composable fun WebsiteItemGridPopup( website: Website, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/wikipedia/WikipediaItem.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/wikipedia/WikipediaItem.kt index 5dc60b00..6935e415 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/wikipedia/WikipediaItem.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/wikipedia/WikipediaItem.kt @@ -134,7 +134,6 @@ fun WikipediaItem( } } -@OptIn(ExperimentalAnimationApi::class) @Composable fun WikipediaItemGridPopup( wikipedia: Wikipedia, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/WidgetColumn.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/WidgetColumn.kt index 75259fac..a6e80877 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/WidgetColumn.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/WidgetColumn.kt @@ -43,7 +43,6 @@ import de.mm20.launcher2.widgets.ExternalWidget import kotlinx.coroutines.awaitCancellation import kotlinx.coroutines.launch -@OptIn(ExperimentalAnimationGraphicsApi::class) @Composable fun WidgetColumn( modifier: Modifier = Modifier, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidget.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidget.kt index 35d43733..35bb4927 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidget.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidget.kt @@ -30,7 +30,6 @@ import de.mm20.launcher2.ui.launcher.search.common.list.SearchResultList import java.time.LocalDate import java.time.ZoneId -@OptIn(ExperimentalComposeUiApi::class) @Composable fun CalendarWidget() { val viewModel: CalendarWidgetVM = viewModel() diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/BatteryPartProvider.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/BatteryPartProvider.kt index 8254a71d..0aa65358 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/BatteryPartProvider.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/BatteryPartProvider.kt @@ -53,7 +53,6 @@ class BatteryPartProvider : PartProvider { } } - @OptIn(ExperimentalComposeUiApi::class) @Composable override fun Component(layout: Settings.ClockWidgetSettings.ClockWidgetLayout) { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/MusicPartProvider.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/MusicPartProvider.kt index f007ac22..1b3acaba 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/MusicPartProvider.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/MusicPartProvider.kt @@ -48,10 +48,6 @@ class MusicPartProvider : PartProvider, KoinComponent { } } - @OptIn( - ExperimentalAnimationGraphicsApi::class, - ExperimentalFoundationApi::class - ) @Composable override fun Component(layout: ClockWidgetLayout) { val context = LocalContext.current diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt index ff41974f..fc28b726 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt @@ -37,10 +37,6 @@ import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.component.MissingPermissionBanner import de.mm20.launcher2.ui.ktx.conditional -@OptIn( - ExperimentalFoundationApi::class, - ExperimentalAnimationGraphicsApi::class -) @Composable fun MusicWidget() { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/picker/PickAppWidgetActivity.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/picker/PickAppWidgetActivity.kt index e6c692a5..2e25e8f1 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/picker/PickAppWidgetActivity.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/picker/PickAppWidgetActivity.kt @@ -32,7 +32,6 @@ class PickAppWidgetActivity : BaseActivity() { private lateinit var appWidgetManager: AppWidgetManager - @OptIn(ExperimentalMaterial3Api::class) override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) widgetHost = AppWidgetHost(this, 44203) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt index 996dbf09..0999088a 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt @@ -54,7 +54,6 @@ class SettingsActivity : BaseActivity() { private val dataStore: LauncherDataStore by inject() - @OptIn(ExperimentalAnimationApi::class) override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt index b3567a02..dce62a55 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt @@ -279,7 +279,6 @@ fun AppearanceSettingsScreen() { } } -@OptIn(ExperimentalPagerApi::class) @Composable fun SearchBarStylePreference( title: String, @@ -446,7 +445,6 @@ fun IconShapePreference( } } -@OptIn(ExperimentalPagerApi::class) @Composable fun LayoutPreference( title: String, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/backup/CreateBackupSheet.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/backup/CreateBackupSheet.kt index fecd12e9..e15e83b5 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/backup/CreateBackupSheet.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/backup/CreateBackupSheet.kt @@ -175,7 +175,6 @@ fun CreateBackupSheet( } } -@OptIn(ExperimentalMaterial3Api::class) @Composable fun BackupableComponent( title: String, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreen.kt index d2e18cbd..c6a8531c 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreen.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreen.kt @@ -67,7 +67,6 @@ fun CalendarWidgetSettingsScreen() { } } -@OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class) @Composable fun ExcludedCalendarsPreference( calendars: List, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/clockwidget/ClockWidgetSettingsScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/clockwidget/ClockWidgetSettingsScreen.kt index 159b44e4..1811bb5b 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/clockwidget/ClockWidgetSettingsScreen.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/clockwidget/ClockWidgetSettingsScreen.kt @@ -115,7 +115,6 @@ fun ClockWidgetSettingsScreen() { } } -@OptIn(ExperimentalPagerApi::class) @Composable fun ClockStylePreference( layout: ClockWidgetLayout, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReporterScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReporterScreen.kt index d48ac497..a92d8dc4 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReporterScreen.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReporterScreen.kt @@ -28,7 +28,6 @@ import de.mm20.launcher2.ui.component.preferences.PreferenceScreen import de.mm20.launcher2.ui.locals.LocalNavController import java.net.URLEncoder -@OptIn(ExperimentalMaterial3Api::class) @Composable fun CrashReporterScreen() { val viewModel: CrashReporterScreenVM = viewModel() diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/easteregg/EasterEggSettingsScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/easteregg/EasterEggSettingsScreen.kt index 10430a7a..277d46c7 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/easteregg/EasterEggSettingsScreen.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/easteregg/EasterEggSettingsScreen.kt @@ -25,7 +25,6 @@ import androidx.lifecycle.viewmodel.compose.viewModel import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.component.preferences.PreferenceScreen -@OptIn(ExperimentalAnimationApi::class) @Composable fun EasterEggSettingsScreen() { val viewModel: EasterEggSettingsScreenVM = viewModel() diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/hiddenitems/HiddenItemsSettingsScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/hiddenitems/HiddenItemsSettingsScreen.kt index ccf7d1b1..9bc1b4e7 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/hiddenitems/HiddenItemsSettingsScreen.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/hiddenitems/HiddenItemsSettingsScreen.kt @@ -26,7 +26,6 @@ import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.component.ShapedLauncherIcon import de.mm20.launcher2.ui.component.preferences.PreferenceScreen -@OptIn(ExperimentalFoundationApi::class) @Composable fun HiddenItemsSettingsScreen() { val viewModel: HiddenItemsSettingsScreenVM = viewModel() diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/license/LicenseScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/license/LicenseScreen.kt index c71eb6a5..7bf2cf46 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/license/LicenseScreen.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/license/LicenseScreen.kt @@ -26,7 +26,6 @@ import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.component.preferences.PreferenceCategory import de.mm20.launcher2.ui.locals.LocalNavController -@OptIn(ExperimentalMaterial3Api::class) @Composable fun LicenseScreen(library: OpenSourceLibrary) { val context = LocalContext.current diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/websearch/WebSearchSettingsScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/websearch/WebSearchSettingsScreen.kt index a8539f07..88f9a1d1 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/websearch/WebSearchSettingsScreen.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/websearch/WebSearchSettingsScreen.kt @@ -132,7 +132,6 @@ fun WebsearchPreference( } } -@OptIn(ExperimentalMaterial3Api::class) @Composable fun EditWebsearchDialog( title: String, @@ -431,7 +430,6 @@ fun EditWebsearchDialog( } } -@OptIn(ExperimentalMaterial3Api::class) @Composable private fun ColorPicker( value: Int, diff --git a/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/fontfamily/DeviceDefault.kt b/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/fontfamily/DeviceDefault.kt index d6c72765..2ddbecdb 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/fontfamily/DeviceDefault.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/fontfamily/DeviceDefault.kt @@ -4,7 +4,6 @@ import android.content.Context import androidx.compose.ui.text.ExperimentalTextApi import androidx.compose.ui.text.font.* -@OptIn(ExperimentalTextApi::class) fun getDeviceHeadlineFontFamily(context: Context): FontFamily { val configResId = context.resources .getIdentifier("config_headlineFontFamily", "string", "android")