Move theme to top composable. Increase button size.

app/src/main/java/me/zobrist/tichucounter/MainActivity.kt

@@ -54,9 +54,13 @@ class MainActivity : BaseActivity() {
         super.onCreate(savedInstanceState)
 
         setContent {
+            AppTheme() {
+                val systemUiController = rememberSystemUiController()
+                systemUiController.setStatusBarColor(MaterialTheme.colorScheme.background)
                 NavigationDrawer()
             }
         }
+    }
 
     @OptIn(ExperimentalMaterial3Api::class)
     @Composable
@@ -66,10 +70,6 @@ class MainActivity : BaseActivity() {
         navController: NavHostController
     ) {
 
-        AppTheme() {
-            val systemUiController = rememberSystemUiController()
-            systemUiController.setStatusBarColor(MaterialTheme.colorScheme.background)
-
         Scaffold(
             topBar = {
                 TopBar(
@@ -122,7 +122,6 @@ class MainActivity : BaseActivity() {
             }
         }
     }
-    }
 
     @OptIn(ExperimentalMaterial3Api::class)
     @Composable

app/src/main/java/me/zobrist/tichucounter/ui/counter/KeyboardView.kt

@@ -1,9 +1,7 @@
 package me.zobrist.tichucounter.ui.counter
 
 import android.content.res.Configuration
-import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Backspace
 import androidx.compose.material.icons.outlined.Check
@@ -11,6 +9,7 @@ import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.scale
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.focus.onFocusChanged
@@ -18,6 +17,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
 import me.zobrist.tichucounter.ui.AppTheme
 
 
@@ -158,7 +158,7 @@ fun KeyboardView(
 @Composable
 fun KeyboardTextButton(text: String, onClicked: () -> Unit) {
     ElevatedButton(
-        modifier = Modifier.fillMaxWidth(),
+        modifier = Modifier.fillMaxWidth().height(50.dp).padding(2.dp),
         onClick = { onClicked() },
     ) { Text(text) }
 }
@@ -168,12 +168,12 @@ fun KeyboardIconButton(icon: ImageVector, enabled: Boolean = true, onClicked: ()
 
     ElevatedButton(
         onClick = { onClicked() },
-        modifier = Modifier.fillMaxWidth(),
+        modifier = Modifier.fillMaxWidth().height(50.dp).padding(2.dp),,
         enabled = enabled,
     ) {
         Icon(
             icon,
-            contentDescription = null
+            contentDescription = null,
         )
     }
 }