Browse Source

Correct alignment of Weekday elements

Helmut Pozimski 1 year ago
parent
commit
224280f7e4
2 changed files with 21 additions and 21 deletions
  1. 19 19
      app/src/main/java/eu/pozimski/alarmclockconfigurator/MainActivity.kt
  2. 2 2
      build.gradle

+ 19 - 19
app/src/main/java/eu/pozimski/alarmclockconfigurator/MainActivity.kt

@@ -20,7 +20,9 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.ExperimentalUnitApi
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.TextUnitType
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import androidx.navigation.compose.NavHost
@@ -297,33 +299,30 @@ fun Settings() {
     }
 }
 
-@Composable
-fun Greeting(name: String) {
-    Text(text = "Hello $name!")
-}
-
-@Preview(showBackground = true)
-@Composable
-fun DefaultPreview() {
-    AlarmClockConfiguratorTheme {
-        Greeting("Helmut")
-    }
-}
-
+@OptIn(ExperimentalUnitApi::class)
 @RequiresApi(Build.VERSION_CODES.TIRAMISU)
 @Composable
 fun WeekDayElement(weekDay: DayOfWeek, cache: WakeupTimeCache<DayOfWeek>) {
     Column {
         Row {
+            Column(Modifier.fillMaxWidth(0.35F)) {
+                Text(
+                    text = weekDay.getDisplayName(TextStyle.FULL, Locale.ENGLISH) + ":",
+                    fontSize = TextUnit(
+                        25F, TextUnitType.Sp
+                    )
+                )
+            }
+            Column() {
+                WakeupTimeTextField(weekDay, cache)
+            }
 
-            Text(text = weekDay.getDisplayName(TextStyle.FULL, Locale.ENGLISH))
-            WakeupTimeTextField(weekDay, cache)
         }
     }
 }
 
 @RequiresApi(Build.VERSION_CODES.TIRAMISU)
-@OptIn(ExperimentalFoundationApi::class)
+@OptIn(ExperimentalFoundationApi::class, ExperimentalUnitApi::class)
 @Composable
 fun WakeupTimeTextField(dayOfWeek: DayOfWeek, cache: WakeupTimeCache<DayOfWeek>) {
     val viewModel = remember {
@@ -347,7 +346,8 @@ fun WakeupTimeTextField(dayOfWeek: DayOfWeek, cache: WakeupTimeCache<DayOfWeek>)
                 onLongClick = {
                     dropDownExpanded = true
                 })
-            .background(backGroundColor)
+            .background(backGroundColor),
+        fontSize = TextUnit(25F, TextUnitType.Sp)
     )
 
     if (showTimePickerDialog) {
@@ -420,7 +420,7 @@ fun NavigationBar(navController: NavController) {
     var expanded by remember {
         mutableStateOf(false)
     }
-    TopAppBar(title = { Text(text = "Hello") }, navigationIcon = {
+    TopAppBar(title = { }, navigationIcon = {
         IconButton(onClick = {
             expanded = true
         }) {

+ 2 - 2
build.gradle

@@ -8,8 +8,8 @@ buildscript {
     }
 }// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.4.1' apply false
-    id 'com.android.library' version '7.4.1' apply false
+    id 'com.android.application' version '7.4.2' apply false
+    id 'com.android.library' version '7.4.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
     id 'org.jetbrains.kotlin.multiplatform' version '1.8.10'
     id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.10'