From 7ed68bedc71df9166db831318bd67f5cee528769 Mon Sep 17 00:00:00 2001
From: Patryk Michalik <contact@patrykmichalik.com>
Date: Thu, 3 Feb 2022 10:56:39 +0100
Subject: [PATCH] Refine UI

---
 .../lawnchair/ui/preferences/FontSelectionPreference.kt   | 8 +++++++-
 .../app/lawnchair/ui/preferences/IconPickerPreference.kt  | 8 +++++++-
 .../app/lawnchair/ui/util/ProvideBottomSheetHandler.kt    | 8 +++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/lawnchair/src/app/lawnchair/ui/preferences/FontSelectionPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/FontSelectionPreference.kt
index d1337cdc37..12db7e0bbd 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/FontSelectionPreference.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/FontSelectionPreference.kt
@@ -3,6 +3,7 @@ package app.lawnchair.ui.preferences
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
+import androidx.compose.material.ContentAlpha
 import androidx.compose.material.DropdownMenu
 import androidx.compose.material.DropdownMenuItem
 import androidx.compose.material.RadioButton
@@ -72,7 +73,12 @@ fun FontSelection(fontPref: BasePreferenceManager.FontPref) {
                 onValueChange = { searchQuery = it },
                 modifier = Modifier
                     .fillMaxSize(),
-                placeholder = { Text(text = stringResource(id = R.string.label_search)) },
+                placeholder = {
+                    Text(
+                        text = stringResource(id = R.string.label_search),
+                        color = MaterialTheme.colorScheme.onSurface.copy(alpha = ContentAlpha.medium),
+                    )
+                },
                 singleLine = true
             )
         },
diff --git a/lawnchair/src/app/lawnchair/ui/preferences/IconPickerPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/IconPickerPreference.kt
index b6e60399e9..70d0e21c6a 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/IconPickerPreference.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/IconPickerPreference.kt
@@ -14,6 +14,7 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
+import androidx.compose.material.ContentAlpha
 import androidx.compose.material.DropdownMenuItem
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -94,7 +95,12 @@ fun IconPickerPreference(packageName: String) {
                 value = searchQuery,
                 onValueChange = { searchQuery = it },
                 modifier = Modifier.fillMaxSize(),
-                placeholder = { Text(iconPack.label) },
+                placeholder = {
+                    Text(
+                        text = iconPack.label,
+                        color = MaterialTheme.colorScheme.onSurface.copy(alpha = ContentAlpha.medium),
+                    )
+                },
                 singleLine = true
             )
         },
diff --git a/lawnchair/src/app/lawnchair/ui/util/ProvideBottomSheetHandler.kt b/lawnchair/src/app/lawnchair/ui/util/ProvideBottomSheetHandler.kt
index 1dcea79845..cf8579ee42 100644
--- a/lawnchair/src/app/lawnchair/ui/util/ProvideBottomSheetHandler.kt
+++ b/lawnchair/src/app/lawnchair/ui/util/ProvideBottomSheetHandler.kt
@@ -18,6 +18,7 @@ package app.lawnchair.ui.util
 
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.ModalBottomSheetLayout
 import androidx.compose.material.ModalBottomSheetState
@@ -33,6 +34,7 @@ import androidx.compose.ui.unit.dp
 import com.google.accompanist.insets.LocalWindowInsets
 import kotlinx.coroutines.launch
 import kotlin.math.max
+import androidx.compose.material.MaterialTheme as Material2Theme
 
 internal val LocalBottomSheetHandler = staticCompositionLocalOf { BottomSheetHandler() }
 
@@ -73,7 +75,11 @@ fun ProvideBottomSheetHandler(
                 }
             }
         },
-        sheetState = bottomSheetState
+        sheetState = bottomSheetState,
+        sheetShape = Material2Theme.shapes.large.copy(
+            bottomStart = CornerSize(0.dp),
+            bottomEnd = CornerSize(0.dp),
+        ),
     ) {
         CompositionLocalProvider(LocalBottomSheetHandler provides bottomSheetHandler) {
             content()