From cc3dac7a542cb011983ce6410c28473476c7294a Mon Sep 17 00:00:00 2001 From: Hermes Agent Date: Wed, 19 Aug 2026 23:42:31 +0300 Subject: [PATCH] =?UTF-8?q?fix(app-glasses):=20=D1=84=D0=BE=D0=BD=20=D0=BE?= =?UTF-8?q?=D1=87=D0=BA=D0=BE=D0=B2=20=D1=87=D1=91=D1=80=D0=BD=D1=8B=D0=B9?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=BB=D0=BD=D0=BE=D1=81=D1=82=D1=8C=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ConnectionScreen был без фона — светлый MaterialTheme. Теперь darkColorScheme + чёрный Box-корень вокруг обоих экранов + страховка background(Color.Black) в ConnectionScreen. Проверено скрином: все пиксели #000000. --- .../pw/binom/viewmate/glasses/MainActivity.kt | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/app-glasses/src/main/kotlin/pw/binom/viewmate/glasses/MainActivity.kt b/app-glasses/src/main/kotlin/pw/binom/viewmate/glasses/MainActivity.kt index afa39a7..315126f 100644 --- a/app-glasses/src/main/kotlin/pw/binom/viewmate/glasses/MainActivity.kt +++ b/app-glasses/src/main/kotlin/pw/binom/viewmate/glasses/MainActivity.kt @@ -13,7 +13,9 @@ import android.view.KeyEvent import android.view.MotionEvent import java.io.File import androidx.activity.compose.setContent +import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth @@ -22,10 +24,12 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text +import androidx.compose.material3.darkColorScheme import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp import androidx.core.view.WindowCompat import androidx.core.view.WindowInsetsCompat @@ -74,15 +78,21 @@ class MainActivity : BaseEventActivity() { disableTrackpadSounds() WindowCompat.setDecorFitsSystemWindows(window, false) setContent { - MaterialTheme { - val controller = GlassesApp.instance.movieController - val movieActive by controller.movieActive.collectAsState() - val title by controller.title.collectAsState() - val player = controller.player - if (movieActive && player != null) { - GlassesMovieScreen(player = player, title = title) - } else { - ConnectionScreen() + MaterialTheme(colorScheme = darkColorScheme()) { + Box( + modifier = Modifier + .fillMaxSize() + .background(Color.Black) + ) { + val controller = GlassesApp.instance.movieController + val movieActive by controller.movieActive.collectAsState() + val title by controller.title.collectAsState() + val player = controller.player + if (movieActive && player != null) { + GlassesMovieScreen(player = player, title = title) + } else { + ConnectionScreen() + } } } } @@ -236,7 +246,7 @@ fun ConnectionScreen() { val messages by connection.messages.collectAsState() Column( - modifier = Modifier.fillMaxSize().padding(24.dp), + modifier = Modifier.fillMaxSize().background(Color.Black).padding(24.dp), verticalArrangement = Arrangement.spacedBy(8.dp), ) { Text("ViewMate Glasses", style = MaterialTheme.typography.headlineMedium)