Creepso/NuvioStreaming
1
0
Fork 0
mirror of https://github.com/tapframe/NuvioStreaming.git synced 2026-05-17 07:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge e93ffa02c5 into 37203d1fc1

Browse source
This commit is contained in:
Sai Mukesh Cheekatla 2026-05-13 12:47:45 +02:00 committed by GitHub
commit 7382edebae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 76 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
composeApp/src/androidMain/kotlin/com/nuvio/app/features/player/PlayerSettingsStorage.android.kt
View file

@ -56,6 +56,7 @@ actual object PlayerSettingsStorage {
private const val nextEpisodeThresholdMinutesBeforeEndKey = "next_episode_threshold_minutes_before_end_v2"
private const val useLibassKey = "use_libass"
private const val libassRenderTypeKey = "libass_render_type"
private const val swipeGesturesEnabledKey = "swipe_gestures_enabled"
private val syncKeys = listOf(
showLoadingOverlayKey,
resizeModeKey,
@ -92,6 +93,7 @@ actual object PlayerSettingsStorage {
nextEpisodeThresholdMinutesBeforeEndKey,
useLibassKey,
libassRenderTypeKey,
swipeGesturesEnabledKey,
)
private var preferences: SharedPreferences? = null
@ -652,6 +654,23 @@ actual object PlayerSettingsStorage {
?.apply()
}
actual fun loadSwipeGesturesEnabled(): Boolean? =
preferences?.let { sharedPreferences ->
val key = ProfileScopedKey.of(swipeGesturesEnabledKey)
if (sharedPreferences.contains(key)) {
sharedPreferences.getBoolean(key, true)
} else {
null
}
}
actual fun saveSwipeGesturesEnabled(enabled: Boolean) {
preferences
?.edit()
?.putBoolean(ProfileScopedKey.of(swipeGesturesEnabledKey), enabled)
?.apply()
}
actual fun exportToSyncPayload(): JsonObject = buildJsonObject {
loadShowLoadingOverlay()?.let { put(showLoadingOverlayKey, encodeSyncBoolean(it)) }
loadResizeMode()?.let { put(resizeModeKey, encodeSyncString(it)) }
@ -688,6 +707,7 @@ actual object PlayerSettingsStorage {
loadNextEpisodeThresholdMinutesBeforeEnd()?.let { put(nextEpisodeThresholdMinutesBeforeEndKey, encodeSyncFloat(it)) }
loadUseLibass()?.let { put(useLibassKey, encodeSyncBoolean(it)) }
loadLibassRenderType()?.let { put(libassRenderTypeKey, encodeSyncString(it)) }
loadSwipeGesturesEnabled()?.let { put(swipeGesturesEnabledKey, encodeSyncBoolean(it)) }
}
actual fun replaceFromSyncPayload(payload: JsonObject) {
@ -732,5 +752,6 @@ actual object PlayerSettingsStorage {
payload.decodeSyncFloat(nextEpisodeThresholdMinutesBeforeEndKey)?.let(::saveNextEpisodeThresholdMinutesBeforeEnd)
payload.decodeSyncBoolean(useLibassKey)?.let(::saveUseLibass)
payload.decodeSyncString(libassRenderTypeKey)?.let(::saveLibassRenderType)
payload.decodeSyncBoolean(swipeGesturesEnabledKey)?.let(::saveSwipeGesturesEnabled)
}
}

2
composeApp/src/commonMain/composeResources/values/strings.xml
View file

@ -697,6 +697,8 @@
<string name="settings_playback_hold_speed">Hold Speed</string>
<string name="settings_playback_hold_to_speed">Hold To Speed</string>
<string name="settings_playback_hold_to_speed_description">Long-press anywhere on the player surface to temporarily boost playback speed.</string>
<string name="settings_playback_enable_swipe_gestures">Swipe Gestures</string>
<string name="settings_playback_enable_swipe_gestures_description">Allow vertical swiping on the player surface to control volume and brightness.</string>
<string name="settings_playback_invalid_regex_pattern">Invalid regex pattern</string>
<string name="settings_playback_last_link_cache_duration">Last Link Cache Duration</string>
<string name="settings_playback_map_dv7_to_hevc">DV7 - HEVC Fallback</string>

4
composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerScreen.kt
View file

@ -1484,10 +1484,10 @@ fun PlayerScreen(
abs(totalDx) > viewConfiguration.touchSlop &&
abs(totalDx) > abs(totalDy)
val verticalDominant =
!holdToSpeedActive &&
playerSettingsUiState.swipeGesturesEnabled &&
!holdToSpeedActive &&
abs(totalDy) > viewConfiguration.touchSlop &&
abs(totalDy) > abs(totalDx)
gestureMode = when {
horizontalDominant -> {
deactivateHoldToSpeedState.value()

13
composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerSettingsRepository.kt
View file

@ -43,6 +43,7 @@ data class PlayerSettingsUiState(
val nextEpisodeThresholdMinutesBeforeEnd: Float = 2f,
val useLibass: Boolean = false,
val libassRenderType: String = "CUES",
val swipeGesturesEnabled: Boolean = true,
)
object PlayerSettingsRepository {
@ -84,6 +85,7 @@ object PlayerSettingsRepository {
private var nextEpisodeThresholdMinutesBeforeEnd = 2f
private var useLibass = false
private var libassRenderType = "CUES"
private var swipeGesturesEnabled = true
fun ensureLoaded() {
if (hasLoaded) return
@ -130,6 +132,7 @@ object PlayerSettingsRepository {
nextEpisodeThresholdMinutesBeforeEnd = 2f
useLibass = false
libassRenderType = "CUES"
swipeGesturesEnabled = true
publish()
}
@ -204,6 +207,7 @@ object PlayerSettingsRepository {
nextEpisodeThresholdMinutesBeforeEnd = PlayerSettingsStorage.loadNextEpisodeThresholdMinutesBeforeEnd() ?: 2f
useLibass = PlayerSettingsStorage.loadUseLibass() ?: false
libassRenderType = PlayerSettingsStorage.loadLibassRenderType() ?: "CUES"
swipeGesturesEnabled = PlayerSettingsStorage.loadSwipeGesturesEnabled() ?: true
publish()
}
@ -498,6 +502,14 @@ object PlayerSettingsRepository {
PlayerSettingsStorage.saveLibassRenderType(renderType)
}
fun setSwipeGesturesEnabled(enabled: Boolean) {
ensureLoaded()
if (swipeGesturesEnabled == enabled) return
swipeGesturesEnabled = enabled
publish()
PlayerSettingsStorage.saveSwipeGesturesEnabled(enabled)
}
private fun publish() {
_uiState.value = PlayerSettingsUiState(
showLoadingOverlay = showLoadingOverlay,
@ -534,6 +546,7 @@ object PlayerSettingsRepository {
nextEpisodeThresholdMinutesBeforeEnd = nextEpisodeThresholdMinutesBeforeEnd,
useLibass = useLibass,
libassRenderType = libassRenderType,
swipeGesturesEnabled = swipeGesturesEnabled,
)
}

2
composeApp/src/commonMain/kotlin/com/nuvio/app/features/player/PlayerSettingsStorage.kt
View file

@ -78,6 +78,8 @@ internal expect object PlayerSettingsStorage {
fun saveUseLibass(enabled: Boolean)
fun loadLibassRenderType(): String?
fun saveLibassRenderType(renderType: String)
fun loadSwipeGesturesEnabled(): Boolean?
fun saveSwipeGesturesEnabled(enabled: Boolean)
fun exportToSyncPayload(): JsonObject
fun replaceFromSyncPayload(payload: JsonObject)
}

11
composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/PlaybackSettingsPage.kt
View file

@ -86,6 +86,7 @@ internal fun LazyListScope.playbackSettingsContent(
tunnelingEnabled: Boolean,
useLibass: Boolean,
libassRenderType: String,
swipeGesturesEnabled: Boolean,
) {
item {
PlaybackSettingsSection(
@ -104,6 +105,7 @@ internal fun LazyListScope.playbackSettingsContent(
tunnelingEnabled = tunnelingEnabled,
useLibass = useLibass,
libassRenderType = libassRenderType,
swipeGesturesEnabled = swipeGesturesEnabled,
)
}
}
@ -166,6 +168,7 @@ private fun PlaybackSettingsSection(
tunnelingEnabled: Boolean,
useLibass: Boolean,
libassRenderType: String,
swipeGesturesEnabled: Boolean,
) {
var showPreferredAudioDialog by remember { mutableStateOf(false) }
var showSecondaryAudioDialog by remember { mutableStateOf(false) }
@ -262,6 +265,14 @@ private fun PlaybackSettingsSection(
onClick = { showHoldToSpeedValueDialog = true },
)
}
SettingsGroupDivider(isTablet = isTablet)
SettingsSwitchRow(
title = stringResource(Res.string.settings_playback_enable_swipe_gestures),
description = stringResource(Res.string.settings_playback_enable_swipe_gestures_description),
checked = swipeGesturesEnabled,
isTablet = isTablet,
onCheckedChange = PlayerSettingsRepository::setSwipeGesturesEnabled,
)
}
}

6
composeApp/src/commonMain/kotlin/com/nuvio/app/features/settings/SettingsScreen.kt
View file

@ -220,6 +220,7 @@ fun SettingsScreen(
tunnelingEnabled = playerSettingsUiState.tunnelingEnabled,
useLibass = playerSettingsUiState.useLibass,
libassRenderType = playerSettingsUiState.libassRenderType,
swipeGesturesEnabled = playerSettingsUiState.swipeGesturesEnabled,
selectedTheme = selectedTheme,
onThemeSelected = ThemeSettingsRepository::setTheme,
amoledEnabled = amoledEnabled,
@ -267,6 +268,7 @@ fun SettingsScreen(
tunnelingEnabled = playerSettingsUiState.tunnelingEnabled,
useLibass = playerSettingsUiState.useLibass,
libassRenderType = playerSettingsUiState.libassRenderType,
swipeGesturesEnabled = playerSettingsUiState.swipeGesturesEnabled,
selectedTheme = selectedTheme,
onThemeSelected = ThemeSettingsRepository::setTheme,
amoledEnabled = amoledEnabled,
@ -324,6 +326,7 @@ private fun MobileSettingsScreen(
tunnelingEnabled: Boolean,
useLibass: Boolean,
libassRenderType: String,
swipeGesturesEnabled: Boolean,
selectedTheme: AppTheme,
onThemeSelected: (AppTheme) -> Unit,
amoledEnabled: Boolean,
@ -484,6 +487,7 @@ private fun MobileSettingsScreen(
tunnelingEnabled = tunnelingEnabled,
useLibass = useLibass,
libassRenderType = libassRenderType,
swipeGesturesEnabled = swipeGesturesEnabled,
)
SettingsPage.Appearance -> appearanceSettingsContent(
isTablet = false,
@ -625,6 +629,7 @@ private fun TabletSettingsScreen(
tunnelingEnabled: Boolean,
useLibass: Boolean,
libassRenderType: String,
swipeGesturesEnabled: Boolean,
selectedTheme: AppTheme,
onThemeSelected: (AppTheme) -> Unit,
amoledEnabled: Boolean,
@ -844,6 +849,7 @@ private fun TabletSettingsScreen(
tunnelingEnabled = tunnelingEnabled,
useLibass = useLibass,
libassRenderType = libassRenderType,
swipeGesturesEnabled = swipeGesturesEnabled,
)
SettingsPage.Appearance -> appearanceSettingsContent(
isTablet = true,

19
composeApp/src/iosMain/kotlin/com/nuvio/app/features/player/PlayerSettingsStorage.ios.kt
View file

@ -54,6 +54,7 @@ actual object PlayerSettingsStorage {
private const val nextEpisodeThresholdMinutesBeforeEndKey = "next_episode_threshold_minutes_before_end_v2"
private const val useLibassKey = "use_libass"
private const val libassRenderTypeKey = "libass_render_type"
private const val swipeGesturesEnabledKey = "swipe_gestures_enabled"
private val syncKeys = listOf(
showLoadingOverlayKey,
resizeModeKey,
@ -90,6 +91,7 @@ actual object PlayerSettingsStorage {
nextEpisodeThresholdMinutesBeforeEndKey,
useLibassKey,
libassRenderTypeKey,
swipeGesturesEnabledKey,
)
actual fun loadShowLoadingOverlay(): Boolean? {
@ -102,6 +104,21 @@ actual object PlayerSettingsStorage {
}
}
actual fun loadSwipeGesturesEnabled(): Boolean? {
val defaults = NSUserDefaults.standardUserDefaults
val key = ProfileScopedKey.of(swipeGesturesEnabledKey)
return if (defaults.objectForKey(key) != null) {
defaults.boolForKey(key)
} else {
null
}
}
actual fun saveSwipeGesturesEnabled(enabled: Boolean) {
val defaults = NSUserDefaults.standardUserDefaults
defaults.setBool(enabled, ProfileScopedKey.of(swipeGesturesEnabledKey))
}
actual fun saveShowLoadingOverlay(enabled: Boolean) {
NSUserDefaults.standardUserDefaults.setBool(enabled, forKey = ProfileScopedKey.of(showLoadingOverlayKey))
}
@ -588,6 +605,7 @@ actual object PlayerSettingsStorage {
loadNextEpisodeThresholdMinutesBeforeEnd()?.let { put(nextEpisodeThresholdMinutesBeforeEndKey, encodeSyncFloat(it)) }
loadUseLibass()?.let { put(useLibassKey, encodeSyncBoolean(it)) }
loadLibassRenderType()?.let { put(libassRenderTypeKey, encodeSyncString(it)) }
loadSwipeGesturesEnabled()?.let { put(swipeGesturesEnabledKey, encodeSyncBoolean(it)) }
}
actual fun replaceFromSyncPayload(payload: JsonObject) {
@ -631,5 +649,6 @@ actual object PlayerSettingsStorage {
payload.decodeSyncFloat(nextEpisodeThresholdMinutesBeforeEndKey)?.let(::saveNextEpisodeThresholdMinutesBeforeEnd)
payload.decodeSyncBoolean(useLibassKey)?.let(::saveUseLibass)
payload.decodeSyncString(libassRenderTypeKey)?.let(::saveLibassRenderType)
payload.decodeSyncBoolean(swipeGesturesEnabledKey)?.let(::saveSwipeGesturesEnabled)
}
}