Skip to content

Commit 53f4995

Browse files
authored
Merge pull request #333 from WhosNickDoglio/ndoglio/opt-in-experimental
Opt in to experimental Compose APIs to avoid confusion
2 parents 19bef28 + 74ace85 commit 53f4995

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

android/shared/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ kotlin {
4242
all {
4343
languageSettings {
4444
optIn("org.jetbrains.compose.resources.ExperimentalResourceApi")
45+
optIn("androidx.compose.material3.ExperimentalMaterial3Api")
46+
optIn("androidx.compose.foundation.ExperimentalFoundationApi")
4547
}
4648
}
4749
commonMain.dependencies {
@@ -110,4 +112,4 @@ dependencies {
110112
implementation(libs.androidx.security.crypto.ktx)
111113
add("kspCommonMainMetadata", libs.androidx.room.compiler)
112114
add("kspAndroid", libs.androidx.room.compiler)
113-
}
115+
}

android/shared/src/commonMain/kotlin/io/rebble/cobble/shared/ui/view/home/locker/LockerAppList.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.rebble.cobble.shared.ui.view.home.locker
22

3-
import androidx.compose.foundation.ExperimentalFoundationApi
43
import androidx.compose.foundation.layout.fillMaxSize
54
import androidx.compose.foundation.lazy.LazyColumn
65
import androidx.compose.foundation.lazy.rememberLazyListState
@@ -17,7 +16,6 @@ import org.koin.compose.getKoin
1716
import sh.calvin.reorderable.ReorderableItem
1817
import sh.calvin.reorderable.rememberReorderableLazyListState
1918

20-
@OptIn(ExperimentalFoundationApi::class)
2119
@Composable
2220
fun LockerAppList(viewModel: LockerViewModel, onOpenModalSheet: (LockerItemViewModel) -> Unit) {
2321
val lazyListState = rememberLazyListState()

android/shared/src/commonMain/kotlin/io/rebble/cobble/shared/ui/view/home/locker/LockerItemSheet.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import io.rebble.cobble.shared.ui.common.AppIconContainer
2323
import io.rebble.cobble.shared.ui.common.RebbleIcons
2424
import io.rebble.cobble.shared.ui.viewmodel.LockerItemViewModel
2525

26-
@OptIn(ExperimentalMaterial3Api::class)
2726
@Composable
2827
fun LockerItemSheet(onDismissRequest: () -> Unit, watchIsConnected: Boolean, viewModel: LockerItemViewModel) {
2928
val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)

0 commit comments

Comments
 (0)