|
@@ -337,7 +337,7 @@ fun HomeTV(navHostController: NavHostController) {
|
|
// 1st box
|
|
// 1st box
|
|
ConstraintLayout(modifier = Modifier
|
|
ConstraintLayout(modifier = Modifier
|
|
.fillMaxSize()
|
|
.fillMaxSize()
|
|
- .weight(0.65f)
|
|
|
|
|
|
+ .weight(0.6f)
|
|
.background(Color.Transparent)
|
|
.background(Color.Transparent)
|
|
)
|
|
)
|
|
{
|
|
{
|
|
@@ -381,11 +381,11 @@ fun HomeTV(navHostController: NavHostController) {
|
|
modifier = Modifier
|
|
modifier = Modifier
|
|
.fillMaxWidth()
|
|
.fillMaxWidth()
|
|
.fillMaxHeight()
|
|
.fillMaxHeight()
|
|
- .padding(bottom = 25.dp)
|
|
|
|
|
|
+ .padding(bottom = 85.dp)
|
|
// .offset(y = -(118).dp)
|
|
// .offset(y = -(118).dp)
|
|
.background(Color.Transparent),
|
|
.background(Color.Transparent),
|
|
horizontalAlignment = Alignment.CenterHorizontally,
|
|
horizontalAlignment = Alignment.CenterHorizontally,
|
|
- verticalArrangement = Arrangement.Center
|
|
|
|
|
|
+ verticalArrangement = Arrangement.Bottom
|
|
) {
|
|
) {
|
|
val serverObj = basePreferenceHelper.getConnectedServer()
|
|
val serverObj = basePreferenceHelper.getConnectedServer()
|
|
val serverDis = basePreferenceHelper.getIpinfo()
|
|
val serverDis = basePreferenceHelper.getIpinfo()
|
|
@@ -634,20 +634,20 @@ fun HomeTV(navHostController: NavHostController) {
|
|
modifier = Modifier
|
|
modifier = Modifier
|
|
.background(colorResource(id = R.color.background_color_gray))
|
|
.background(colorResource(id = R.color.background_color_gray))
|
|
.fillMaxSize()
|
|
.fillMaxSize()
|
|
- .weight(0.35f)
|
|
|
|
|
|
+ .weight(0.4f)
|
|
// .background(Color.Transparent),
|
|
// .background(Color.Transparent),
|
|
) {
|
|
) {
|
|
Column(
|
|
Column(
|
|
modifier = Modifier.fillMaxSize(),
|
|
modifier = Modifier.fillMaxSize(),
|
|
- verticalArrangement = Arrangement.Top
|
|
|
|
|
|
+ verticalArrangement = Arrangement.Center
|
|
) {
|
|
) {
|
|
|
|
|
|
Box(
|
|
Box(
|
|
modifier = Modifier
|
|
modifier = Modifier
|
|
- .fillMaxWidth(fraction = if (isTablet()) 0.5f else 1f)
|
|
|
|
- .padding(horizontal = 20.dp)
|
|
|
|
|
|
+ .fillMaxWidth(fraction = 0.4f)
|
|
|
|
+ .padding(horizontal = 0.dp)
|
|
.padding(vertical = 2.dp)
|
|
.padding(vertical = 2.dp)
|
|
- .height(100.dp)
|
|
|
|
|
|
+ .height(90.dp)
|
|
.border(
|
|
.border(
|
|
border = BorderStroke(2.dp, colorResource(id = R.color.white)),
|
|
border = BorderStroke(2.dp, colorResource(id = R.color.white)),
|
|
shape = RoundedCornerShape(28.dp)
|
|
shape = RoundedCornerShape(28.dp)
|
|
@@ -729,7 +729,7 @@ fun HomeTV(navHostController: NavHostController) {
|
|
// }
|
|
// }
|
|
},
|
|
},
|
|
modifier = Modifier
|
|
modifier = Modifier
|
|
- .padding(start = 14.dp, end = 14.dp, bottom = 8.dp, top = 16.dp)
|
|
|
|
|
|
+ .padding(start = 14.dp, end = 14.dp, bottom = 6.dp, top = 12.dp)
|
|
.align(Alignment.BottomCenter)
|
|
.align(Alignment.BottomCenter)
|
|
.background(colorResource(id = R.color.transparent))
|
|
.background(colorResource(id = R.color.transparent))
|
|
.onFocusChanged {
|
|
.onFocusChanged {
|
|
@@ -742,7 +742,7 @@ fun HomeTV(navHostController: NavHostController) {
|
|
// ).show()
|
|
// ).show()
|
|
// }
|
|
// }
|
|
.fillMaxWidth()
|
|
.fillMaxWidth()
|
|
- .height(40.dp),
|
|
|
|
|
|
+ .height(35.dp),
|
|
shape = RoundedCornerShape(16.dp),
|
|
shape = RoundedCornerShape(16.dp),
|
|
colors = ButtonDefaults.buttonColors(
|
|
colors = ButtonDefaults.buttonColors(
|
|
contentColor = colorResource(id = R.color.white),
|
|
contentColor = colorResource(id = R.color.white),
|
|
@@ -752,7 +752,7 @@ fun HomeTV(navHostController: NavHostController) {
|
|
Text(
|
|
Text(
|
|
text = "Smart Connect",
|
|
text = "Smart Connect",
|
|
style = MaterialTheme.typography.customTypography.labelLarge.copy(
|
|
style = MaterialTheme.typography.customTypography.labelLarge.copy(
|
|
- fontSize = if (isTablet()) 21.sp else 18.sp
|
|
|
|
|
|
+ fontSize = 16.sp, lineHeight = 0.sp
|
|
),
|
|
),
|
|
modifier = Modifier.background(Color.Transparent)
|
|
modifier = Modifier.background(Color.Transparent)
|
|
)
|
|
)
|
|
@@ -771,10 +771,10 @@ fun HomeTV(navHostController: NavHostController) {
|
|
else colorResource(id = R.color.white)
|
|
else colorResource(id = R.color.white)
|
|
Box(
|
|
Box(
|
|
modifier = Modifier
|
|
modifier = Modifier
|
|
- .fillMaxWidth(fraction = if (isTablet()) 0.5f else 1f)
|
|
|
|
- .padding(horizontal = 20.dp, vertical = 2.dp)
|
|
|
|
|
|
+ .fillMaxWidth(fraction = 0.4f)
|
|
|
|
+ .padding(horizontal = 0.dp, vertical = 2.dp)
|
|
.padding(top = 0.dp)
|
|
.padding(top = 0.dp)
|
|
- .height(55.dp)
|
|
|
|
|
|
+ .height(50.dp)
|
|
.onKeyEvent {
|
|
.onKeyEvent {
|
|
if (it.type == KeyEventType.KeyDown && it.key == Key.DirectionDown) {
|
|
if (it.type == KeyEventType.KeyDown && it.key == Key.DirectionDown) {
|
|
// Toast
|
|
// Toast
|
|
@@ -792,7 +792,6 @@ fun HomeTV(navHostController: NavHostController) {
|
|
isLayoutFocused = it.isFocused
|
|
isLayoutFocused = it.isFocused
|
|
}
|
|
}
|
|
.focusable()
|
|
.focusable()
|
|
-
|
|
|
|
.clickable(
|
|
.clickable(
|
|
indication = null,
|
|
indication = null,
|
|
interactionSource = remember { MutableInteractionSource() }
|
|
interactionSource = remember { MutableInteractionSource() }
|
|
@@ -822,7 +821,6 @@ fun HomeTV(navHostController: NavHostController) {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
@Composable
|
|
@Composable
|
|
fun BoxScope.AddRowSmartTV(
|
|
fun BoxScope.AddRowSmartTV(
|
|
navHostController: NavHostController,
|
|
navHostController: NavHostController,
|
|
@@ -884,7 +882,7 @@ fun BoxScope.AddRowSmartTV(
|
|
tint = Color.Unspecified,
|
|
tint = Color.Unspecified,
|
|
modifier = Modifier
|
|
modifier = Modifier
|
|
.padding(start = 0.dp)
|
|
.padding(start = 0.dp)
|
|
- .size(40.dp)
|
|
|
|
|
|
+ .size(30.dp)
|
|
.weight(1f)
|
|
.weight(1f)
|
|
.clip(CircleShape)
|
|
.clip(CircleShape)
|
|
.border(1.dp, colorResource(id = R.color.gray_opac_04), CircleShape)
|
|
.border(1.dp, colorResource(id = R.color.gray_opac_04), CircleShape)
|
|
@@ -906,7 +904,7 @@ fun BoxScope.AddRowSmartTV(
|
|
color = colorResource(id = R.color.blue_text),
|
|
color = colorResource(id = R.color.blue_text),
|
|
size = 12.sp,
|
|
size = 12.sp,
|
|
style = MaterialTheme.typography.customTypography.headlineSmall.copy(
|
|
style = MaterialTheme.typography.customTypography.headlineSmall.copy(
|
|
- fontSize = if (isTablet()) 16.sp else 12.sp
|
|
|
|
|
|
+ fontSize = 16.sp
|
|
)
|
|
)
|
|
)
|
|
)
|
|
ColumnText(
|
|
ColumnText(
|
|
@@ -915,7 +913,7 @@ fun BoxScope.AddRowSmartTV(
|
|
color = colorResource(id = R.color.dark_blue_gray_text),
|
|
color = colorResource(id = R.color.dark_blue_gray_text),
|
|
size = 16.sp,
|
|
size = 16.sp,
|
|
style = MaterialTheme.typography.labelMedium.copy(
|
|
style = MaterialTheme.typography.labelMedium.copy(
|
|
- fontSize = if (isTablet()) 20.sp else 16.sp
|
|
|
|
|
|
+ fontSize = 16.sp
|
|
)
|
|
)
|
|
)
|
|
)
|
|
}
|
|
}
|
|
@@ -956,13 +954,12 @@ fun BoxScope.AddRowSmartTV(
|
|
ScreenTV.ServerListTV.route
|
|
ScreenTV.ServerListTV.route
|
|
)
|
|
)
|
|
}
|
|
}
|
|
- .focusable()
|
|
|
|
- ,
|
|
|
|
|
|
+ .focusable(),
|
|
text = AnnotatedString("Change"),
|
|
text = AnnotatedString("Change"),
|
|
style = MaterialTheme.typography.customTypography.headlineMedium.copy(
|
|
style = MaterialTheme.typography.customTypography.headlineMedium.copy(
|
|
// MaterialTheme.colorScheme.surfaceContainerLow,
|
|
// MaterialTheme.colorScheme.surfaceContainerLow,
|
|
color = color,
|
|
color = color,
|
|
- fontSize = if (isTablet()) 20.sp else 14.sp
|
|
|
|
|
|
+ fontSize = 18.sp
|
|
),
|
|
),
|
|
onClick = {},
|
|
onClick = {},
|
|
)
|
|
)
|