remove debug isTv hardcode, update ui

This commit is contained in:
2026-07-27 20:43:02 +03:00
parent 14a10e6d08
commit 9915e4ddd5
4 changed files with 19 additions and 34 deletions
@@ -4,11 +4,14 @@ import android.app.UiModeManager
import android.content.Context
import android.content.res.Configuration
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext
@Composable
actual fun isTv(): Boolean {
val context = LocalContext.current
val uiModeManager = context.getSystemService(Context.UI_MODE_SERVICE) as UiModeManager
return uiModeManager.currentModeType == Configuration.UI_MODE_TYPE_TELEVISION
return remember(context) {
val uiModeManager = context.getSystemService(Context.UI_MODE_SERVICE) as UiModeManager
uiModeManager.currentModeType == Configuration.UI_MODE_TYPE_TELEVISION
}
}
@@ -17,7 +17,6 @@ import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialExpressiveTheme
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.NavigationBar
import androidx.compose.material3.NavigationBarItem
import androidx.compose.material3.NavigationRail
@@ -161,10 +160,7 @@ private fun <T : Route> ExpandedContent(
val bottomPadding = values.calculateBottomPadding()
val endPadding = values.calculateEndPadding(LayoutDirection.Ltr)
Row(modifier = Modifier.fillMaxSize()) {
NavigationRail(
modifier = Modifier.padding(start = 4.dp, end = 4.dp, top = topPadding),
containerColor = MaterialTheme.colorScheme.surfaceContainerLow
) {
NavigationRail(modifier = Modifier.padding(start = 4.dp, end = 4.dp, top = topPadding)) {
navigationEntries.forEach { entry ->
NavigationRailItem(
selected = currentRoute == entry.route,
@@ -27,7 +27,7 @@ fun AlertContent(
@Composable
fun BaseDialogLayout() {
Column(
modifier = Modifier.padding(8.dp),
modifier = Modifier.padding(16.dp),
verticalArrangement = Arrangement.spacedBy(6.dp)
) {
title?.let {
@@ -51,9 +51,10 @@ fun AlertContent(
) {
Surface(
shape = MaterialTheme.shapes.extraLarge,
color = MaterialTheme.colorScheme.surface,
tonalElevation = 6.dp
) { BaseDialogLayout() }
color = MaterialTheme.colorScheme.surface
) {
BaseDialogLayout()
}
}
} else {
ModalBottomSheet(