From b866d5450395bee797a0cd63dbc248cab23fcb4c Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Fri, 10 Jun 2022 19:41:34 +0200 Subject: [PATCH] Change banner appearance --- .../java/de/mm20/launcher2/ui/component/Banner.kt | 15 +++++---------- .../ui/component/MissingPermissionBanner.kt | 4 ++-- .../search/appshortcuts/AppShortcutResults.kt | 3 ++- .../launcher/search/calendar/CalendarResults.kt | 3 ++- .../ui/launcher/search/contacts/ContactResults.kt | 3 ++- .../ui/launcher/search/files/FileResults.kt | 3 ++- .../ui/launcher/widgets/weather/WeatherWidget.kt | 2 +- 7 files changed, 16 insertions(+), 17 deletions(-) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/Banner.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/Banner.kt index e4d9a7be..4bebae26 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/Banner.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/Banner.kt @@ -2,10 +2,7 @@ package de.mm20.launcher2.ui.component import androidx.compose.foundation.layout.* import androidx.compose.foundation.shape.RoundedCornerShape -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.ui.Alignment import androidx.compose.ui.Modifier @@ -13,6 +10,7 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp +@OptIn(ExperimentalMaterial3Api::class) @Composable fun Banner( modifier: Modifier = Modifier, @@ -21,12 +19,9 @@ fun Banner( primaryAction: @Composable () -> Unit, secondaryAction: @Composable () -> Unit = {} ) { - Surface( + Card( modifier = modifier, - color = MaterialTheme.colorScheme.secondaryContainer, - shape = RoundedCornerShape(8.dp), - shadowElevation = 2.dp, - tonalElevation = 2.dp + shape = MaterialTheme.shapes.small, ) { Column { Row( @@ -44,7 +39,7 @@ fun Banner( .weight(1f) .padding(vertical = 16.dp) .padding(end = 16.dp), - style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.Medium) + style = MaterialTheme.typography.labelMedium ) } Row( diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/MissingPermissionBanner.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/MissingPermissionBanner.kt index 73811611..c7c607df 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/MissingPermissionBanner.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/MissingPermissionBanner.kt @@ -3,8 +3,8 @@ package de.mm20.launcher2.ui.component import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.Lock +import androidx.compose.material3.Button import androidx.compose.material3.Text -import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource @@ -23,7 +23,7 @@ fun MissingPermissionBanner( text = text, icon = Icons.Rounded.Lock, primaryAction = { - TextButton( + Button( modifier = Modifier.padding(start = 8.dp), onClick = onClick ) { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/appshortcuts/AppShortcutResults.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/appshortcuts/AppShortcutResults.kt index 71f77f80..4fa61575 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/appshortcuts/AppShortcutResults.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/appshortcuts/AppShortcutResults.kt @@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable @@ -44,7 +45,7 @@ fun ColumnScope.AppShortcutResults(reverse: Boolean = false) { onClick = { viewModel.requestAppShortcutPermission(context as AppCompatActivity) }, modifier = Modifier.padding(16.dp), secondaryAction = { - TextButton(onClick = { + OutlinedButton(onClick = { viewModel.disableAppShortcutSearch() }) { Text( diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarResults.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarResults.kt index 7c19fb39..c927518e 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarResults.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarResults.kt @@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable @@ -44,7 +45,7 @@ fun ColumnScope.CalendarResults(reverse: Boolean = false) { onClick = { viewModel.requestCalendarPermission(context as AppCompatActivity) }, modifier = Modifier.padding(16.dp), secondaryAction = { - TextButton(onClick = { + OutlinedButton(onClick = { viewModel.disableCalendarSearch() }) { Text( diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactResults.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactResults.kt index 5321abf7..b671bcd2 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactResults.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactResults.kt @@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable @@ -44,7 +45,7 @@ fun ColumnScope.ContactResults(reverse: Boolean = false) { onClick = { viewModel.requestContactsPermission(context as AppCompatActivity) }, modifier = Modifier.padding(16.dp), secondaryAction = { - TextButton(onClick = { + OutlinedButton(onClick = { viewModel.disableContactsSearch() }) { Text( diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileResults.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileResults.kt index 5c9253c6..bc026f3f 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileResults.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileResults.kt @@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable @@ -44,7 +45,7 @@ fun ColumnScope.FileResults(reverse: Boolean = false) { onClick = { viewModel.requestFilesPermission(context as AppCompatActivity) }, modifier = Modifier.padding(16.dp), secondaryAction = { - TextButton(onClick = { + OutlinedButton(onClick = { viewModel.disableFilesSearch() }) { Text( diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt index e056f08b..b498a9bb 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt @@ -69,7 +69,7 @@ fun WeatherWidget() { viewModel.requestLocationPermission(context as AppCompatActivity) }, secondaryAction = { - TextButton(onClick = { + OutlinedButton(onClick = { showLocationDialog = true }) { Text(