|
@@ -124,7 +124,6 @@ fun ServerList(
|
|
|
.background(
|
|
|
color = MaterialTheme.colorScheme.background
|
|
|
)
|
|
|
-
|
|
|
) {
|
|
|
HeaderRowSL(navHostController = navHostController)
|
|
|
Column(
|
|
@@ -161,7 +160,7 @@ fun ServerList(
|
|
|
|
|
|
TabRow(
|
|
|
selectedTabIndex = selectedIndex,
|
|
|
- containerColor = Color.White,
|
|
|
+ containerColor = MaterialTheme.colorScheme.onBackground,
|
|
|
modifier = Modifier
|
|
|
.fillMaxWidth()
|
|
|
.padding(top = 16.dp)
|
|
@@ -183,8 +182,8 @@ fun ServerList(
|
|
|
|
|
|
// val color = remember { Animatable(Color.White) }
|
|
|
var colorTab by remember { mutableStateOf(Color.White) }
|
|
|
- colorTab = if (selectedIndex == index) Color(0xFFE9EDF9)
|
|
|
- else Color.White
|
|
|
+ colorTab = if (selectedIndex == index) MaterialTheme.colorScheme.surfaceDim
|
|
|
+ else MaterialTheme.colorScheme.onBackground
|
|
|
|
|
|
// LaunchedEffect(key1 = selectedIndex == index) {
|
|
|
// color.animateTo(
|
|
@@ -204,7 +203,8 @@ fun ServerList(
|
|
|
unselectedContentColor = Color.White,
|
|
|
text = { Text(text = currentTab,
|
|
|
style = MaterialTheme.typography.headlineMedium,
|
|
|
- color = colorResource(id = R.color.dark_blue_gray_text),
|
|
|
+ color = if (selectedIndex == index) MaterialTheme.colorScheme.primary
|
|
|
+ else MaterialTheme.colorScheme.onTertiary,
|
|
|
) },
|
|
|
modifier = Modifier
|
|
|
.padding(
|
|
@@ -220,7 +220,6 @@ fun ServerList(
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
HorizontalPager(
|
|
|
state = pagerState,
|
|
|
modifier = Modifier
|
|
@@ -847,14 +846,13 @@ fun ColumnScope.ShowSearchBar(
|
|
|
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",
|
|
|
-
|
|
|
modifier = Modifier
|
|
|
.size(21.dp)
|
|
|
)
|
|
@@ -864,14 +862,14 @@ fun ColumnScope.ShowSearchBar(
|
|
|
Icon(
|
|
|
painter = painterResource(id = R.drawable.filter3x),
|
|
|
contentDescription = "Search Icon",
|
|
|
- tint = colorResource(id = R.color.dark_blue_gray_text),
|
|
|
+ tint = MaterialTheme.colorScheme.primary,
|
|
|
modifier = Modifier
|
|
|
.size(24.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),
|
|
@@ -904,7 +902,7 @@ fun ColumnScope.ShowSearchBar(
|
|
|
ModalBottomSheet(
|
|
|
onDismissRequest = { isFilter = false },
|
|
|
sheetState = sheetState,
|
|
|
- containerColor = MaterialTheme.colorScheme.background
|
|
|
+ containerColor = MaterialTheme.colorScheme.onBackground
|
|
|
) {
|
|
|
Box(modifier = Modifier
|
|
|
.background(Color.Transparent)
|