|
@@ -43,6 +43,7 @@ import androidx.compose.material.icons.filled.DarkMode
|
|
|
import androidx.compose.material.icons.filled.Language
|
|
|
import androidx.compose.material.icons.filled.RocketLaunch
|
|
|
import androidx.compose.material3.AlertDialog
|
|
|
+import androidx.compose.material3.BottomSheetDefaults
|
|
|
import androidx.compose.material3.Button
|
|
|
import androidx.compose.material3.ButtonDefaults
|
|
|
import androidx.compose.material3.DockedSearchBar
|
|
@@ -737,6 +738,11 @@ fun ColumnScope.AddRowSettingsColumn(
|
|
|
ModalBottomSheet(
|
|
|
onDismissRequest = { isSheetOpen = false },
|
|
|
sheetState = sheetState,
|
|
|
+ dragHandle = {
|
|
|
+ BottomSheetDefaults.DragHandle(
|
|
|
+ color = MaterialTheme.colorScheme.primary,
|
|
|
+ )
|
|
|
+ },
|
|
|
containerColor = MaterialTheme.colorScheme.onBackground
|
|
|
) {
|
|
|
Box(
|
|
@@ -941,6 +947,11 @@ fun AddRowDarkLightTheme(
|
|
|
ModalBottomSheet(
|
|
|
onDismissRequest = { isThemeSheetOpen = false
|
|
|
},
|
|
|
+ dragHandle = {
|
|
|
+ BottomSheetDefaults.DragHandle(
|
|
|
+ color = MaterialTheme.colorScheme.primary,
|
|
|
+ )
|
|
|
+ },
|
|
|
sheetState = sheetState,
|
|
|
containerColor = MaterialTheme.colorScheme.onBackground
|
|
|
) {
|
|
@@ -1117,6 +1128,11 @@ fun SelectLanguage(
|
|
|
ModalBottomSheet(
|
|
|
onDismissRequest = { isLanguageSheetOpen = false
|
|
|
},
|
|
|
+ dragHandle = {
|
|
|
+ BottomSheetDefaults.DragHandle(
|
|
|
+ color = MaterialTheme.colorScheme.primary,
|
|
|
+ )
|
|
|
+ },
|
|
|
sheetState = sheetState,
|
|
|
containerColor = MaterialTheme.colorScheme.onBackground
|
|
|
) {
|
|
@@ -1307,9 +1323,15 @@ fun ColumnScope.AddRowSettingsSmart(
|
|
|
mutableStateOf(basePreferenceHelper.getSmartList()) }
|
|
|
|
|
|
ModalBottomSheet(
|
|
|
- onDismissRequest = { isSmartSheetOpen = false
|
|
|
+ onDismissRequest = {
|
|
|
+ isSmartSheetOpen = false
|
|
|
BottomBarScreen.Settings.isTrue = false
|
|
|
- },
|
|
|
+ },
|
|
|
+ dragHandle = {
|
|
|
+ BottomSheetDefaults.DragHandle(
|
|
|
+ color = MaterialTheme.colorScheme.primary,
|
|
|
+ )
|
|
|
+ },
|
|
|
sheetState = sheetState,
|
|
|
containerColor = MaterialTheme.colorScheme.onBackground
|
|
|
) {
|
|
@@ -1422,6 +1444,11 @@ fun ColumnScope.AddRowSettingsSmart(
|
|
|
},
|
|
|
sheetState = sheetStateAny,
|
|
|
containerColor = MaterialTheme.colorScheme.onBackground,
|
|
|
+ dragHandle = {
|
|
|
+ BottomSheetDefaults.DragHandle(
|
|
|
+ color = MaterialTheme.colorScheme.primary,
|
|
|
+ )
|
|
|
+ },
|
|
|
modifier = Modifier
|
|
|
.padding(top = 15.dp)
|
|
|
.fillMaxSize()
|
|
@@ -1475,28 +1502,28 @@ fun ColumnScope.AddRowSettingsSmart(
|
|
|
Text(
|
|
|
text = "Search Location",
|
|
|
style = MaterialTheme.typography.displaySmall,
|
|
|
- color = colorResource(id = R.color.dark_blue_gray_text)
|
|
|
+ color = MaterialTheme.colorScheme.primary
|
|
|
)
|
|
|
},
|
|
|
leadingIcon = {
|
|
|
Icon(
|
|
|
painter = painterResource(id = R.drawable.search3x),
|
|
|
contentDescription = "Search Icon",
|
|
|
-
|
|
|
+ tint = MaterialTheme.colorScheme.primary,
|
|
|
modifier = Modifier
|
|
|
.size(21.dp)
|
|
|
)
|
|
|
},
|
|
|
colors = SearchBarDefaults.colors(
|
|
|
- containerColor = colorResource(id = R.color.white),
|
|
|
+ containerColor = MaterialTheme.colorScheme.onBackground,
|
|
|
dividerColor = Color.Transparent,
|
|
|
inputFieldColors = TextFieldDefaults.colors(
|
|
|
- focusedTextColor = colorResource(id = R.color.dark_blue_gray_text),
|
|
|
- unfocusedTextColor = colorResource(id = R.color.dark_blue_gray_text),
|
|
|
- unfocusedIndicatorColor = colorResource(id = R.color.dark_blue_gray_text),
|
|
|
- focusedIndicatorColor = colorResource(id = R.color.dark_blue_gray_text),
|
|
|
- disabledIndicatorColor = colorResource(id = R.color.dark_blue_gray_text),
|
|
|
- cursorColor = colorResource(id = R.color.dark_blue_gray_text),
|
|
|
+ focusedTextColor = MaterialTheme.colorScheme.primary,
|
|
|
+ unfocusedTextColor = MaterialTheme.colorScheme.primary,
|
|
|
+ unfocusedIndicatorColor = MaterialTheme.colorScheme.primary,
|
|
|
+ focusedIndicatorColor = MaterialTheme.colorScheme.primary,
|
|
|
+ disabledIndicatorColor = MaterialTheme.colorScheme.primary,
|
|
|
+ cursorColor = MaterialTheme.colorScheme.primary,
|
|
|
)
|
|
|
),
|
|
|
modifier = Modifier
|