|
@@ -62,7 +62,7 @@ fun ServerListTV(navHostController: NavHostController) {
|
|
|
modifier = Modifier
|
|
|
.fillMaxSize()
|
|
|
.background(
|
|
|
- color = colorResource(id = R.color.background_color_gray)
|
|
|
+ color = MaterialTheme.colorScheme.background
|
|
|
)
|
|
|
.padding(bottom = 0.dp)
|
|
|
|
|
@@ -75,7 +75,7 @@ fun ServerListTV(navHostController: NavHostController) {
|
|
|
textChanged = it
|
|
|
},
|
|
|
textStyle = MaterialTheme.typography.customTypography.bodyMedium.copy(
|
|
|
- color = colorResource(id = R.color.dark_blue_gray_text)
|
|
|
+ color = MaterialTheme.colorScheme.primary
|
|
|
),
|
|
|
modifier = Modifier
|
|
|
.padding(top = 60.dp, end = 0.dp)
|
|
@@ -85,7 +85,7 @@ fun ServerListTV(navHostController: NavHostController) {
|
|
|
.height(50.dp)
|
|
|
.border(
|
|
|
1.dp,
|
|
|
- colorResource(id = R.color.white),
|
|
|
+ MaterialTheme.colorScheme.onBackground,
|
|
|
shape = RoundedCornerShape(24.dp)
|
|
|
)
|
|
|
.background(color = colorResource(id = R.color.transparent))
|
|
@@ -100,7 +100,7 @@ fun ServerListTV(navHostController: NavHostController) {
|
|
|
Text(
|
|
|
text = "Search Location",
|
|
|
style = MaterialTheme.typography.customTypography.titleSmall.copy(
|
|
|
- color = colorResource(id = R.color.dark_blue_gray_text),
|
|
|
+ color = MaterialTheme.colorScheme.primary,
|
|
|
fontSize = 14.sp
|
|
|
)
|
|
|
)
|
|
@@ -118,23 +118,23 @@ fun ServerListTV(navHostController: NavHostController) {
|
|
|
Icon(
|
|
|
painter = painterResource(id = R.drawable.search3x),
|
|
|
contentDescription = "Email Logo",
|
|
|
- tint = colorResource(id = R.color.dark_blue_gray_text),
|
|
|
+ tint = MaterialTheme.colorScheme.primary,
|
|
|
modifier = Modifier
|
|
|
.size(20.dp, 20.dp)
|
|
|
)
|
|
|
},
|
|
|
maxLines = 1,
|
|
|
colors = TextFieldDefaults.colors(
|
|
|
- focusedLabelColor = colorResource(id = R.color.dark_blue_gray_text),
|
|
|
- unfocusedTextColor = colorResource(id = R.color.dark_blue_gray_text),
|
|
|
- focusedTextColor = colorResource(id = R.color.dark_blue_gray_text),
|
|
|
- disabledTextColor = colorResource(id = R.color.dark_blue_gray_text),
|
|
|
- unfocusedContainerColor = colorResource(id = R.color.white),
|
|
|
- focusedContainerColor = colorResource(id = R.color.white),
|
|
|
+ focusedLabelColor = MaterialTheme.colorScheme.primary,
|
|
|
+ unfocusedTextColor = MaterialTheme.colorScheme.primary,
|
|
|
+ focusedTextColor = MaterialTheme.colorScheme.primary,
|
|
|
+ disabledTextColor = MaterialTheme.colorScheme.primary,
|
|
|
+ unfocusedContainerColor = MaterialTheme.colorScheme.onBackground,
|
|
|
+ focusedContainerColor = MaterialTheme.colorScheme.onBackground,
|
|
|
focusedIndicatorColor = colorResource(id = R.color.transparent),
|
|
|
disabledIndicatorColor = colorResource(id = R.color.transparent),
|
|
|
unfocusedIndicatorColor = colorResource(id = R.color.transparent),
|
|
|
- cursorColor = colorResource(id = R.color.dark_blue_gray_text),
|
|
|
+ cursorColor = MaterialTheme.colorScheme.primary,
|
|
|
),
|
|
|
keyboardOptions = KeyboardOptions(
|
|
|
keyboardType = KeyboardType.Email,
|
|
@@ -163,7 +163,7 @@ fun ServerListTV(navHostController: NavHostController) {
|
|
|
Text(
|
|
|
text = "Top Locations",
|
|
|
style = MaterialTheme.typography.labelLarge,
|
|
|
- color = colorResource(id = R.color.dark_blue_gray_text),
|
|
|
+ color = MaterialTheme.colorScheme.primary,
|
|
|
modifier = Modifier
|
|
|
.padding(top = 0.dp, start = 0.dp)
|
|
|
.focusable()
|
|
@@ -182,7 +182,7 @@ fun ServerListTV(navHostController: NavHostController) {
|
|
|
Text(
|
|
|
text = "Dedicated IP",
|
|
|
style = MaterialTheme.typography.labelLarge,
|
|
|
- color = colorResource(id = R.color.dark_blue_gray_text),
|
|
|
+ color = MaterialTheme.colorScheme.primary,
|
|
|
modifier = Modifier
|
|
|
.padding(top = topPadding, start = 0.dp)
|
|
|
)
|
|
@@ -200,7 +200,7 @@ fun ServerListTV(navHostController: NavHostController) {
|
|
|
Text(
|
|
|
text = "Streaming",
|
|
|
style = MaterialTheme.typography.labelLarge,
|
|
|
- color = colorResource(id = R.color.dark_blue_gray_text),
|
|
|
+ color = MaterialTheme.colorScheme.primary,
|
|
|
modifier = Modifier
|
|
|
.padding(top = topPadding, start = 0.dp)
|
|
|
)
|
|
@@ -218,7 +218,7 @@ fun ServerListTV(navHostController: NavHostController) {
|
|
|
Text(
|
|
|
text = "D-VPN",
|
|
|
style = MaterialTheme.typography.labelLarge,
|
|
|
- color = colorResource(id = R.color.dark_blue_gray_text),
|
|
|
+ color = MaterialTheme.colorScheme.primary,
|
|
|
modifier = Modifier
|
|
|
.padding(top = topPadding, start = 0.dp)
|
|
|
)
|
|
@@ -236,7 +236,7 @@ fun ServerListTV(navHostController: NavHostController) {
|
|
|
Text(
|
|
|
text = "P2P",
|
|
|
style = MaterialTheme.typography.labelLarge,
|
|
|
- color = colorResource(id = R.color.dark_blue_gray_text),
|
|
|
+ color = MaterialTheme.colorScheme.primary,
|
|
|
modifier = Modifier
|
|
|
.padding(top = topPadding, start = 0.dp)
|
|
|
)
|
|
@@ -379,8 +379,8 @@ fun BoxScope.HeaderRowSL(
|
|
|
) {
|
|
|
Text(text = title,
|
|
|
style = MaterialTheme.typography.bodyMedium,
|
|
|
-// color = MaterialTheme.colorScheme.primary,
|
|
|
- color = colorResource(id = R.color.dark_blue_gray_text),
|
|
|
+ color = MaterialTheme.colorScheme.primary,
|
|
|
+// color = colorResource(id = R.color.dark_blue_gray_text),
|
|
|
modifier = Modifier.fillMaxHeight()
|
|
|
)
|
|
|
}
|