From 9b362a17772c740bd773baf4eae5b877e41b8b36 Mon Sep 17 00:00:00 2001
From: Syer10 <syer10@users.noreply.github.com>
Date: Tue, 13 Jul 2021 14:22:39 -0400
Subject: [PATCH] Dont add a surface under the loading screen

---
 .../ui/base/components/LoadingScreen.kt       | 25 ++++++++-----------
 src/main/kotlin/ca/gosyer/ui/main/main.kt     | 15 ++++++-----
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/main/kotlin/ca/gosyer/ui/base/components/LoadingScreen.kt b/src/main/kotlin/ca/gosyer/ui/base/components/LoadingScreen.kt
index c031fd31..33c6a46b 100644
--- a/src/main/kotlin/ca/gosyer/ui/base/components/LoadingScreen.kt
+++ b/src/main/kotlin/ca/gosyer/ui/base/components/LoadingScreen.kt
@@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -28,20 +27,18 @@ fun LoadingScreen(
     retryMessage: String = stringResource("action_retry"),
     retry: (() -> Unit)? = null
 ) {
-    Surface(modifier) {
-        BoxWithConstraints {
-            if (isLoading) {
-                val size = remember(maxHeight, maxWidth) {
-                    min(maxHeight, maxWidth) / 2
-                }
-                if (progress != 0.0F && !progress.isNaN()) {
-                    CircularProgressIndicator(progress, Modifier.align(Alignment.Center).size(size))
-                } else {
-                    CircularProgressIndicator(Modifier.align(Alignment.Center).size(size))
-                }
-            } else {
-                ErrorScreen(errorMessage, modifier, retryMessage, retry)
+    BoxWithConstraints(modifier) {
+        if (isLoading) {
+            val size = remember(maxHeight, maxWidth) {
+                min(maxHeight, maxWidth) / 2
             }
+            if (progress != 0.0F && !progress.isNaN()) {
+                CircularProgressIndicator(progress, Modifier.align(Alignment.Center).size(size))
+            } else {
+                CircularProgressIndicator(Modifier.align(Alignment.Center).size(size))
+            }
+        } else {
+            ErrorScreen(errorMessage, modifier, retryMessage, retry)
         }
     }
 }
diff --git a/src/main/kotlin/ca/gosyer/ui/main/main.kt b/src/main/kotlin/ca/gosyer/ui/main/main.kt
index e3b6b661..251294e8 100644
--- a/src/main/kotlin/ca/gosyer/ui/main/main.kt
+++ b/src/main/kotlin/ca/gosyer/ui/main/main.kt
@@ -7,6 +7,7 @@
 package ca.gosyer.ui.main
 
 import androidx.compose.desktop.AppWindow
+import androidx.compose.material.Surface
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -132,12 +133,14 @@ fun main() {
                             MainMenu(rootBundle)
                         }
                         ServerResult.STARTING, ServerResult.FAILED -> {
-                            LoadingScreen(
-                                initialized == ServerResult.STARTING,
-                                errorMessage = stringResource("unable_to_start_server"),
-                                retryMessage = stringResource("action_start_anyway"),
-                                retry = serverService::startAnyway
-                            )
+                            Surface {
+                                LoadingScreen(
+                                    initialized == ServerResult.STARTING,
+                                    errorMessage = stringResource("unable_to_start_server"),
+                                    retryMessage = stringResource("action_start_anyway"),
+                                    retry = serverService::startAnyway
+                                )
+                            }
                         }
                     }
                 }