Merge Contents and Fragment

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()
+                }
+            }
+        }
     }
 }

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