app: UI tweaks

Lastaapps · Feb 12, 2022 · 0e43d3a · 0e43d3a
1 parent 625a971
commit 0e43d3a
Show file tree

Hide file tree

Showing 23 changed files with 294 additions and 122 deletions.
diff --git a/PRIVACY_POLICY b/PRIVACY_POLICY
@@ -1 +1,2 @@
-Menza app doesn't collect any personal data, everything you do stays on your device.
+Menza app doesn't collect any personal data, everything you do in this app stays on your device.
+It is provided with no warranty what so ever.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -130,7 +130,7 @@ dependencies {
     implementation(Libs.KOTLINX_DATETIME)
     implementation(Libs.SKRAPE_IT)
     implementation(Libs.COIL_COMPOSE_COMPLETE)
-    implementation("com.github.Lastaapps:OssLicenseAccess:1.0")
+    implementation(Libs.OSS_LICENSE_ACCESSOR)
 
 }
 

diff --git a/app/src/debug/res/values/launcher_colors.xml b/app/src/debug/res/values/launcher_colors.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~    Copyright 2022, Petr Laštovička as Lasta apps, All rights reserved
+  ~
+  ~     This file is part of Menza.
+  ~
+  ~     Menza is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Menza is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with Menza.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<!-- Used to differentiate debug/release versions -->
+<resources>
+    <color name="ic_launcher_foreground">#FFFFFF</color>
+    <color name="ic_launcher_background">#2196F3</color>
+</resources>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -31,6 +31,14 @@
         </intent>
     </queries>
 
+    <supports-screens
+        android:resizeable="true"
+        android:smallScreens="true"
+        android:normalScreens="true"
+        android:largeScreens="true"
+        android:xlargeScreens="true"
+        android:anyDensity="true" />
+
     <application
         android:name=".App"
         android:allowBackup="true"

diff --git a/app/src/main/kotlin/cz/lastaapps/menza/init/InitUI.kt b/app/src/main/kotlin/cz/lastaapps/menza/init/InitUI.kt
@@ -22,6 +22,7 @@ package cz.lastaapps.menza.init
 import androidx.compose.animation.animateContentSize
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Refresh
 import androidx.compose.material3.*
@@ -91,6 +92,7 @@ private fun InitContent(viewModel: InitViewModel, modifier: Modifier = Modifier)
             )
             Surface(
                 color = MaterialTheme.colorScheme.primaryContainer,
+                shape = RoundedCornerShape(16.dp),
                 modifier = Modifier
                     .animateContentSize()
                     .fillMaxWidth(),

diff --git a/app/src/main/kotlin/cz/lastaapps/menza/ui/dests/info/Contact.kt b/app/src/main/kotlin/cz/lastaapps/menza/ui/dests/info/Contact.kt
@@ -61,6 +61,7 @@ fun ContactList(
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ContactUI(
     contact: Contact,
@@ -69,9 +70,9 @@ fun ContactUI(
     if (contact.name == null && contact.role == null)
         return
 
-    Surface(
+    Card(
         modifier,
-        color = MaterialTheme.colorScheme.primaryContainer,
+        containerColor = MaterialTheme.colorScheme.primaryContainer,
     ) {
         val context = LocalContext.current
         val snackbar = LocalSnackbarProvider.current

diff --git a/app/src/main/kotlin/cz/lastaapps/menza/ui/dests/info/Message.kt b/app/src/main/kotlin/cz/lastaapps/menza/ui/dests/info/Message.kt
@@ -23,8 +23,9 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Card
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -51,9 +52,10 @@ fun MessageList(
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun Message(message: Message, modifier: Modifier = Modifier) {
-    Surface(color = MaterialTheme.colorScheme.primaryContainer, modifier = modifier) {
+    Card(containerColor = MaterialTheme.colorScheme.primaryContainer, modifier = modifier) {
         Text(message.message, modifier = Modifier.padding(8.dp))
     }
 }
diff --git a/app/src/main/kotlin/cz/lastaapps/menza/ui/dests/info/OpeningHours.kt b/app/src/main/kotlin/cz/lastaapps/menza/ui/dests/info/OpeningHours.kt
@@ -22,8 +22,9 @@ package cz.lastaapps.menza.ui.dests.info
 import android.os.Build
 import android.text.format.DateFormat
 import androidx.compose.foundation.layout.*
+import androidx.compose.material3.Card
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
@@ -57,6 +58,7 @@ fun OpeningHoursList(
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun OpeningHoursLocationUI(
     data: OpeningLocation,
@@ -72,7 +74,7 @@ fun OpeningHoursLocationUI(
         DateTimeFormatter.ofPattern(patter)
     }
 
-    Surface(color = MaterialTheme.colorScheme.primaryContainer, modifier = modifier) {
+    Card(containerColor = MaterialTheme.colorScheme.primaryContainer, modifier = modifier) {
         Column(
             verticalArrangement = Arrangement.spacedBy(8.dp),
             modifier = Modifier.padding(8.dp),

diff --git a/app/src/main/kotlin/cz/lastaapps/menza/ui/dests/others/About.kt b/app/src/main/kotlin/cz/lastaapps/menza/ui/dests/others/About.kt
@@ -26,6 +26,7 @@ import androidx.annotation.StringRes
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Code
 import androidx.compose.material.icons.filled.Description
 import androidx.compose.material.icons.filled.Language
 import androidx.compose.material.icons.filled.LocalFireDepartment
@@ -46,6 +47,7 @@ import cz.lastaapps.common.R
 import cz.lastaapps.menza.BuildConfig
 import cz.lastaapps.menza.navigation.Dest
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun AboutUi(
     navController: NavController,
@@ -71,61 +73,25 @@ fun AboutUi(
                 }
             }
 
-            Surface(
-                modifier = Modifier.fillMaxWidth(),
-                color = MaterialTheme.colorScheme.primaryContainer
-            ) {
+            ElevatedCard {
                 Column(
                     Modifier
                         .padding(16.dp)
-                        .width(IntrinsicSize.Max),
+                        .align(Alignment.CenterHorizontally),
                     horizontalAlignment = Alignment.CenterHorizontally,
                     verticalArrangement = Arrangement.spacedBy(8.dp),
                 ) {
                     DataSource(Modifier.fillMaxWidth())
-
-                    OutlinedButton(
-                        modifier = Modifier.fillMaxWidth(),
-                        onClick = {
-                            navController.navigate(Dest.R.license)
-                        }
-                    ) {
-                        IconAndText({
-                            Icon(Icons.Default.Description, null)
-                        }, {
-                            Text(
-                                text = stringResource(cz.lastaapps.menza.R.string.about_license_notices),
-                                textAlign = TextAlign.Center
-                            )
-                        })
-                    }
-                    OutlinedButton(
-                        modifier = Modifier.fillMaxWidth(),
-                        onClick = {
-                            navController.navigate(Dest.R.osturak)
-                        }
-                    ) {
-                        IconAndText({
-                            Icon(Icons.Default.LocalFireDepartment, null)
-                        }, {
-                            Text(
-                                text = stringResource(cz.lastaapps.menza.R.string.about_osturak),
-                                textAlign = TextAlign.Center,
-                                maxLines = 1
-                            )
-                        })
-                    }
+                    LicenseButton(navController, Modifier.fillMaxWidth())
+                    OsturakButton(navController, Modifier.fillMaxWidth())
                     ViewSource(Modifier.fillMaxWidth())
                 }
             }
-            Surface(
-                modifier = Modifier.fillMaxWidth(),
-                color = MaterialTheme.colorScheme.tertiaryContainer
-            ) {
+            ElevatedCard(Modifier.fillMaxWidth()) {
                 Socials(Modifier.padding(16.dp))
             }
-            Surface(modifier = Modifier.fillMaxWidth()) {
-                AppInfo(modifier = Modifier.padding(8.dp))
+            Surface(Modifier.fillMaxWidth()) {
+                AppInfo(Modifier.padding(8.dp))
             }
         }
     }
@@ -165,6 +131,44 @@ private fun DataSource(modifier: Modifier = Modifier) {
     }
 }
 
+@Composable
+private fun LicenseButton(navController: NavController, modifier: Modifier = Modifier) {
+    OutlinedButton(
+        modifier = modifier,
+        onClick = {
+            navController.navigate(Dest.R.license)
+        }
+    ) {
+        IconAndText({
+            Icon(Icons.Default.Description, null)
+        }, {
+            Text(
+                text = stringResource(cz.lastaapps.menza.R.string.about_license_notices),
+                textAlign = TextAlign.Center
+            )
+        })
+    }
+}
+
+@Composable
+private fun OsturakButton(navController: NavController, modifier: Modifier = Modifier) {
+    OutlinedButton(
+        modifier = modifier,
+        onClick = {
+            navController.navigate(Dest.R.osturak)
+        }
+    ) {
+        IconAndText({
+            Icon(Icons.Default.LocalFireDepartment, null)
+        }, {
+            Text(
+                text = stringResource(cz.lastaapps.menza.R.string.about_osturak),
+                textAlign = TextAlign.Center,
+            )
+        })
+    }
+}
+
 @Composable
 private fun ViewSource(modifier: Modifier = Modifier) {
     val context = LocalContext.current
@@ -174,8 +178,8 @@ private fun ViewSource(modifier: Modifier = Modifier) {
     ) {
         IconAndText(
             icon = {
-                Image(
-                    painterResource(R.drawable.ic_github),
+                Icon(
+                    Icons.Default.Code,
                     stringResource(R.string.content_description_github_project)
                 )
             },

diff --git a/app/src/main/kotlin/cz/lastaapps/menza/ui/dests/others/license/LicenseList.kt b/app/src/main/kotlin/cz/lastaapps/menza/ui/dests/others/license/LicenseList.kt
@@ -19,13 +19,12 @@
 
 package cz.lastaapps.menza.ui.dests.others.license
 
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedButton
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
+import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -77,21 +76,23 @@ fun LicenseList(
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun Artifact(
     artifact: ArtifactLicense,
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    Surface(
-        modifier = modifier,
-        color = MaterialTheme.colorScheme.primaryContainer,
-        onClick = onClick,
+    val interaction = remember { MutableInteractionSource() }
+    ElevatedCard(
+        modifier = modifier.clickable(interaction, null, onClick = onClick),
+        interactionSource = interaction,
     ) {
         Box(
             Modifier
                 .padding(8.dp)
-                .defaultMinSize(minHeight = 32.dp),
+                .defaultMinSize(minHeight = 32.dp)
+                .align(Alignment.CenterHorizontally),
             contentAlignment = Alignment.CenterStart
         ) {
             Text(text = artifact.name)

diff --git a/app/src/main/kotlin/cz/lastaapps/menza/ui/dests/settings/modules/DarkThemeUI.kt b/app/src/main/kotlin/cz/lastaapps/menza/ui/dests/settings/modules/DarkThemeUI.kt
@@ -20,18 +20,19 @@
 package cz.lastaapps.menza.ui.dests.settings.modules
 
 import androidx.annotation.StringRes
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Brightness3
 import androidx.compose.material.icons.filled.BrightnessMedium
 import androidx.compose.material.icons.filled.WbSunny
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
+import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
@@ -109,6 +110,7 @@ fun DarkThemeSettings(viewModel: SettingsViewModel, modifier: Modifier = Modifie
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun ThemeItem(
     item: DarkThemeItem,
@@ -121,20 +123,22 @@ private fun ThemeItem(
     else
         MaterialTheme.colorScheme.tertiary
 
-    Surface(
-        color = color,
-        onClick = { onItemSelected() },
-        modifier = modifier,
+    val interaction = remember { MutableInteractionSource() }
+    Card(
+        containerColor = animateColorAsState(color).value,
+        contentColor = animateColorAsState(contentColorFor(color)).value,
+        interactionSource = interaction,
+        modifier = modifier.clickable(interaction, null, onClick = { onItemSelected() }),
     ) {
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterVertically),
-            modifier = Modifier.padding(4.dp),
+            modifier = Modifier
+                .padding(8.dp)
+                .align(Alignment.CenterHorizontally),
         ) {
-            Surface(color = color) {
-                Box(modifier = Modifier.size(48.dp), contentAlignment = Alignment.Center) {
-                    Icon(item.icon, stringResource(item.title))
-                }
+            Box(modifier = Modifier.size(48.dp), contentAlignment = Alignment.Center) {
+                Icon(item.icon, stringResource(item.title))
             }
             Text(stringResource(item.title))
         }