From 08df0b1b70a69d8b3371eb60029a50c27dbee16b Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Wed, 18 Nov 2026 11:31:02 +0100 Subject: [PATCH 1/8] style(player): single button Signed-off-by: alperozturk96 --- .../client/player/media3/PlaybackModel.kt | 21 ++++------ .../client/player/model/PlaybackSettings.kt | 29 ++++--------- .../client/player/model/state/PlayMode.kt | 19 +++++++++ .../player/model/state/PlaybackState.kt | 3 +- .../client/player/model/state/RepeatMode.kt | 14 ------- .../player/ui/control/PlayerControlView.kt | 41 +++++++++---------- .../client/player/util/PlayerUtil.kt | 22 ++++------ .../res/drawable/player_ic_repeat_one.xml | 17 ++++++++ .../main/res/layout/player_control_view.xml | 15 ++++--- app/src/main/res/values/strings.xml | 3 +- 10 files changed, 91 insertions(+), 93 deletions(-) create mode 100644 app/src/main/java/com/nextcloud/client/player/model/state/PlayMode.kt delete mode 100644 app/src/main/java/com/nextcloud/client/player/model/state/RepeatMode.kt create mode 100644 app/src/main/res/drawable/player_ic_repeat_one.xml diff --git a/app/src/main/java/com/nextcloud/client/player/media3/PlaybackModel.kt b/app/src/main/java/com/nextcloud/client/player/media3/PlaybackModel.kt index 70608ad90385..e5c9917ff52d 100644 --- a/app/src/main/java/com/nextcloud/client/player/media3/PlaybackModel.kt +++ b/app/src/main/java/com/nextcloud/client/player/media3/PlaybackModel.kt @@ -20,14 +20,14 @@ import com.nextcloud.client.player.media3.session.MediaSessionFactory import com.nextcloud.client.player.model.PlaybackSettings import com.nextcloud.client.player.model.file.PlaybackFile import com.nextcloud.client.player.model.file.PlaybackFiles +import com.nextcloud.client.player.model.state.PlayMode import com.nextcloud.client.player.model.state.PlaybackState -import com.nextcloud.client.player.model.state.RepeatMode import com.nextcloud.client.player.util.PeriodicAction import com.nextcloud.client.player.util.PlayerUtil.indexOfFirst import com.nextcloud.client.player.util.PlayerUtil.playbackFile import com.nextcloud.client.player.util.PlayerUtil.readCurrentFiles import com.nextcloud.client.player.util.PlayerUtil.readMediaIds -import com.nextcloud.client.player.util.PlayerUtil.setRepeatMode +import com.nextcloud.client.player.util.PlayerUtil.setPlayMode import com.nextcloud.client.player.util.PlayerUtil.toMediaItem import com.nextcloud.client.player.util.PlayerUtil.toPlaybackState import com.nextcloud.client.player.util.PlayerUtil.updateMediaItems @@ -138,8 +138,7 @@ class PlaybackModel @Inject constructor( .await() .apply { addListener(playerListener) - setRepeatMode(playbackSettings.repeatMode) - shuffleModeEnabled = playbackSettings.isShuffle + setPlayMode(playbackSettings.playMode) } controllerScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate) } @@ -281,14 +280,9 @@ class PlaybackModel @Inject constructor( controller?.seekTo(positionInMilliseconds) } - fun setRepeatMode(repeatMode: RepeatMode) { - playbackSettings.setRepeatMode(repeatMode) - controller?.setRepeatMode(repeatMode) - } - - fun setShuffle(shuffle: Boolean) { - playbackSettings.setShuffle(shuffle) - controller?.shuffleModeEnabled = shuffle + fun setPlayMode(playMode: PlayMode) { + playbackSettings.setPlayMode(playMode) + controller?.setPlayMode(playMode) } fun switchToFile(file: PlaybackFile) { @@ -320,8 +314,7 @@ class PlaybackModel @Inject constructor( private fun releasedState(): PlaybackState = PlaybackState( currentFiles = emptyList(), currentItemState = null, - repeatMode = playbackSettings.repeatMode, - shuffle = playbackSettings.isShuffle + playMode = playbackSettings.playMode ) private fun notifyPlaybackError(error: Throwable) { diff --git a/app/src/main/java/com/nextcloud/client/player/model/PlaybackSettings.kt b/app/src/main/java/com/nextcloud/client/player/model/PlaybackSettings.kt index c0a067a58412..7e7fe488b66e 100644 --- a/app/src/main/java/com/nextcloud/client/player/model/PlaybackSettings.kt +++ b/app/src/main/java/com/nextcloud/client/player/model/PlaybackSettings.kt @@ -9,37 +9,26 @@ package com.nextcloud.client.player.model import android.content.Context import androidx.core.content.edit -import com.nextcloud.client.player.model.state.RepeatMode +import com.nextcloud.client.player.model.state.PlayMode +import com.nextcloud.utils.serialization.AppJson import javax.inject.Inject class PlaybackSettings @Inject constructor(context: Context) { companion object { private const val PREFERENCES_FILE_NAME = "playback_settings" - private const val REPEAT_MODE_ID_KEY = "repeat_mode_id" - private const val SHUFFLE_KEY = "shuffle" - private val DEFAULT_REPEAT_MODE = RepeatMode.OFF + private const val PLAY_MODE_KEY = "play_mode" } private val preferences = context.getSharedPreferences(PREFERENCES_FILE_NAME, Context.MODE_PRIVATE) - val repeatMode: RepeatMode - get() = preferences.getInt(REPEAT_MODE_ID_KEY, -1) - .let { id -> RepeatMode.entries.firstOrNull { it.id == id } } - ?.takeUnless { it == RepeatMode.ALL } - ?: DEFAULT_REPEAT_MODE + val playMode: PlayMode + get() = preferences.getString(PLAY_MODE_KEY, null) + ?.let { runCatching { AppJson.instance.decodeFromString(it) }.getOrNull() } + ?: PlayMode.SINGLE - val isShuffle: Boolean - get() = preferences.getBoolean(SHUFFLE_KEY, false) - - fun setRepeatMode(repeatMode: RepeatMode) { - preferences.edit { - putInt(REPEAT_MODE_ID_KEY, repeatMode.id) - } - } - - fun setShuffle(shuffle: Boolean) { + fun setPlayMode(playMode: PlayMode) { preferences.edit { - putBoolean(SHUFFLE_KEY, shuffle) + putString(PLAY_MODE_KEY, AppJson.instance.encodeToString(playMode)) } } } diff --git a/app/src/main/java/com/nextcloud/client/player/model/state/PlayMode.kt b/app/src/main/java/com/nextcloud/client/player/model/state/PlayMode.kt new file mode 100644 index 000000000000..6a115c2175af --- /dev/null +++ b/app/src/main/java/com/nextcloud/client/player/model/state/PlayMode.kt @@ -0,0 +1,19 @@ +/* + * Nextcloud - Android Client + * + * SPDX-FileCopyrightText: 2026 Alper Ozturk + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +package com.nextcloud.client.player.model.state + +import androidx.annotation.DrawableRes +import com.owncloud.android.R +import kotlinx.serialization.Serializable + +@Serializable +enum class PlayMode(@param:DrawableRes val iconRes: Int) { + SINGLE(R.drawable.player_ic_repeat), + REPEAT(R.drawable.player_ic_repeat_one), + SHUFFLE(R.drawable.player_ic_shuffle) +} diff --git a/app/src/main/java/com/nextcloud/client/player/model/state/PlaybackState.kt b/app/src/main/java/com/nextcloud/client/player/model/state/PlaybackState.kt index 4d8930922278..098bd0ff8b7c 100644 --- a/app/src/main/java/com/nextcloud/client/player/model/state/PlaybackState.kt +++ b/app/src/main/java/com/nextcloud/client/player/model/state/PlaybackState.kt @@ -12,6 +12,5 @@ import com.nextcloud.client.player.model.file.PlaybackFile data class PlaybackState( val currentFiles: List, val currentItemState: PlaybackItemState?, - val repeatMode: RepeatMode, - val shuffle: Boolean + val playMode: PlayMode ) diff --git a/app/src/main/java/com/nextcloud/client/player/model/state/RepeatMode.kt b/app/src/main/java/com/nextcloud/client/player/model/state/RepeatMode.kt deleted file mode 100644 index d4ba9aeeb9d9..000000000000 --- a/app/src/main/java/com/nextcloud/client/player/model/state/RepeatMode.kt +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Nextcloud - Android Client - * - * SPDX-FileCopyrightText: 2025 STRATO GmbH. - * SPDX-License-Identifier: AGPL-3.0-or-later - */ - -package com.nextcloud.client.player.model.state - -enum class RepeatMode(val id: Int) { - OFF(0), - SINGLE(1), - ALL(2) -} diff --git a/app/src/main/java/com/nextcloud/client/player/ui/control/PlayerControlView.kt b/app/src/main/java/com/nextcloud/client/player/ui/control/PlayerControlView.kt index fbe10e6ade7e..535c31d9f00f 100644 --- a/app/src/main/java/com/nextcloud/client/player/ui/control/PlayerControlView.kt +++ b/app/src/main/java/com/nextcloud/client/player/ui/control/PlayerControlView.kt @@ -21,10 +21,10 @@ import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.flowWithLifecycle import com.nextcloud.android.common.ui.color.ColorUtil import com.nextcloud.client.player.media3.PlaybackModel +import com.nextcloud.client.player.model.state.PlayMode import com.nextcloud.client.player.model.state.PlaybackItemState import com.nextcloud.client.player.model.state.PlaybackState import com.nextcloud.client.player.model.state.PlayerState -import com.nextcloud.client.player.model.state.RepeatMode import com.nextcloud.client.player.ui.MediaNavigator import com.owncloud.android.R import com.owncloud.android.databinding.PlayerControlViewBinding @@ -94,6 +94,8 @@ class PlayerControlView @JvmOverloads constructor( var navigator: MediaNavigator? = null + private var playMode = PlayMode.SINGLE + init { if (!isInEditMode) { (context.applicationContext as HasAndroidInjector).androidInjector().inject(this) @@ -149,8 +151,7 @@ class PlayerControlView @JvmOverloads constructor( binding.run { ivPrevious.iconTint = transportIconTint ivNext.iconTint = transportIconTint - ivRepeat.iconTint = toggleIconTint - ivRandom.iconTint = toggleIconTint + ivPlayMode.iconTint = toggleIconTint ivPlayPause.backgroundTintList = serverPrimaryTint ivPlayPause.iconTint = onServerPrimaryTint @@ -169,23 +170,7 @@ class PlayerControlView @JvmOverloads constructor( } } - binding.ivRepeat.setOnClickListener { - val repeatSingle = binding.ivRepeat.isChecked - - // Repeat and Random are mutually exclusive - playbackModel.setShuffle(false) - - playbackModel.setRepeatMode(if (repeatSingle) RepeatMode.SINGLE else RepeatMode.OFF) - } - - binding.ivRandom.setOnClickListener { - val shuffle = binding.ivRandom.isChecked - - // Repeat and Random are mutually exclusive - playbackModel.setRepeatMode(RepeatMode.OFF) - - playbackModel.setShuffle(shuffle) - } + binding.ivPlayMode.setOnClickListener { applyNextPlayMode() } binding.ivNext.setOnClickListener { navigator?.showNext() } @@ -209,9 +194,21 @@ class PlayerControlView @JvmOverloads constructor( .launchIn(viewScope) } + private fun applyNextPlayMode() { + val nextMode = PlayMode.entries[(playMode.ordinal + 1) % PlayMode.entries.size] + playbackModel.setPlayMode(nextMode) + + renderPlayMode(nextMode) + } + + private fun renderPlayMode(mode: PlayMode) { + playMode = mode + binding.ivPlayMode.setIconResource(mode.iconRes) + binding.ivPlayMode.isChecked = mode != PlayMode.SINGLE + } + private fun render(playbackState: PlaybackState) { - binding.ivRepeat.isChecked = playbackState.repeatMode == RepeatMode.SINGLE - binding.ivRandom.isChecked = playbackState.shuffle + renderPlayMode(playbackState.playMode) binding.ivPlayPause.isChecked = playbackState.currentItemState?.playerState == PlayerState.PLAYING binding.ivNext.isEnabled = navigator?.hasNext == true binding.ivPrevious.isEnabled = navigator?.hasPrevious == true diff --git a/app/src/main/java/com/nextcloud/client/player/util/PlayerUtil.kt b/app/src/main/java/com/nextcloud/client/player/util/PlayerUtil.kt index 2e7ba0f6e16e..22700d77aa31 100644 --- a/app/src/main/java/com/nextcloud/client/player/util/PlayerUtil.kt +++ b/app/src/main/java/com/nextcloud/client/player/util/PlayerUtil.kt @@ -28,11 +28,11 @@ import androidx.media3.common.MediaItem import androidx.media3.common.MediaMetadata import androidx.media3.common.Player import com.nextcloud.client.player.model.file.PlaybackFile +import com.nextcloud.client.player.model.state.PlayMode import com.nextcloud.client.player.model.state.PlaybackItemMetadata import com.nextcloud.client.player.model.state.PlaybackItemState import com.nextcloud.client.player.model.state.PlaybackState import com.nextcloud.client.player.model.state.PlayerState -import com.nextcloud.client.player.model.state.RepeatMode import com.nextcloud.client.player.model.state.VideoSize import com.nextcloud.utils.extensions.resolveMimeType import com.nextcloud.utils.serialization.AppJson @@ -104,19 +104,15 @@ object PlayerUtil { replaceMediaItems(0, oldCurrentMediaItemIndex, newMediaItems.subList(0, newCurrentMediaItemIndex)) } - fun Player.setRepeatMode(mode: RepeatMode) { - repeatMode = when (mode) { - RepeatMode.SINGLE -> Player.REPEAT_MODE_ONE - RepeatMode.ALL -> Player.REPEAT_MODE_ALL - RepeatMode.OFF -> Player.REPEAT_MODE_OFF - } + fun Player.setPlayMode(mode: PlayMode) { + repeatMode = if (mode == PlayMode.REPEAT) Player.REPEAT_MODE_ONE else Player.REPEAT_MODE_OFF + shuffleModeEnabled = mode == PlayMode.SHUFFLE } fun Player.toPlaybackState(currentFiles: List): PlaybackState = PlaybackState( currentFiles = currentFiles, currentItemState = getCurrentItemState(), - repeatMode = mapRepeatMode(), - shuffle = shuffleModeEnabled + playMode = mapPlayMode() ) fun Player.readMediaIds(): List = buildList { @@ -165,10 +161,10 @@ object PlayerUtil { .takeIf { it.width > 0 && it.height > 0 } ?.let { VideoSize(width = it.width, height = it.height) } - private fun Player.mapRepeatMode(): RepeatMode = when (repeatMode) { - Player.REPEAT_MODE_ONE -> RepeatMode.SINGLE - Player.REPEAT_MODE_ALL -> RepeatMode.ALL - else -> RepeatMode.OFF + private fun Player.mapPlayMode(): PlayMode = when { + shuffleModeEnabled -> PlayMode.SHUFFLE + repeatMode == Player.REPEAT_MODE_ONE -> PlayMode.REPEAT + else -> PlayMode.SINGLE } fun OCFile.toPlaybackFile() = PlaybackFile( diff --git a/app/src/main/res/drawable/player_ic_repeat_one.xml b/app/src/main/res/drawable/player_ic_repeat_one.xml new file mode 100644 index 000000000000..4a5d9eb056b0 --- /dev/null +++ b/app/src/main/res/drawable/player_ic_repeat_one.xml @@ -0,0 +1,17 @@ + + + + + + diff --git a/app/src/main/res/layout/player_control_view.xml b/app/src/main/res/layout/player_control_view.xml index d76a9c1b5118..82f88eefd7b9 100644 --- a/app/src/main/res/layout/player_control_view.xml +++ b/app/src/main/res/layout/player_control_view.xml @@ -50,9 +50,12 @@ @@ -82,10 +85,10 @@ + android:contentDescription="@string/player_control_view_play_mode_button_content_description" + app:icon="@drawable/player_ic_repeat" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f3d6f60bf3e1..17df6a082bd1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1640,11 +1640,10 @@ Close Modified: %s %1$s • %2$s - Repeat button + Play mode button Previous button Play/Pause button Next button - Random button Server not allowed Run sync now From 6301a2958d3344a5640e6a92fc75b0258bf5a0bf Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Wed, 18 Nov 2026 11:38:55 +0100 Subject: [PATCH 2/8] use enum for next Signed-off-by: alperozturk96 --- .../com/nextcloud/client/player/model/state/PlayMode.kt | 8 +++++++- .../client/player/ui/control/PlayerControlView.kt | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/nextcloud/client/player/model/state/PlayMode.kt b/app/src/main/java/com/nextcloud/client/player/model/state/PlayMode.kt index 6a115c2175af..888f4d5ecce4 100644 --- a/app/src/main/java/com/nextcloud/client/player/model/state/PlayMode.kt +++ b/app/src/main/java/com/nextcloud/client/player/model/state/PlayMode.kt @@ -15,5 +15,11 @@ import kotlinx.serialization.Serializable enum class PlayMode(@param:DrawableRes val iconRes: Int) { SINGLE(R.drawable.player_ic_repeat), REPEAT(R.drawable.player_ic_repeat_one), - SHUFFLE(R.drawable.player_ic_shuffle) + SHUFFLE(R.drawable.player_ic_shuffle); + + fun next(): PlayMode = when (this) { + SINGLE -> REPEAT + REPEAT -> SHUFFLE + SHUFFLE -> SINGLE + } } diff --git a/app/src/main/java/com/nextcloud/client/player/ui/control/PlayerControlView.kt b/app/src/main/java/com/nextcloud/client/player/ui/control/PlayerControlView.kt index 535c31d9f00f..618690a4cdc2 100644 --- a/app/src/main/java/com/nextcloud/client/player/ui/control/PlayerControlView.kt +++ b/app/src/main/java/com/nextcloud/client/player/ui/control/PlayerControlView.kt @@ -195,7 +195,7 @@ class PlayerControlView @JvmOverloads constructor( } private fun applyNextPlayMode() { - val nextMode = PlayMode.entries[(playMode.ordinal + 1) % PlayMode.entries.size] + val nextMode = playMode.next() playbackModel.setPlayMode(nextMode) renderPlayMode(nextMode) From b8615bdc4ea9e44f5120f5f001cf3ff5f8c03212 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Wed, 18 Nov 2026 11:46:37 +0100 Subject: [PATCH 3/8] no tint for mode Signed-off-by: alperozturk96 --- .../com/nextcloud/client/player/ui/control/PlayerControlView.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/client/player/ui/control/PlayerControlView.kt b/app/src/main/java/com/nextcloud/client/player/ui/control/PlayerControlView.kt index 618690a4cdc2..423f67ae87aa 100644 --- a/app/src/main/java/com/nextcloud/client/player/ui/control/PlayerControlView.kt +++ b/app/src/main/java/com/nextcloud/client/player/ui/control/PlayerControlView.kt @@ -204,7 +204,6 @@ class PlayerControlView @JvmOverloads constructor( private fun renderPlayMode(mode: PlayMode) { playMode = mode binding.ivPlayMode.setIconResource(mode.iconRes) - binding.ivPlayMode.isChecked = mode != PlayMode.SINGLE } private fun render(playbackState: PlaybackState) { From 5b63f42f4dc311116bbcbf43e7b7ecd9b9b0e26a Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Wed, 18 Nov 2026 11:58:53 +0100 Subject: [PATCH 4/8] no tint for mode Signed-off-by: alperozturk96 --- .../com/nextcloud/client/player/ui/control/PlayerControlView.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/client/player/ui/control/PlayerControlView.kt b/app/src/main/java/com/nextcloud/client/player/ui/control/PlayerControlView.kt index 423f67ae87aa..8bd79fa091f6 100644 --- a/app/src/main/java/com/nextcloud/client/player/ui/control/PlayerControlView.kt +++ b/app/src/main/java/com/nextcloud/client/player/ui/control/PlayerControlView.kt @@ -151,7 +151,6 @@ class PlayerControlView @JvmOverloads constructor( binding.run { ivPrevious.iconTint = transportIconTint ivNext.iconTint = transportIconTint - ivPlayMode.iconTint = toggleIconTint ivPlayPause.backgroundTintList = serverPrimaryTint ivPlayPause.iconTint = onServerPrimaryTint From c4f92b55af817b13220f45476e874c1451fb5e95 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Wed, 18 Nov 2026 12:02:27 +0100 Subject: [PATCH 5/8] no tint for mode Signed-off-by: alperozturk96 --- .../client/player/ui/control/PlayerControlView.kt | 8 +------- app/src/main/res/layout/player_control_view.xml | 2 +- app/src/main/res/values/styles.xml | 4 ---- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/nextcloud/client/player/ui/control/PlayerControlView.kt b/app/src/main/java/com/nextcloud/client/player/ui/control/PlayerControlView.kt index 8bd79fa091f6..cfccaf93ee45 100644 --- a/app/src/main/java/com/nextcloud/client/player/ui/control/PlayerControlView.kt +++ b/app/src/main/java/com/nextcloud/client/player/ui/control/PlayerControlView.kt @@ -85,13 +85,6 @@ class PlayerControlView @JvmOverloads constructor( ContextCompat.getColorStateList(context, R.color.player_control_icon_tint) } - private val toggleIconTint: ColorStateList by lazy { - ColorStateList( - arrayOf(intArrayOf(android.R.attr.state_checked), intArrayOf()), - intArrayOf(serverPrimaryColor, ContextCompat.getColor(context, R.color.player_default_icon_color)) - ) - } - var navigator: MediaNavigator? = null private var playMode = PlayMode.SINGLE @@ -151,6 +144,7 @@ class PlayerControlView @JvmOverloads constructor( binding.run { ivPrevious.iconTint = transportIconTint ivNext.iconTint = transportIconTint + ivPlayMode.iconTint = transportIconTint ivPlayPause.backgroundTintList = serverPrimaryTint ivPlayPause.iconTint = onServerPrimaryTint diff --git a/app/src/main/res/layout/player_control_view.xml b/app/src/main/res/layout/player_control_view.xml index 82f88eefd7b9..371ffe659a9a 100644 --- a/app/src/main/res/layout/player_control_view.xml +++ b/app/src/main/res/layout/player_control_view.xml @@ -86,7 +86,7 @@ diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index b01edd987c4e..5ff8be485437 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -569,10 +569,6 @@ @dimen/player_button_margin_vertical - -