From 65b0024fa7a8ad2847305193958b0b3b4ac95bc9 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <me@steffo.eu>
Date: Sun, 19 Nov 2023 17:47:37 +0100
Subject: [PATCH] Merge Contents and Fragment

---
 app/src/main/java/eu/steffo/twom/MainActivity.kt    | 10 +++++++++-
 .../steffo/twom/ui/fragment/HomeserverFragment.kt   | 13 +------------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/eu/steffo/twom/MainActivity.kt b/app/src/main/java/eu/steffo/twom/MainActivity.kt
index fef8e89..67d7efd 100644
--- a/app/src/main/java/eu/steffo/twom/MainActivity.kt
+++ b/app/src/main/java/eu/steffo/twom/MainActivity.kt
@@ -4,6 +4,8 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import eu.steffo.twom.ui.fragment.HomeserverFragment
+import eu.steffo.twom.ui.scaffold.TwoMMatrixProvider
+import eu.steffo.twom.ui.theme.TwoMTheme
 
 
 class MainActivity : ComponentActivity() {
@@ -11,6 +13,12 @@ class MainActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
         actionBar?.hide()
 
-        setContent { HomeserverFragment() }
+        setContent {
+            TwoMMatrixProvider {
+                TwoMTheme {
+                    HomeserverFragment()
+                }
+            }
+        }
     }
 }
diff --git a/app/src/main/java/eu/steffo/twom/ui/fragment/HomeserverFragment.kt b/app/src/main/java/eu/steffo/twom/ui/fragment/HomeserverFragment.kt
index 3a5e2f2..96ea246 100644
--- a/app/src/main/java/eu/steffo/twom/ui/fragment/HomeserverFragment.kt
+++ b/app/src/main/java/eu/steffo/twom/ui/fragment/HomeserverFragment.kt
@@ -22,25 +22,14 @@ import eu.steffo.twom.R
 import eu.steffo.twom.ui.input.SelectHomeserverField
 import eu.steffo.twom.ui.input.SelectHomeserverFieldState
 import eu.steffo.twom.ui.scaffold.LocalMatrix
-import eu.steffo.twom.ui.scaffold.TwoMMatrixProvider
 import eu.steffo.twom.ui.scaffold.TwoMTopAppBar
-import eu.steffo.twom.ui.theme.TwoMTheme
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 
-@Composable
-fun HomeserverFragment() {
-    TwoMMatrixProvider {
-        TwoMTheme {
-            HomeserverContents()
-        }
-    }
-}
-
 @Composable
 @Preview
-fun HomeserverContents() {
+fun HomeserverFragment() {
     val scope = rememberCoroutineScope()
     val matrix = LocalMatrix.current