1.0 Prototype Release

Author: git-jamesfrench

app/build.gradle.kts

@@ -15,7 +15,7 @@ android {
         minSdk = 24
         targetSdk = 36
         versionCode = 1
-        versionName = "0.0"
+        versionName = "1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/jamesfrench/nothingcalculator/History.kt

@@ -1,7 +1,9 @@
 package com.jamesfrench.nothingcalculator
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -27,30 +29,41 @@ fun History(onHistoryClose: () -> Unit) {
             .background(DeepBlack)
     )
 
-    Box(
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(start = 15.dp, end = 15.dp, top = 15.dp),
-        contentAlignment = Alignment.CenterStart
+    Column(
+        modifier = Modifier.fillMaxSize()
     ) {
-        IconButton(
-            onClick = { onHistoryClose() },
+        Box(
             modifier = Modifier
-                .size(42.dp)
+                .fillMaxWidth()
+                .padding(start = 15.dp, end = 15.dp, top = 15.dp),
+            contentAlignment = Alignment.CenterStart
         ) {
-            Box(
-                modifier = Modifier.fillMaxSize()
-            )
-            Icon(
-                painter = painterResource(R.drawable.back),
-                contentDescription = stringResource(R.string.back)
+            IconButton(
+                onClick = { onHistoryClose() },
+                modifier = Modifier
+                    .size(42.dp)
+            ) {
+                Box(
+                    modifier = Modifier.fillMaxSize()
+                )
+                Icon(
+                    painter = painterResource(R.drawable.back),
+                    contentDescription = stringResource(R.string.back)
+                )
+            }
+            Text(
+                text = stringResource(R.string.history),
+                fontFamily = ndot77,
+                fontSize = 26.sp,
+                modifier = Modifier.align(Alignment.Center)
             )
         }
-        Text(
-            text = stringResource(R.string.history),
-            fontFamily = ndot77,
-            fontSize = 26.sp,
-            modifier = Modifier.align(Alignment.Center)
-        )
+        Column (
+            modifier = Modifier.fillMaxSize(),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.Center
+        ) {
+            Text("History is still in development!")
+        }
     }
 }

app/src/main/java/com/jamesfrench/nothingcalculator/Settings.kt

@@ -1,7 +1,10 @@
 package com.jamesfrench.nothingcalculator
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -12,45 +15,62 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.LineHeightStyle
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.jamesfrench.nothingcalculator.ui.theme.DeepBlack
 import com.jamesfrench.nothingcalculator.ui.theme.ndot77
 
 @Composable
 fun Settings(onSettingsClose: () -> Unit) {
+    val context = LocalContext.current
+    val packageManager = context.packageName
+
     Box(
         modifier = Modifier
             .fillMaxSize()
             .background(DeepBlack)
     )
 
-    Box(
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(start = 15.dp, end = 15.dp, top = 15.dp),
-        contentAlignment = Alignment.CenterStart
+    Column(
+        modifier = Modifier.fillMaxSize()
     ) {
-        IconButton(
-            onClick = { onSettingsClose() },
+        Box(
             modifier = Modifier
-                .size(42.dp)
+                .fillMaxWidth()
+                .padding(start = 15.dp, end = 15.dp, top = 15.dp),
+            contentAlignment = Alignment.CenterStart
         ) {
-            Box(
-                modifier = Modifier.fillMaxSize()
-            )
-            Icon(
-                painter = painterResource(R.drawable.back),
-                contentDescription = stringResource(R.string.back)
+            IconButton(
+                onClick = { onSettingsClose() },
+                modifier = Modifier
+                    .size(42.dp)
+            ) {
+                Box(
+                    modifier = Modifier.fillMaxSize()
+                )
+                Icon(
+                    painter = painterResource(R.drawable.back),
+                    contentDescription = stringResource(R.string.back)
+                )
+            }
+            Text(
+                text = stringResource(R.string.settings),
+                fontFamily = ndot77,
+                fontSize = 26.sp,
+                modifier = Modifier.align(Alignment.Center)
             )
         }
-        Text(
-            text = stringResource(R.string.settings),
-            fontFamily = ndot77,
-            fontSize = 26.sp,
-            modifier = Modifier.align(Alignment.Center)
-        )
+        Column (
+            modifier = Modifier.fillMaxSize(),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.Center
+        ) {
+            Text("Settings are in development!")
+            Text(packageManager)
+        }
     }
 }