Reduce code duplication

2 files changed, 9 insertions, 36 deletions

diff --git a/wear/src/main/java/dev/equestria/pluralwear/presentation/MainActivity.kt b/wear/src/main/java/dev/equestria/pluralwear/presentation/MainActivity.kt
index 4a3b7c7..26f81a1 100644
--- a/wear/src/main/java/dev/equestria/pluralwear/presentation/MainActivity.kt
+++ b/wear/src/main/java/dev/equestria/pluralwear/presentation/MainActivity.kt
@@ -23,6 +23,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Devices
 import androidx.compose.ui.tooling.preview.Preview
@@ -57,8 +58,7 @@ import dev.equestria.pluralwear.pluralkt.types.PkMember
 import dev.equestria.pluralwear.pluralkt.types.PkSystem
 import dev.equestria.pluralwear.pluralkt.types.PkSystemSettings
 import dev.equestria.pluralwear.presentation.activity.home.HomePage
-import dev.equestria.pluralwear.presentation.activity.loading.LoadingAppPage
-import dev.equestria.pluralwear.presentation.activity.loading.LoadingSystemPage
+import dev.equestria.pluralwear.presentation.activity.loading.LoadingPage
 import dev.equestria.pluralwear.presentation.activity.register_switch.SwitchPage
 import dev.equestria.pluralwear.presentation.theme.PluralwearTheme
 import dev.equestria.pluralwear.tile.MainTileService
@@ -96,7 +96,7 @@ class MainActivity : ComponentActivity() {
             }
 
             setContent {
-                LoadingAppPage()
+                LoadingPage(stringResource(id = R.string.wait_app))
             }
         } else {
             setContent {
@@ -112,7 +112,7 @@ class MainActivity : ComponentActivity() {
 
         if(PluralKt.tokenExists()) {
             setContent {
-                LoadingSystemPage()
+                LoadingPage(stringResource(id = R.string.load_system))
             }
 
             val context = this
diff --git a/wear/src/main/java/dev/equestria/pluralwear/presentation/activity/loading/LoadingActivity.kt b/wear/src/main/java/dev/equestria/pluralwear/presentation/activity/loading/LoadingActivity.kt
index 3ab8d7d..7b5556b 100644
--- a/wear/src/main/java/dev/equestria/pluralwear/presentation/activity/loading/LoadingActivity.kt
+++ b/wear/src/main/java/dev/equestria/pluralwear/presentation/activity/loading/LoadingActivity.kt
@@ -39,14 +39,16 @@ class LoadingActivity  : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
-            LoadingSystemPage()
+            LoadingPage()
         }
     }
 }
 
 @OptIn(ExperimentalUnitApi::class)
 @Composable
-fun LoadingSystemPage() {
+fun LoadingPage(
+    title: String = "Loading…"
+) {
     Column(
         modifier = Modifier.fillMaxSize(),
         verticalArrangement = Arrangement.Center
@@ -73,35 +75,6 @@ fun LoadingSystemPage() {
     }
 }
 
-@OptIn(ExperimentalUnitApi::class)
-@Composable
-fun LoadingAppPage() {
-    Column(
-        modifier = Modifier.fillMaxSize(),
-        verticalArrangement = Arrangement.Center
-    ) {
-        Text(
-            modifier = Modifier.fillMaxWidth().padding(5.dp),
-            textAlign = TextAlign.Center,
-            color = MaterialTheme.colors.onBackground,
-            text = stringResource(R.string.wait_app)
-        )
-        CircularProgressIndicator(
-            modifier = Modifier.fillMaxWidth(),
-            startAngle = 270.0f,
-            indicatorColor = MaterialTheme.colors.onBackground,
-            trackColor = MaterialTheme.colors.background
-        )
-        Text(
-            modifier = Modifier.fillMaxWidth().padding(5.dp),
-            textAlign = TextAlign.Center,
-            color = MaterialTheme.colors.onBackground,
-            text = stringResource(R.string.please_wait),
-            fontSize = TextUnit(2f, TextUnitType.Em)
-        )
-    }
-}
-
 @Composable
 fun LoadingDialog(
     showDialog: Boolean
@@ -137,5 +110,5 @@ fun LoadingDialog(
 @Preview(device = Devices.WEAR_OS_SMALL_ROUND, showSystemUi = true)
 @Composable
 fun DefaultPreview() {
-    LoadingSystemPage()
+    LoadingPage()
 }
\ No newline at end of file