From ea67ed80a505feb9f6f3b5ce6705e6c3e5c3e761 Mon Sep 17 00:00:00 2001 From: Eugene Date: Mon, 17 Aug 2026 14:29:59 +0300 Subject: [PATCH] disable interaction --- apps/vbox/client/androidApp/build.gradle.kts | 2 +- .../ru/shadowsparky/videoplayer/ui/VideoCanvas.android.kt | 7 ++++--- .../kotlin/ru/shadowsparky/videoplayer/ui/VideoPlayer.kt | 8 +++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/apps/vbox/client/androidApp/build.gradle.kts b/apps/vbox/client/androidApp/build.gradle.kts index e530b43..9e1faaa 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.5" +val appVersion = "1.26.6" android { buildFeatures { buildConfig = true } diff --git a/feature/video-player/src/androidMain/kotlin/ru/shadowsparky/videoplayer/ui/VideoCanvas.android.kt b/feature/video-player/src/androidMain/kotlin/ru/shadowsparky/videoplayer/ui/VideoCanvas.android.kt index f3486e9..1d032d2 100644 --- a/feature/video-player/src/androidMain/kotlin/ru/shadowsparky/videoplayer/ui/VideoCanvas.android.kt +++ b/feature/video-player/src/androidMain/kotlin/ru/shadowsparky/videoplayer/ui/VideoCanvas.android.kt @@ -3,6 +3,7 @@ package ru.shadowsparky.videoplayer.ui import android.app.Activity import android.content.Context import android.content.pm.ActivityInfo +import android.view.View import android.view.ViewGroup import android.widget.FrameLayout import androidx.annotation.OptIn @@ -58,20 +59,20 @@ actual fun VideoCanvas( ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT ) - useController = false - + focusable = View.NOT_FOCUSABLE + defaultFocusHighlightEnabled = false resizeMode = when (scaleType) { VideoScaleType.FIT -> AspectRatioFrameLayout.RESIZE_MODE_FIT VideoScaleType.FULL -> AspectRatioFrameLayout.RESIZE_MODE_ZOOM VideoScaleType.STRETCH -> AspectRatioFrameLayout.RESIZE_MODE_FILL } - keepScreenOn = true context.updatePipAutoEnter(this, true) } }, update = { playerView -> + playerView.defaultFocusHighlightEnabled = false if (playerView.player != androidController.getPlayerInstance()) { playerView.player = androidController.getPlayerInstance() } diff --git a/feature/video-player/src/commonMain/kotlin/ru/shadowsparky/videoplayer/ui/VideoPlayer.kt b/feature/video-player/src/commonMain/kotlin/ru/shadowsparky/videoplayer/ui/VideoPlayer.kt index 2c6147f..057807d 100644 --- a/feature/video-player/src/commonMain/kotlin/ru/shadowsparky/videoplayer/ui/VideoPlayer.kt +++ b/feature/video-player/src/commonMain/kotlin/ru/shadowsparky/videoplayer/ui/VideoPlayer.kt @@ -107,9 +107,11 @@ fun VideoPlayer( false } } else { - modifier.clickable { - areControlsVisible = !areControlsVisible - } + modifier.clickable( + interactionSource = null, + indication = null, + onClick = { areControlsVisible = !areControlsVisible } + ) } Box(modifier = rootModifier.background(Color.Black)) {