|
@@ -15,6 +15,7 @@ import androidx.compose.foundation.layout.padding
|
|
|
import androidx.compose.foundation.layout.size
|
|
|
import androidx.compose.material.Surface
|
|
|
import androidx.compose.material3.Icon
|
|
|
+import androidx.compose.material3.MaterialTheme
|
|
|
import androidx.compose.material3.Scaffold
|
|
|
import androidx.compose.runtime.Composable
|
|
|
import androidx.compose.runtime.LaunchedEffect
|
|
@@ -188,7 +189,7 @@ fun BottomBarNavTV(
|
|
|
Box(
|
|
|
modifier = Modifier
|
|
|
.fillMaxWidth()
|
|
|
- .background(colorResource(id = R.color.background_color_gray)),
|
|
|
+ .background(MaterialTheme.colorScheme.background),
|
|
|
contentAlignment = Alignment.Center
|
|
|
) {
|
|
|
val iconSize = 45.dp
|
|
@@ -197,13 +198,13 @@ fun BottomBarNavTV(
|
|
|
.height(55.dp)
|
|
|
.fillMaxWidth(fraction = 0.4f)
|
|
|
.padding(horizontal = 0.dp)
|
|
|
- .background(colorResource(id = R.color.background_color_gray)),
|
|
|
+ .background(MaterialTheme.colorScheme.background),
|
|
|
horizontalArrangement = Arrangement.SpaceBetween,
|
|
|
verticalAlignment = Alignment.CenterVertically
|
|
|
) {
|
|
|
Surface(
|
|
|
color = if (isFirstItemFocused.value) Color.LightGray
|
|
|
- else colorResource(id = R.color.background_color_gray),
|
|
|
+ else MaterialTheme.colorScheme.background,
|
|
|
modifier = Modifier
|
|
|
.focusRequester(focusRequester1)
|
|
|
.onFocusChanged {
|
|
@@ -223,7 +224,7 @@ fun BottomBarNavTV(
|
|
|
}
|
|
|
) {
|
|
|
val color = if (selectedItemIndex.value == 0) colorResource(id = R.color.blue_text)
|
|
|
- else colorResource(id = R.color.dark_blue_gray_text)
|
|
|
+ else MaterialTheme.colorScheme.primary
|
|
|
val alpha = if (selectedItemIndex.value == 0) 1f else 0.5f
|
|
|
Icon(
|
|
|
painter = painterResource(id = screens[0].icon),
|
|
@@ -236,7 +237,7 @@ fun BottomBarNavTV(
|
|
|
)
|
|
|
}
|
|
|
Surface(
|
|
|
- color = if (isSecondItemFocused.value) Color.LightGray else colorResource(id = R.color.background_color_gray),
|
|
|
+ color = if (isSecondItemFocused.value) Color.LightGray else MaterialTheme.colorScheme.background,
|
|
|
modifier = Modifier
|
|
|
.focusRequester(focusRequester2)
|
|
|
.onFocusChanged {
|
|
@@ -256,7 +257,7 @@ fun BottomBarNavTV(
|
|
|
}
|
|
|
) {
|
|
|
val color = if (selectedItemIndex.value == 1) colorResource(id = R.color.blue_text)
|
|
|
- else colorResource(id = R.color.dark_blue_gray_text)
|
|
|
+ else MaterialTheme.colorScheme.primary
|
|
|
val alpha = if (selectedItemIndex.value == 1) 1f else 0.5f
|
|
|
Icon(
|
|
|
painter = painterResource(id = screens[1].icon),
|
|
@@ -270,7 +271,7 @@ fun BottomBarNavTV(
|
|
|
}
|
|
|
Surface(
|
|
|
color = if (isThirdItemFocused.value) Color.LightGray else
|
|
|
- colorResource(id = R.color.background_color_gray),
|
|
|
+ MaterialTheme.colorScheme.background,
|
|
|
modifier = Modifier
|
|
|
.focusRequester(focusRequester3)
|
|
|
.onFocusChanged {
|
|
@@ -290,7 +291,7 @@ fun BottomBarNavTV(
|
|
|
}
|
|
|
) {
|
|
|
val color = if (selectedItemIndex.value == 2) colorResource(id = R.color.blue_text)
|
|
|
- else colorResource(id = R.color.dark_blue_gray_text)
|
|
|
+ else MaterialTheme.colorScheme.primary
|
|
|
val alpha = if (selectedItemIndex.value == 2) 1f else 0.5f
|
|
|
Icon(
|
|
|
painter = painterResource(id = screens[2].icon),
|
|
@@ -304,7 +305,7 @@ fun BottomBarNavTV(
|
|
|
}
|
|
|
Surface(
|
|
|
color = if (isFourthItemFocused.value) Color.LightGray else
|
|
|
- colorResource(id = R.color.background_color_gray),
|
|
|
+ MaterialTheme.colorScheme.background,
|
|
|
modifier = Modifier
|
|
|
.focusRequester(focusRequester4)
|
|
|
.onFocusChanged {
|
|
@@ -323,7 +324,7 @@ fun BottomBarNavTV(
|
|
|
}
|
|
|
) {
|
|
|
val color = if (selectedItemIndex.value == 3) colorResource(id = R.color.blue_text)
|
|
|
- else colorResource(id = R.color.dark_blue_gray_text)
|
|
|
+ else MaterialTheme.colorScheme.primary
|
|
|
val alpha = if (selectedItemIndex.value == 3) 1f else 0.5f
|
|
|
Icon(
|
|
|
painter = painterResource(id = screens[3].icon),
|