From 261e388e180436160ffa119302cf13564257362c Mon Sep 17 00:00:00 2001 From: Kristen Halper Date: Mon, 12 Jun 2023 11:11:13 -0700 Subject: [PATCH] Remove ExperimentalAdatpiveApi annotation --- adaptive/api/current.api | 7 ++----- .../adaptive/ExperimentalAdaptiveApi.kt | 21 ------------------- .../accompanist/adaptive/FoldAwareColumn.kt | 1 - .../adaptive/FoldAwareColumnScope.kt | 2 -- .../adaptive/FoldAwareColumnTest.kt | 1 - .../DraggableFoldAwareColumnSample.kt | 2 -- .../NavDrawerFoldAwareColumnSample.kt | 3 +-- .../adaptive/NavRailFoldAwareColumnSample.kt | 2 -- 8 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 adaptive/src/main/java/com/google/accompanist/adaptive/ExperimentalAdaptiveApi.kt diff --git a/adaptive/api/current.api b/adaptive/api/current.api index b902adb61..542f42db6 100644 --- a/adaptive/api/current.api +++ b/adaptive/api/current.api @@ -5,14 +5,11 @@ package com.google.accompanist.adaptive { method @androidx.compose.runtime.Composable public static java.util.List calculateDisplayFeatures(android.app.Activity activity); } - @kotlin.RequiresOptIn(message="This APIs are experimental and may change in the future.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.BINARY) public @interface ExperimentalAdaptiveApi { - } - public final class FoldAwareColumnKt { - method @androidx.compose.runtime.Composable @com.google.accompanist.adaptive.ExperimentalAdaptiveApi public static void FoldAwareColumn(java.util.List displayFeatures, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.layout.PaddingValues foldPadding, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, kotlin.jvm.functions.Function1 content); + method @androidx.compose.runtime.Composable public static void FoldAwareColumn(java.util.List displayFeatures, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.foundation.layout.PaddingValues foldPadding, optional androidx.compose.ui.Alignment.Horizontal horizontalAlignment, kotlin.jvm.functions.Function1 content); } - @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable @com.google.accompanist.adaptive.ExperimentalAdaptiveApi public interface FoldAwareColumnScope { + @androidx.compose.foundation.layout.LayoutScopeMarker @androidx.compose.runtime.Immutable public interface FoldAwareColumnScope { method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier align(androidx.compose.ui.Modifier, androidx.compose.ui.Alignment.Horizontal alignment); method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, androidx.compose.ui.layout.VerticalAlignmentLine alignmentLine); method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier alignBy(androidx.compose.ui.Modifier, kotlin.jvm.functions.Function1 alignmentLineBlock); diff --git a/adaptive/src/main/java/com/google/accompanist/adaptive/ExperimentalAdaptiveApi.kt b/adaptive/src/main/java/com/google/accompanist/adaptive/ExperimentalAdaptiveApi.kt deleted file mode 100644 index d0dab3044..000000000 --- a/adaptive/src/main/java/com/google/accompanist/adaptive/ExperimentalAdaptiveApi.kt +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.accompanist.adaptive - -@RequiresOptIn(message = "This APIs are experimental and may change in the future.") -@Retention(AnnotationRetention.BINARY) -annotation class ExperimentalAdaptiveApi diff --git a/adaptive/src/main/java/com/google/accompanist/adaptive/FoldAwareColumn.kt b/adaptive/src/main/java/com/google/accompanist/adaptive/FoldAwareColumn.kt index b2c56b164..602ea32c3 100644 --- a/adaptive/src/main/java/com/google/accompanist/adaptive/FoldAwareColumn.kt +++ b/adaptive/src/main/java/com/google/accompanist/adaptive/FoldAwareColumn.kt @@ -68,7 +68,6 @@ import kotlin.math.roundToInt * @param horizontalAlignment the horizontal alignment of the layout's children. */ @Composable -@ExperimentalAdaptiveApi public fun FoldAwareColumn( displayFeatures: List, modifier: Modifier = Modifier, diff --git a/adaptive/src/main/java/com/google/accompanist/adaptive/FoldAwareColumnScope.kt b/adaptive/src/main/java/com/google/accompanist/adaptive/FoldAwareColumnScope.kt index 7db52e506..5ad371414 100644 --- a/adaptive/src/main/java/com/google/accompanist/adaptive/FoldAwareColumnScope.kt +++ b/adaptive/src/main/java/com/google/accompanist/adaptive/FoldAwareColumnScope.kt @@ -34,7 +34,6 @@ import androidx.compose.ui.platform.debugInspectorInfo */ @LayoutScopeMarker @Immutable -@ExperimentalAdaptiveApi public interface FoldAwareColumnScope { /** * Ignore the fold when placing this child within the [FoldAwareColumn]. @@ -92,7 +91,6 @@ public interface FoldAwareColumnScope { fun Modifier.alignBy(alignmentLineBlock: (Measured) -> Int): Modifier } -@ExperimentalAdaptiveApi internal object FoldAwareColumnScopeInstance : FoldAwareColumnScope { @Stable override fun Modifier.ignoreFold() = this.then( diff --git a/adaptive/src/sharedTest/kotlin/com/google/accompanist/adaptive/FoldAwareColumnTest.kt b/adaptive/src/sharedTest/kotlin/com/google/accompanist/adaptive/FoldAwareColumnTest.kt index ba724cfaf..efd48fe25 100644 --- a/adaptive/src/sharedTest/kotlin/com/google/accompanist/adaptive/FoldAwareColumnTest.kt +++ b/adaptive/src/sharedTest/kotlin/com/google/accompanist/adaptive/FoldAwareColumnTest.kt @@ -52,7 +52,6 @@ import org.junit.Test import org.junit.runner.RunWith @RunWith(AndroidJUnit4::class) -@OptIn(ExperimentalAdaptiveApi::class) class FoldAwareColumnTest { @get:Rule val composeTestRule = createAndroidComposeRule() diff --git a/sample/src/main/java/com/google/accompanist/sample/adaptive/DraggableFoldAwareColumnSample.kt b/sample/src/main/java/com/google/accompanist/sample/adaptive/DraggableFoldAwareColumnSample.kt index 63fdf8094..d4d190db2 100644 --- a/sample/src/main/java/com/google/accompanist/sample/adaptive/DraggableFoldAwareColumnSample.kt +++ b/sample/src/main/java/com/google/accompanist/sample/adaptive/DraggableFoldAwareColumnSample.kt @@ -45,7 +45,6 @@ import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp -import com.google.accompanist.adaptive.ExperimentalAdaptiveApi import com.google.accompanist.adaptive.FoldAwareColumn import com.google.accompanist.adaptive.calculateDisplayFeatures import com.google.accompanist.sample.AccompanistSampleTheme @@ -65,7 +64,6 @@ class DraggableFoldAwareColumnSample : ComponentActivity() { } } -@OptIn(ExperimentalAdaptiveApi::class) @Composable fun DraggableExample(activity: Activity) { var offset by remember { mutableStateOf(Offset(0f, 0f)) } diff --git a/sample/src/main/java/com/google/accompanist/sample/adaptive/NavDrawerFoldAwareColumnSample.kt b/sample/src/main/java/com/google/accompanist/sample/adaptive/NavDrawerFoldAwareColumnSample.kt index dc220d9de..4b250952c 100644 --- a/sample/src/main/java/com/google/accompanist/sample/adaptive/NavDrawerFoldAwareColumnSample.kt +++ b/sample/src/main/java/com/google/accompanist/sample/adaptive/NavDrawerFoldAwareColumnSample.kt @@ -49,7 +49,6 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import com.google.accompanist.adaptive.ExperimentalAdaptiveApi import com.google.accompanist.adaptive.FoldAwareColumn import com.google.accompanist.adaptive.calculateDisplayFeatures import com.google.accompanist.sample.AccompanistSampleTheme @@ -65,7 +64,7 @@ class NavDrawerFoldAwareColumnSample : ComponentActivity() { } } -@OptIn(ExperimentalMaterial3Api::class, ExperimentalAdaptiveApi::class) +@OptIn(ExperimentalMaterial3Api::class) @Composable fun NavDrawerExample(activity: Activity) { val icons = listOf( diff --git a/sample/src/main/java/com/google/accompanist/sample/adaptive/NavRailFoldAwareColumnSample.kt b/sample/src/main/java/com/google/accompanist/sample/adaptive/NavRailFoldAwareColumnSample.kt index 3d6294268..e25693f5a 100644 --- a/sample/src/main/java/com/google/accompanist/sample/adaptive/NavRailFoldAwareColumnSample.kt +++ b/sample/src/main/java/com/google/accompanist/sample/adaptive/NavRailFoldAwareColumnSample.kt @@ -46,7 +46,6 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import com.google.accompanist.adaptive.ExperimentalAdaptiveApi import com.google.accompanist.adaptive.FoldAwareColumn import com.google.accompanist.adaptive.calculateDisplayFeatures import com.google.accompanist.sample.AccompanistSampleTheme @@ -65,7 +64,6 @@ class NavRailFoldAwareColumnSample : ComponentActivity() { } } -@OptIn(ExperimentalAdaptiveApi::class) @Composable fun NavRail(activity: Activity) { val icons = listOf(