Merge pull request #176 from carstenhag/feature/148-improve-landscape…

…-support Improve landscape support
EmmaTellblom · Nov 8, 2024 · a6dd180 · a6dd180
2 parents 67aab35 + 0bd7bd5
commit a6dd180
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 23 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -11,7 +11,7 @@ android {
     defaultConfig {
         applicationId = "com.mensinator.app"
         minSdk = 26
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 20
         versionName = "1.9.1"
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -13,12 +13,10 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Mensinator"
-        tools:targetApi="31">
+        android:theme="@style/Theme.Mensinator">
         <activity
             android:name=".MainActivity"
-            android:exported="true"
-            android:theme="@style/Theme.Mensinator">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/app/src/main/java/com/mensinator/app/CalendarScreen.kt b/app/src/main/java/com/mensinator/app/CalendarScreen.kt
@@ -185,10 +185,11 @@ fun CalendarScreen(
     Column(
         modifier = Modifier
             .fillMaxSize()
-            .padding(16.dp)
             .verticalScroll(rememberScrollState())
-    )
-    {
+            .displayCutoutPadding()
+            .statusBarsPadding()
+            .padding(16.dp)
+    ) {
         Row(
             modifier = Modifier.fillMaxWidth(),
             verticalAlignment = Alignment.CenterVertically,

diff --git a/app/src/main/java/com/mensinator/app/ManageSymptomScreen.kt b/app/src/main/java/com/mensinator/app/ManageSymptomScreen.kt
@@ -7,10 +7,13 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.displayCutoutPadding
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -69,8 +72,10 @@ fun ManageSymptomScreen(
     Column(
         modifier = Modifier
             .fillMaxSize()
-            .padding(15.dp)
-            .verticalScroll(rememberScrollState()),  // Make the column scrollable
+            .verticalScroll(rememberScrollState())  // Make the column scrollable
+            .displayCutoutPadding()
+            .statusBarsPadding()
+            .padding(16.dp),
         verticalArrangement = Arrangement.Top,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
@@ -262,6 +267,7 @@ fun ManageSymptomScreen(
                 }
             }
         }
+        Spacer(modifier = Modifier.height(50.dp)) // To be able to overscroll the list, to not have the FloatingActionButton overlapping
     }
     if (showCreateSymptom.value) {
         CreateNewSymptomDialog(

diff --git a/app/src/main/java/com/mensinator/app/SettingsScreen.kt b/app/src/main/java/com/mensinator/app/SettingsScreen.kt
@@ -16,16 +16,16 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.core.app.NotificationManagerCompat
 import com.mensinator.app.data.DataSource
 import com.mensinator.app.ui.theme.isDarkMode
@@ -99,10 +99,11 @@ fun SettingsScreen(onSwitchProtectionScreen: (Boolean) -> Unit) {
         modifier = Modifier
             .fillMaxSize()
             .verticalScroll(rememberScrollState())
+            .displayCutoutPadding()
+            .statusBarsPadding(),
     ) {//we have 2 columns so the scroll animation does get cut by the padding of the second column
         Column(
-            modifier = Modifier
-                .padding(16.dp),
+            modifier = Modifier.padding(16.dp),
             verticalArrangement = Arrangement.Center,
             horizontalAlignment = Alignment.Start
         ) {

diff --git a/app/src/main/java/com/mensinator/app/StatisticsScreen.kt b/app/src/main/java/com/mensinator/app/StatisticsScreen.kt
@@ -4,9 +4,11 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.displayCutoutPadding
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Text
@@ -15,10 +17,10 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import java.time.LocalDate
 
 @Composable
@@ -46,6 +48,8 @@ fun StatisticsScreen(
         modifier = Modifier
             .fillMaxSize()
             .verticalScroll(scrollState)
+            .displayCutoutPadding()
+            .statusBarsPadding()
             .padding(16.dp)
     ) {
         Text(

diff --git a/app/src/main/java/com/mensinator/app/SymptomDialogs.kt b/app/src/main/java/com/mensinator/app/SymptomDialogs.kt
@@ -2,6 +2,8 @@ package com.mensinator.app
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
@@ -57,7 +59,7 @@ fun SymptomsDialog(
             Text(text = stringResource(id = R.string.symptoms_dialog_title, date))
         },
         text = {
-            Column {
+            Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
                 symptoms.forEach { symptom ->
                     val symptomKey = ResourceMapper.getStringResourceId(symptom.name)
                     val symptomDisplayName = symptomKey?.let { stringResource(id = it) } ?: symptom.name
@@ -180,7 +182,6 @@ fun RenameSymptomDialog(
                 )
             }
         },
-
     )
 }
 

diff --git a/app/src/main/java/com/mensinator/app/navigation/BottomBar.kt b/app/src/main/java/com/mensinator/app/navigation/BottomBar.kt
@@ -4,6 +4,8 @@ import android.util.Log
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.displayCutoutPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
@@ -92,7 +94,9 @@ fun MensinatorBottomBar(
                 FloatingActionButton(
                     onClick = { showCreateSymptom.value = true },
                     shape = CircleShape,
-                    modifier = Modifier.padding(5.dp)
+                    modifier = Modifier
+                        .displayCutoutPadding()
+                        .padding(5.dp)
                 ) {
                     Icon(
                         imageVector = Icons.Default.Add,
@@ -178,7 +182,8 @@ fun MensinatorBottomBar(
                     )
                 }
             }
-        }
+        },
+        contentWindowInsets = WindowInsets(0, 0, 0, 0) // We want to handle insets ourselves at child screens
     ) { paddingValues ->
         NavHost(
             navController = navController,