Android spacing bug fix

lightningkite · Mar 7, 2024 · dfc65f4 · dfc65f4
1 parent 6fee403
commit dfc65f4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 25 deletions.
diff --git a/.../src/androidMain/kotlin/com/lightningkite/mppexampleapp/PlatformSpecificScreen.android.kt b/.../src/androidMain/kotlin/com/lightningkite/mppexampleapp/PlatformSpecificScreen.android.kt
@@ -2,32 +2,14 @@ package com.lightningkite.mppexampleapp
 
 import com.lightningkite.mppexampleapp.docs.code
 import com.lightningkite.mppexampleapp.docs.example
+import com.lightningkite.rock.models.px
 import com.lightningkite.rock.views.*
 import com.lightningkite.rock.views.direct.*
 
 actual fun ViewWriter.platformSpecific() {
-    col {
-        card - row {
-            expanding - scrollsHorizontally - code - text(
-                """
-                    Example Text
-                    """.trimIndent()
-            )
-            separator()
-            expanding - card - stack {
-                text("Hello world")
-            }
-        }
-        card - row {
-            expanding - scrollsHorizontally - code - text(
-                """
-                    Example Text
-                    """.trimIndent()
-            )
-            separator()
-            expanding - card - stack {
-                text("Hello world")
-            }
-        }
+    stack {
+        spacing = 0.px
+        important - space()
+        important - space()
     }
 }
diff --git a/library/src/androidMain/kotlin/com/lightningkite/rock/views/direct/ContainingView.android.kt b/library/src/androidMain/kotlin/com/lightningkite/rock/views/direct/ContainingView.android.kt
@@ -20,7 +20,7 @@ actual typealias NContainingView = ViewGroup
 
 @ViewDsl
 actual inline fun ViewWriter.stackActual(crossinline setup: ContainingView.() -> Unit) = viewElement(
-    factory = ::FrameLayout,
+    factory = ::SlightlyModifiedFrameLayout,
     wrapper = ::ContainingView
 ) {
     handleTheme(native, viewDraws = false)

diff --git a/library/src/commonMain/kotlin/com/lightningkite/rock/views/l2/AppNav.kt b/library/src/commonMain/kotlin/com/lightningkite/rock/views/l2/AppNav.kt
@@ -87,6 +87,7 @@ fun ViewWriter.appNavHamburger(setup: AppNav.() -> Unit) {
             ::exists { appNav.existsProperty.await() }
         } in bar
         expanding - stack {
+            spacing = 0.px
             navigatorView(navigator)
             row {
                 ignoreInteraction = true

diff --git a/library/src/jsMain/kotlin/com/lightningkite/rock/views/direct/Link.js.kt b/library/src/jsMain/kotlin/com/lightningkite/rock/views/direct/Link.js.kt
@@ -33,7 +33,6 @@ actual inline var Link.to: RockScreen
             it.preventDefault()
             navigator.navigate(value)
             (native.asDynamic().__ROCK__onNavigate as? suspend ()->Unit)?.let {
-                println("launchingmanucan")
                 calculationContext.launchManualCancel(it)
             }
         }