From 8d5c6742bee9740904fbd46831939c7f331a34de Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Tue, 7 Apr 2020 12:48:42 -0700
Subject: [PATCH] fighting compose

---
 .../com/geeksville/mesh/ui/ComposeFragment.kt | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/ui/ComposeFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/ComposeFragment.kt
index 28e7f079..dad14ba5 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/ComposeFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/ComposeFragment.kt
@@ -14,6 +14,7 @@ fun androidx.fragment.app.Fragment.setComposable(
 ): View? =
     context?.let {
         FrameLayout(it).apply {
+            this.isClickable = true
             this.id =
                 id // Compose requires a unique ID for the containing view to make savedInstanceState work
 
@@ -30,11 +31,26 @@ open class ComposeFragment(
     screenName: String,
     id: Int,
     private val content: @Composable() () -> Unit
-) :
-    ScreenFragment(screenName) {
+) : ScreenFragment(screenName) {
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? =
-        setComposable(id, content)
-}
\ No newline at end of file
+        FrameLayout(context!!).apply {
+            this.isClickable = true
+            this.id =
+                id // Compose requires a unique ID for the containing view to make savedInstanceState work
+
+            layoutParams = ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT
+            )
+
+            setContent(content)
+        }
+
+    /* override fun onStart() {
+        super.onStart()
+        (view as ViewGroup).setContent(content)
+    } */
+}