Add scaffod to NeedToRestartActivity

Tornaco · Nov 8, 2024 · 16337ed · 16337ed
1 parent 40a4a8a
commit 16337ed
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/android/app/src/main/java/now/fortuitous/thanos/main/NeedToRestartActivity.kt b/android/app/src/main/java/now/fortuitous/thanos/main/NeedToRestartActivity.kt
@@ -18,11 +18,7 @@
 package now.fortuitous.thanos.main
 
 import android.content.Context
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
 import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.animation.core.CubicBezierEasing
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.slideInVertically
@@ -38,7 +34,7 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.PublishedWithChanges
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
+import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
@@ -57,33 +53,31 @@ import androidx.compose.ui.text.capitalize
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import github.tornaco.android.thanos.R
+import github.tornaco.android.thanos.module.compose.common.ComposeThemeActivity
 import github.tornaco.android.thanos.support.withThanos
 import github.tornaco.android.thanos.util.ActivityUtils
 
-class NeedToRestartActivity : ComponentActivity() {
+class NeedToRestartActivity : ComposeThemeActivity() {
 
     object Starter {
         fun start(context: Context?) {
             ActivityUtils.startActivity(context, NeedToRestartActivity::class.java)
         }
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContent {
-            NeedToStartScreen()
-        }
+    @Composable
+    override fun Content() {
+        NeedToStartScreen()
     }
 
-    @OptIn(ExperimentalAnimationApi::class)
     @Composable
     @Preview(name = "NeedToStartScreen", showSystemUi = true, showBackground = true)
     private fun NeedToStartScreen() {
         var visible by remember { mutableStateOf(false) }
 
-        Surface(modifier = Modifier.fillMaxSize()) {
+        Scaffold(modifier = Modifier.fillMaxSize()) {
             AnimatedVisibility(
+                modifier = Modifier.padding(it),
                 visible = visible,
                 enter = slideInVertically(
                     initialOffsetY = {

diff --git a/android/internal/Thanox-Internal b/android/internal/Thanox-Internal