Merge pull request #1500 from khalp/khalp/fold-aware-column

[Adaptive] Add FoldAwareColumn component
google · Jun 13, 2023 · 87e2289 · 87e2289
2 parents fd3e30d + 261e388
commit 87e2289
Show file tree

Hide file tree

Showing 13 changed files with 2,189 additions and 1 deletion.
diff --git a/adaptive/api/current.api b/adaptive/api/current.api
@@ -5,6 +5,17 @@ package com.google.accompanist.adaptive {
     method @androidx.compose.runtime.Composable public static java.util.List<androidx.window.layout.DisplayFeature> calculateDisplayFeatures(android.app.Activity activity);
   }
 
+  public final class FoldAwareColumnKt {
+    method @androidx.compose.runtime.Composable public static void FoldAwareColumn(java.util.List<? extends androidx.window.layout.DisplayFeature> 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<? super com.google.accompanist.adaptive.FoldAwareColumnScope,kotlin.Unit> content);
+  }
+
+  @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<? super androidx.compose.ui.layout.Measured,java.lang.Integer> alignmentLineBlock);
+    method @androidx.compose.runtime.Stable public androidx.compose.ui.Modifier ignoreFold(androidx.compose.ui.Modifier);
+  }
+
   @kotlin.jvm.JvmInline public final value class FoldAwareConfiguration {
     field public static final com.google.accompanist.adaptive.FoldAwareConfiguration.Companion Companion;
   }
@@ -18,6 +29,9 @@ package com.google.accompanist.adaptive {
     property public final int VerticalFoldsOnly;
   }
 
+  public final class RowColumnImplKt {
+  }
+
   public final class SplitResult {
     ctor public SplitResult(androidx.compose.foundation.gestures.Orientation gapOrientation, androidx.compose.ui.geometry.Rect gapBounds);
     method public androidx.compose.ui.geometry.Rect getGapBounds();

diff --git a/adaptive/build.gradle.kts b/adaptive/build.gradle.kts
@@ -100,6 +100,7 @@ dependencies {
 
     implementation(libs.napier)
     implementation(libs.kotlin.coroutines.android)
+    implementation(libs.compose.ui.util)
 
     // ======================
     // Test dependencies