From b8e8ad1c0abd6a68216007a6f6aa60a31eaa5c88 Mon Sep 17 00:00:00 2001 From: Eugene Date: Sat, 15 Aug 2026 17:34:26 +0300 Subject: [PATCH] up versions --- apps/vbox/client/androidApp/build.gradle.kts | 2 +- .../ru/shadowsparky/videoplayer/ui/DefaultControls.kt | 6 +++--- .../ru/shadowsparky/ui/components/BackButton.kt | 11 ++++++++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/apps/vbox/client/androidApp/build.gradle.kts b/apps/vbox/client/androidApp/build.gradle.kts index 9197523..5ac77e8 100644 --- a/apps/vbox/client/androidApp/build.gradle.kts +++ b/apps/vbox/client/androidApp/build.gradle.kts @@ -7,7 +7,7 @@ plugins { alias(libs.plugins.convention.ktor.client) } -val appVersion = "1.26.2" +val appVersion = "1.26.4" android { buildFeatures { buildConfig = true } diff --git a/feature/video-player/src/commonMain/kotlin/ru/shadowsparky/videoplayer/ui/DefaultControls.kt b/feature/video-player/src/commonMain/kotlin/ru/shadowsparky/videoplayer/ui/DefaultControls.kt index 02b4ebd..4e33cda 100644 --- a/feature/video-player/src/commonMain/kotlin/ru/shadowsparky/videoplayer/ui/DefaultControls.kt +++ b/feature/video-player/src/commonMain/kotlin/ru/shadowsparky/videoplayer/ui/DefaultControls.kt @@ -98,10 +98,10 @@ fun DefaultControls( .background(if (isUiLocked.value) Color.Transparent else Color.Black.copy(alpha = 0.4f)) .safeDrawingPadding() ) { - Box(modifier = Modifier.align(Alignment.TopStart).padding(8.dp)) { - BackButton { onBack() } - } SideDoubleTapSeekZones(controller) + Box(modifier = Modifier.align(Alignment.TopStart).padding(8.dp)) { + BackButton(Color.White) { onBack() } + } Row(modifier = Modifier.align(Alignment.TopEnd).focusGroup().padding(8.dp)) { if (audioTracksState.isNotEmpty() && !isUiLocked.value) { AudioTracksButton( diff --git a/libs/ui/src/commonMain/kotlin/ru/shadowsparky/ui/components/BackButton.kt b/libs/ui/src/commonMain/kotlin/ru/shadowsparky/ui/components/BackButton.kt index 7afc5b4..328ba29 100644 --- a/libs/ui/src/commonMain/kotlin/ru/shadowsparky/ui/components/BackButton.kt +++ b/libs/ui/src/commonMain/kotlin/ru/shadowsparky/ui/components/BackButton.kt @@ -8,19 +8,24 @@ import androidx.compose.material3.IconButtonDefaults import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.tooling.preview.Preview import org.jetbrains.compose.resources.painterResource import ru.shadowsparky.ui.theme.focusBorder @Composable -fun BackButton(doBack: () -> Unit) { +fun BackButton( + iconColor: Color = Color.Unspecified, + doBack: () -> Unit +) { IconButton( onClick = { doBack() }, shape = CircleShape, colors = IconButtonDefaults.iconButtonVibrantColors( containerColor = MaterialTheme.colorScheme.primaryContainer.copy( - 0.1f - ) + 0.25f + ), + contentColor = iconColor ), modifier = Modifier.focusBorder(shape = CircleShape) ) { Icon(painterResource(Res.drawable.back), contentDescription = null) }