Update sheet detens/initial detent with new Scopes

Author: AdamGrzybkowski

gravatar-quickeditor/src/main/java/com/gravatar/quickeditor/ui/abouteditor/AboutEditor.kt

@@ -106,9 +106,10 @@ internal fun AboutEditor(
     }
 
     Surface {
-        Box(modifier = Modifier
-            .wrapContentSize()
-            .animateContentSize()
+        Box(
+            modifier = Modifier
+                .wrapContentSize()
+                .animateContentSize(),
         ) {
             AboutEditor(
                 uiState = uiState,

gravatar-quickeditor/src/main/java/com/gravatar/quickeditor/ui/editor/QuickEditorScopeOption.kt

@@ -47,6 +47,13 @@ public class QuickEditorScopeOption private constructor(
             is Scope.AvatarPicker -> AboutInputField.all
         }
 
+    internal val initialPage: QuickEditorPage
+        get() = when (scope) {
+            is Scope.AvatarPicker -> QuickEditorPage.AvatarPicker
+            is Scope.AboutEditor -> QuickEditorPage.AboutEditor
+            is Scope.AvatarPickerAndAboutEditor -> scope.config.initialPage.internalType
+        }
+
     public companion object {
         internal val default = QuickEditorScopeOption(
             scope = Scope.AvatarPicker(AvatarPickerConfiguration.default),

gravatar-quickeditor/src/main/java/com/gravatar/quickeditor/ui/editor/QuickEditorViewModel.kt

@@ -121,14 +121,7 @@ internal class QuickEditorViewModelFactory(
     }
 }
 
-private val QuickEditorScopeOption.initialPage: QuickEditorPage
-    get() = when (scope) {
-        is Scope.AvatarPicker -> QuickEditorPage.AvatarPicker
-        is Scope.AboutEditor -> QuickEditorPage.AboutEditor
-        is Scope.AvatarPickerAndAboutEditor -> scope.config.initialPage.internalType
-    }
-
-private val AvatarPickerAndAboutEditorConfiguration.Page.internalType: QuickEditorPage
+internal val AvatarPickerAndAboutEditorConfiguration.Page.internalType: QuickEditorPage
     get() = when (this) {
         AvatarPicker -> QuickEditorPage.AvatarPicker
         AboutEditor -> QuickEditorPage.AboutEditor

gravatar-quickeditor/src/main/java/com/gravatar/quickeditor/ui/editor/bottomsheet/GravatarQuickEditorBottomSheet.kt

@@ -57,6 +57,8 @@ import com.gravatar.quickeditor.ui.editor.GravatarQuickEditorDismissReason
 import com.gravatar.quickeditor.ui.editor.GravatarQuickEditorPage
 import com.gravatar.quickeditor.ui.editor.GravatarQuickEditorParams
 import com.gravatar.quickeditor.ui.editor.GravatarUiMode
+import com.gravatar.quickeditor.ui.editor.QuickEditorPage
+import com.gravatar.quickeditor.ui.editor.QuickEditorScopeOption
 import com.gravatar.quickeditor.ui.editor.UpdateHandler
 import com.gravatar.ui.GravatarTheme
 import com.gravatar.ui.LocalGravatarTheme
@@ -87,7 +89,7 @@ public fun GravatarQuickEditorBottomSheet(
         authenticationMethod = authenticationMethod,
         updateHandler = updateHandler,
         onDismiss = onDismiss,
-        modalDetents = gravatarQuickEditorParams.scopeOption.avatarPickerContentLayout.modalDetents(),
+        modalDetents = gravatarQuickEditorParams.scopeOption.modalDetents(),
     )
 }
 
@@ -123,7 +125,7 @@ public fun GravatarQuickEditorBottomSheet(
             }
         },
         onDismiss = onDismiss,
-        modalDetents = gravatarQuickEditorParams.scopeOption.avatarPickerContentLayout.modalDetents(),
+        modalDetents = gravatarQuickEditorParams.scopeOption.modalDetents(),
     )
 }
 
@@ -316,34 +318,63 @@ private fun GravatarModalBottomSheet(
     }
 }
 
+private val peek = SheetDetent(identifier = "peek") { containerHeight, _ ->
+    containerHeight * 0.6f
+}
+
 @Composable
-internal fun AvatarPickerContentLayout.modalDetents(): ModalDetents {
-    val peek = SheetDetent(identifier = "peek") { containerHeight, sheetHeight ->
-        containerHeight * 0.6f
-    }
+internal fun QuickEditorScopeOption.modalDetents(): ModalDetents {
     val windowHeightSizeClass = currentWindowAdaptiveInfo().windowSizeClass.windowHeightSizeClass
-    val initialDetent = if (windowHeightSizeClass == WindowHeightSizeClass.COMPACT) {
-        FullyExpanded
-    } else {
-        when (this) {
-            AvatarPickerContentLayout.Horizontal -> FullyExpanded
-            AvatarPickerContentLayout.Vertical -> peek
-        }
-    }
 
-    val detents = buildList {
-        add(Hidden)
-        if (this@modalDetents == AvatarPickerContentLayout.Horizontal) {
-            add(FullyExpanded)
-        } else {
+    val detents = buildDetentsList()
+    val initialDetent = initialDetent(windowHeightSizeClass)
+
+    return ModalDetents(
+        initialDetent = if (detents.contains(initialDetent)) initialDetent else detents.last(),
+        detents = detents,
+    )
+}
+
+private fun QuickEditorScopeOption.buildDetentsList(): List<SheetDetent> {
+    return when (this.scope) {
+        is QuickEditorScopeOption.Scope.AvatarPickerAndAboutEditor,
+        is QuickEditorScopeOption.Scope.AboutEditor,
+        -> buildList {
+            add(Hidden)
             add(peek)
             add(FullyExpanded)
         }
+
+        is QuickEditorScopeOption.Scope.AvatarPicker -> buildList {
+            add(Hidden)
+            if (avatarPickerContentLayout == AvatarPickerContentLayout.Vertical) {
+                add(peek)
+            }
+            add(FullyExpanded)
+        }
+    }
+}
+
+private fun QuickEditorScopeOption.initialDetent(windowHeightSizeClass: WindowHeightSizeClass): SheetDetent {
+    return if (windowHeightSizeClass == WindowHeightSizeClass.COMPACT) {
+        FullyExpanded
+    } else {
+        when (this.scope) {
+            is QuickEditorScopeOption.Scope.AboutEditor -> peek
+            is QuickEditorScopeOption.Scope.AvatarPickerAndAboutEditor,
+            is QuickEditorScopeOption.Scope.AvatarPicker,
+            -> {
+                if (
+                    this.avatarPickerContentLayout == AvatarPickerContentLayout.Horizontal &&
+                    this.initialPage == QuickEditorPage.AvatarPicker
+                ) {
+                    FullyExpanded
+                } else {
+                    peek
+                }
+            }
+        }
     }
-    return ModalDetents(
-        initialDetent = initialDetent,
-        detents = detents,
-    )
 }
 
 internal data class ModalDetents(

gravatar-quickeditor/src/main/java/com/gravatar/quickeditor/ui/editor/extensions/QuickEditorExtensions.kt

@@ -25,7 +25,7 @@ internal fun addQuickEditorToView(
                     authenticationMethod = authenticationMethod,
                     updateHandler = updateHandler,
                     onDismiss = onDismiss,
-                    modalDetents = gravatarQuickEditorParams.scopeOption.avatarPickerContentLayout.modalDetents(),
+                    modalDetents = gravatarQuickEditorParams.scopeOption.modalDetents(),
                     onCurrentDetentChanged = {
                         if (it == Hidden) {
                             viewGroup.removeView(this)