From f561c7596f511cb39df0222f3b23e8ce4070d3ed Mon Sep 17 00:00:00 2001
From: alperozturk96 <alper_ozturk@proton.me>
Date: Fri, 11 Sep 2026 15:19:03 +0200
Subject: [PATCH 1/7] fix top bar title

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
---
 app/src/main/res/layout/player_top_bar.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/layout/player_top_bar.xml b/app/src/main/res/layout/player_top_bar.xml
index 5aa851214be7..b35dc7901c51 100644
--- a/app/src/main/res/layout/player_top_bar.xml
+++ b/app/src/main/res/layout/player_top_bar.xml
@@ -31,6 +31,7 @@
         android:ellipsize="end"
         android:gravity="center_vertical"
         android:singleLine="true"
+        android:textColor="@color/player_toolbar_text_color"
         android:textAppearance="@style/TextAppearance.App.Player.Toolbar"
         tools:text="Player title" />
 

From e694ff27862003ab815ce15bb621231e05d30a60 Mon Sep 17 00:00:00 2001
From: alperozturk96 <alper_ozturk@proton.me>
Date: Fri, 11 Sep 2026 15:19:13 +0200
Subject: [PATCH 2/7] theme player control buttons

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
---
 .../player/ui/control/PlayerControlView.kt    | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 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 b80b01e3299b..195a8bb8bf8d 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
@@ -29,6 +29,7 @@ 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
+import com.owncloud.android.utils.theme.ViewThemeUtils
 import dagger.android.HasAndroidInjector
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -40,6 +41,7 @@ import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import javax.inject.Inject
+import kotlin.time.Duration.Companion.milliseconds
 
 private const val INDETERMINATE_TIME = "--:--"
 private const val TAG_CLICK_COMMAND_PLAY = "TAG_CLICK_COMMAND_PLAY"
@@ -68,6 +70,9 @@ class PlayerControlView @JvmOverloads constructor(
     @Inject
     lateinit var playbackModel: PlaybackModel
 
+    @Inject
+    lateinit var viewThemeUtils: ViewThemeUtils
+
     private val seekBarProgressChangeFlow = MutableSharedFlow<Int>(extraBufferCapacity = 1)
     private var viewScope: CoroutineScope? = null
 
@@ -79,6 +84,7 @@ class PlayerControlView @JvmOverloads constructor(
         if (!isInEditMode) {
             (context.applicationContext as HasAndroidInjector).androidInjector().inject(this)
             setDefaultTags()
+            themeButton()
             setListeners()
         }
     }
@@ -174,12 +180,24 @@ class PlayerControlView @JvmOverloads constructor(
         })
     }
 
+    private fun themeButton() {
+        viewThemeUtils.material.run {
+            binding.run {
+                colorMaterialButtonContent(ivRepeat)
+                colorMaterialButtonContent(ivPrevious)
+                colorMaterialButtonContent(ivPlayPause)
+                colorMaterialButtonContent(ivNext)
+                colorMaterialButtonContent(ivRandom)
+            }
+        }
+    }
+
     @OptIn(FlowPreview::class)
     private fun collectSeekBarChanges() {
         val viewScope = viewScope ?: return
         val lifecycleOwner = (context as? LifecycleOwner) ?: return
         seekBarProgressChangeFlow
-            .debounce(PROGRESS_CHANGE_DEBOUNCE_MS)
+            .debounce(PROGRESS_CHANGE_DEBOUNCE_MS.milliseconds)
             .flowWithLifecycle(lifecycleOwner.lifecycle, Lifecycle.State.STARTED)
             .onEach { playbackModel.seekToPosition(it.toLong()) }
             .launchIn(viewScope)

From 1058c1b005ba80de09c9fbd3158ffcdd0f37d3ac Mon Sep 17 00:00:00 2001
From: alperozturk96 <alper_ozturk@proton.me>
Date: Fri, 11 Sep 2026 15:21:54 +0200
Subject: [PATCH 3/7] fix foreground color of audio file

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
---
 app/src/main/res/layout/player_audio_file_fragment.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/layout/player_audio_file_fragment.xml b/app/src/main/res/layout/player_audio_file_fragment.xml
index 4a1430541ff0..cb3cac12268b 100644
--- a/app/src/main/res/layout/player_audio_file_fragment.xml
+++ b/app/src/main/res/layout/player_audio_file_fragment.xml
@@ -54,6 +54,7 @@
         android:scrollHorizontally="true"
         android:singleLine="true"
         android:textAppearance="@style/TextAppearance.App.Player.AudioTitle"
+        android:textColor="@color/white"
         app:layout_constraintBottom_toTopOf="@id/file_details"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -67,6 +68,7 @@
         android:ellipsize="end"
         android:singleLine="true"
         android:textAppearance="@style/TextAppearance.App.Player.AudioFileDetails"
+        android:textColor="@color/white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

From 481ac737c0585a695f0bbb8444e198a0009adf01 Mon Sep 17 00:00:00 2001
From: alperozturk96 <alper_ozturk@proton.me>
Date: Fri, 11 Sep 2026 16:20:19 +0200
Subject: [PATCH 4/7] m3 expressive for control buttons

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
---
 .../player/ui/control/PlayerControlView.kt    | 173 ++++++++----------
 .../client/player/ui/video/VideoPlayerView.kt |   3 +-
 .../res/color/player_control_icon_tint.xml    |  16 ++
 app/src/main/res/drawable/player_ic_pause.xml |   6 +-
 app/src/main/res/drawable/player_ic_play.xml  |   6 +-
 ..._selector.xml => player_ic_play_pause.xml} |   6 +-
 .../res/drawable/player_progress_drawable.xml |  37 ----
 .../res/drawable/player_progress_thumb.xml    |  19 --
 .../player_progress_thumb_pressed.xml         |  29 ---
 .../main/res/layout/player_control_view.xml   |  35 ++--
 app/src/main/res/values-large/dims.xml        |   1 -
 app/src/main/res/values/colors.xml            |   4 -
 app/src/main/res/values/dims.xml              |   8 -
 app/src/main/res/values/styles.xml            |  45 ++---
 14 files changed, 150 insertions(+), 238 deletions(-)
 create mode 100644 app/src/main/res/color/player_control_icon_tint.xml
 rename app/src/main/res/drawable/{player_progress_thumb_selector.xml => player_ic_play_pause.xml} (63%)
 delete mode 100644 app/src/main/res/drawable/player_progress_drawable.xml
 delete mode 100644 app/src/main/res/drawable/player_progress_thumb.xml
 delete mode 100644 app/src/main/res/drawable/player_progress_thumb_pressed.xml

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 195a8bb8bf8d..27be4ec1d34e 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
@@ -8,14 +8,12 @@
 package com.nextcloud.client.player.ui.control
 
 import android.content.Context
+import android.content.res.ColorStateList
 import android.os.Build
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.WindowInsets
 import android.widget.LinearLayout
-import android.widget.SeekBar
-import android.widget.SeekBar.OnSeekBarChangeListener
-import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.ContextCompat
 import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.Lifecycle
@@ -31,6 +29,7 @@ import com.owncloud.android.R
 import com.owncloud.android.databinding.PlayerControlViewBinding
 import com.owncloud.android.utils.theme.ViewThemeUtils
 import dagger.android.HasAndroidInjector
+import dynamiccolor.DynamicScheme
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.FlowPreview
@@ -44,13 +43,6 @@ import javax.inject.Inject
 import kotlin.time.Duration.Companion.milliseconds
 
 private const val INDETERMINATE_TIME = "--:--"
-private const val TAG_CLICK_COMMAND_PLAY = "TAG_CLICK_COMMAND_PLAY"
-private const val TAG_CLICK_COMMAND_PAUSE = "TAG_CLICK_COMMAND_PAUSE"
-private const val TAG_CLICK_COMMAND_REPEAT = "TAG_CLICK_COMMAND_REPEAT"
-private const val TAG_CLICK_COMMAND_DO_NOT_REPEAT = "TAG_CLICK_COMMAND_DO_NOT_REPEAT"
-private const val TAG_CLICK_COMMAND_SHUFFLE = "TAG_CLICK_COMMAND_SHUFFLE"
-private const val TAG_CLICK_COMMAND_DO_NOT_SHUFFLE = "TAG_CLICK_COMMAND_DO_NOT_SHUFFLE"
-private const val TAG_CLICK_COMMAND_UNKNOWN = "TAG_CLICK_COMMAND_UNKNOWN"
 
 private const val PROGRESS_CHANGE_DEBOUNCE_MS = 200L
 private const val DEFAULT_MIN_PROGRESS = 0
@@ -73,18 +65,39 @@ class PlayerControlView @JvmOverloads constructor(
     @Inject
     lateinit var viewThemeUtils: ViewThemeUtils
 
-    private val seekBarProgressChangeFlow = MutableSharedFlow<Int>(extraBufferCapacity = 1)
+    private val seekPositionFlow = MutableSharedFlow<Int>(extraBufferCapacity = 1)
     private var viewScope: CoroutineScope? = null
 
     val binding = PlayerControlViewBinding.inflate(LayoutInflater.from(context), this, true)
 
+    // The panel always sits on the dark player background, so the scheme has to be the dark one
+    // regardless of the system theme: the light scheme resolves the server color to a low tone
+    // that is unreadable here.
+    private val darkScheme: DynamicScheme by lazy {
+        DynamicScheme.from(viewThemeUtils.getScheme(context), true)
+    }
+
+    private val accentTint: ColorStateList by lazy { ColorStateList.valueOf(darkScheme.primary) }
+
+    private val onAccentTint: ColorStateList by lazy { ColorStateList.valueOf(darkScheme.onPrimary) }
+
+    private val transportIconTint: ColorStateList? by lazy {
+        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(darkScheme.primary, ContextCompat.getColor(context, R.color.player_default_icon_color))
+        )
+    }
+
     var navigator: MediaNavigator? = null
 
     init {
         if (!isInEditMode) {
             (context.applicationContext as HasAndroidInjector).androidInjector().inject(this)
-            setDefaultTags()
-            themeButton()
+            themeControls()
             setListeners()
         }
     }
@@ -93,7 +106,7 @@ class PlayerControlView @JvmOverloads constructor(
         super.onAttachedToWindow()
         if (!isInEditMode) {
             viewScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
-            collectSeekBarChanges()
+            collectSeekPositions()
         }
     }
 
@@ -132,71 +145,66 @@ class PlayerControlView @JvmOverloads constructor(
         render(state)
     }
 
-    private fun setDefaultTags() {
-        binding.ivPlayPause.tag = TAG_CLICK_COMMAND_UNKNOWN
-        binding.ivRandom.tag = TAG_CLICK_COMMAND_UNKNOWN
-        binding.ivRepeat.tag = TAG_CLICK_COMMAND_UNKNOWN
+    private fun themeControls() {
+        binding.run {
+            ivPrevious.iconTint = transportIconTint
+            ivNext.iconTint = transportIconTint
+            ivRepeat.iconTint = toggleIconTint
+            ivRandom.iconTint = toggleIconTint
+            ivPlayPause.backgroundTintList = accentTint
+            ivPlayPause.iconTint = onAccentTint
+
+            slider.trackActiveTintList = accentTint
+            slider.thumbTintList = accentTint
+            slider.setLabelFormatter { formatTime(it.toInt(), slider.valueTo.toInt()) }
+        }
     }
 
     private fun setListeners() {
         binding.ivPlayPause.setOnClickListener {
-            when (binding.ivPlayPause.tag) {
-                TAG_CLICK_COMMAND_PLAY -> playbackModel.play()
-                TAG_CLICK_COMMAND_PAUSE -> playbackModel.pause()
+            if (binding.ivPlayPause.isChecked) {
+                playbackModel.play()
+            } else {
+                playbackModel.pause()
             }
         }
 
+        // The model renders back synchronously, which resets the button that was just toggled, so the
+        // state the tap asked for has to be read before the first call into the model.
         binding.ivRepeat.setOnClickListener {
+            val repeatSingle = binding.ivRepeat.isChecked
+
             // Repeat and Random are mutually exclusive
             playbackModel.setShuffle(false)
 
-            when (binding.ivRepeat.tag) {
-                TAG_CLICK_COMMAND_REPEAT -> playbackModel.setRepeatMode(RepeatMode.SINGLE)
-                TAG_CLICK_COMMAND_DO_NOT_REPEAT -> playbackModel.setRepeatMode(RepeatMode.ALL)
-            }
+            playbackModel.setRepeatMode(if (repeatSingle) RepeatMode.SINGLE else RepeatMode.ALL)
         }
 
         binding.ivRandom.setOnClickListener {
+            val shuffle = binding.ivRandom.isChecked
+
             // Repeat and Random are mutually exclusive
             playbackModel.setRepeatMode(RepeatMode.OFF)
 
-            playbackModel.setShuffle(binding.ivRandom.tag == TAG_CLICK_COMMAND_SHUFFLE)
+            playbackModel.setShuffle(shuffle)
         }
 
         binding.ivNext.setOnClickListener { navigator?.showNext() }
 
         binding.ivPrevious.setOnClickListener { navigator?.showPrevious() }
 
-        binding.progressBar.setOnSeekBarChangeListener(object : OnSeekBarChangeListener {
-            override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
-                if (fromUser) {
-                    seekBarProgressChangeFlow.tryEmit(progress)
-                }
-            }
-
-            override fun onStartTrackingTouch(seekBar: SeekBar?) = Unit
-
-            override fun onStopTrackingTouch(seekBar: SeekBar?) = Unit
-        })
-    }
-
-    private fun themeButton() {
-        viewThemeUtils.material.run {
-            binding.run {
-                colorMaterialButtonContent(ivRepeat)
-                colorMaterialButtonContent(ivPrevious)
-                colorMaterialButtonContent(ivPlayPause)
-                colorMaterialButtonContent(ivNext)
-                colorMaterialButtonContent(ivRandom)
+        binding.slider.addOnChangeListener { _, value, fromUser ->
+            if (fromUser) {
+                seekPositionFlow.tryEmit(value.toInt())
             }
         }
     }
 
     @OptIn(FlowPreview::class)
-    private fun collectSeekBarChanges() {
+    private fun collectSeekPositions() {
         val viewScope = viewScope ?: return
         val lifecycleOwner = (context as? LifecycleOwner) ?: return
-        seekBarProgressChangeFlow
+        seekPositionFlow
             .debounce(PROGRESS_CHANGE_DEBOUNCE_MS.milliseconds)
             .flowWithLifecycle(lifecycleOwner.lifecycle, Lifecycle.State.STARTED)
             .onEach { playbackModel.seekToPosition(it.toLong()) }
@@ -204,65 +212,36 @@ class PlayerControlView @JvmOverloads constructor(
     }
 
     private fun render(playbackState: PlaybackState) {
-        renderRepeatButton(playbackState.repeatMode == RepeatMode.SINGLE)
-        renderShuffleButton(playbackState.shuffle)
-        renderPlayPauseButton(playbackState.currentItemState?.playerState == PlayerState.PLAYING)
-        renderNextPreviousButtons()
-        renderProgressBar(playbackState.currentItemState)
-    }
-
-    private fun renderRepeatButton(repeatSingle: Boolean) {
-        binding.ivRepeat.iconTint = ContextCompat.getColorStateList(
-            binding.root.context,
-            if (repeatSingle) {
-                R.color.player_accent_color
-            } else {
-                R.color.player_default_icon_color
-            }
-        )
-        binding.ivRepeat.tag = if (repeatSingle) TAG_CLICK_COMMAND_DO_NOT_REPEAT else TAG_CLICK_COMMAND_REPEAT
-    }
-
-    private fun renderShuffleButton(shuffle: Boolean) {
-        binding.ivRandom.iconTint = ContextCompat.getColorStateList(
-            binding.root.context,
-            if (shuffle) {
-                R.color.player_accent_color
-            } else {
-                R.color.player_default_icon_color
-            }
-        )
-        binding.ivRandom.tag = if (shuffle) TAG_CLICK_COMMAND_DO_NOT_SHUFFLE else TAG_CLICK_COMMAND_SHUFFLE
-    }
-
-    private fun renderPlayPauseButton(isPlaying: Boolean) {
-        binding.ivPlayPause.icon = AppCompatResources.getDrawable(
-            binding.root.context,
-            if (isPlaying) {
-                R.drawable.player_ic_pause
-            } else {
-                R.drawable.player_ic_play
-            }
-        )
-        binding.ivPlayPause.tag = if (isPlaying) TAG_CLICK_COMMAND_PAUSE else TAG_CLICK_COMMAND_PLAY
-    }
-
-    private fun renderNextPreviousButtons() {
+        binding.ivRepeat.isChecked = playbackState.repeatMode == RepeatMode.SINGLE
+        binding.ivRandom.isChecked = playbackState.shuffle
+        binding.ivPlayPause.isChecked = playbackState.currentItemState?.playerState == PlayerState.PLAYING
         binding.ivNext.isEnabled = navigator?.hasNext == true
         binding.ivPrevious.isEnabled = navigator?.hasPrevious == true
+        renderProgress(playbackState.currentItemState)
     }
 
-    private fun renderProgressBar(playbackItemState: PlaybackItemState?) {
+    private fun renderProgress(playbackItemState: PlaybackItemState?) {
         val enabled = playbackItemState != null && playbackItemState.maxTimeInMilliseconds > DEFAULT_MIN_PROGRESS
         val max = if (enabled) playbackItemState.maxTimeInMilliseconds.toInt() else DEFAULT_MAX_PROGRESS
         val progress = if (enabled) playbackItemState.currentTimeInMilliseconds.toInt() else DEFAULT_MIN_PROGRESS
-        binding.progressBar.isEnabled = enabled
-        binding.progressBar.max = max
-        binding.progressBar.progress = progress
+        binding.slider.isEnabled = enabled
+        moveSliderTo(max.toFloat(), progress.toFloat())
         binding.tvElapsed.text = if (enabled) formatTime(progress, max) else INDETERMINATE_TIME
         binding.tvTotalTime.text = if (enabled) formatTime(max, max) else INDETERMINATE_TIME
     }
 
+    // Slider rejects a value outside its range, so the value has to leave the old range before
+    // valueTo can shrink below it.
+    private fun moveSliderTo(valueTo: Float, value: Float) {
+        binding.slider.run {
+            if (this.valueTo != valueTo) {
+                this.value = valueFrom
+                this.valueTo = valueTo
+            }
+            this.value = value.coerceIn(valueFrom, this.valueTo)
+        }
+    }
+
     private fun formatTime(current: Int, max: Int): String {
         val seconds = current / MILLISECONDS_IN_SECOND
         val minutes = seconds / SECONDS_IN_MINUTE
diff --git a/app/src/main/java/com/nextcloud/client/player/ui/video/VideoPlayerView.kt b/app/src/main/java/com/nextcloud/client/player/ui/video/VideoPlayerView.kt
index 652f2b204212..808a69194efe 100644
--- a/app/src/main/java/com/nextcloud/client/player/ui/video/VideoPlayerView.kt
+++ b/app/src/main/java/com/nextcloud/client/player/ui/video/VideoPlayerView.kt
@@ -21,6 +21,7 @@ import com.owncloud.android.R
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlin.time.Duration.Companion.milliseconds
 
 class VideoPlayerView(context: Context) : PlayerView(context) {
 
@@ -98,7 +99,7 @@ class VideoPlayerView(context: Context) : PlayerView(context) {
         }
 
         hideControlsTimerJob = activity.lifecycleScope.launch {
-            delay(HIDE_CONTROLS_DELAY)
+            delay(HIDE_CONTROLS_DELAY.milliseconds)
             hideControls()
         }
     }
diff --git a/app/src/main/res/color/player_control_icon_tint.xml b/app/src/main/res/color/player_control_icon_tint.xml
new file mode 100644
index 000000000000..fa19cdbade74
--- /dev/null
+++ b/app/src/main/res/color/player_control_icon_tint.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:alpha="0.38"
+        android:color="@color/player_default_icon_color"
+        android:state_enabled="false" />
+
+    <item android:color="@color/player_default_icon_color" />
+
+</selector>
diff --git a/app/src/main/res/drawable/player_ic_pause.xml b/app/src/main/res/drawable/player_ic_pause.xml
index c756bb9e0f11..cbc0027a8895 100644
--- a/app/src/main/res/drawable/player_ic_pause.xml
+++ b/app/src/main/res/drawable/player_ic_pause.xml
@@ -7,11 +7,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
 
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M360,640L440,640L440,320L360,320L360,640ZM520,640L600,640L600,320L520,320L520,640ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z" />
+        android:pathData="M6,19h4V5H6v14zM14,5v14h4V5h-4z" />
 
 </vector>
diff --git a/app/src/main/res/drawable/player_ic_play.xml b/app/src/main/res/drawable/player_ic_play.xml
index 075c21089ef0..eaf659d28052 100644
--- a/app/src/main/res/drawable/player_ic_play.xml
+++ b/app/src/main/res/drawable/player_ic_play.xml
@@ -7,11 +7,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
 
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M380,660L660,480L380,300L380,660ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z" />
+        android:pathData="M8,5v14l11,-7z" />
 
 </vector>
diff --git a/app/src/main/res/drawable/player_progress_thumb_selector.xml b/app/src/main/res/drawable/player_ic_play_pause.xml
similarity index 63%
rename from app/src/main/res/drawable/player_progress_thumb_selector.xml
rename to app/src/main/res/drawable/player_ic_play_pause.xml
index dc274c5987b4..5be14e39a400 100644
--- a/app/src/main/res/drawable/player_progress_thumb_selector.xml
+++ b/app/src/main/res/drawable/player_ic_play_pause.xml
@@ -7,9 +7,9 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-        android:state_pressed="true"
-        android:drawable="@drawable/player_progress_thumb_pressed" />
+        android:drawable="@drawable/player_ic_pause"
+        android:state_checked="true" />
 
-    <item android:drawable="@drawable/player_progress_thumb" />
+    <item android:drawable="@drawable/player_ic_play" />
 
 </selector>
diff --git a/app/src/main/res/drawable/player_progress_drawable.xml b/app/src/main/res/drawable/player_progress_drawable.xml
deleted file mode 100644
index e5be77b41f13..000000000000
--- a/app/src/main/res/drawable/player_progress_drawable.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Nextcloud - Android Client
-  ~
-  ~ SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com>
-  ~ SPDX-License-Identifier: AGPL-3.0-or-later
-  -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:id="@android:id/background">
-        <shape android:shape="rectangle">
-            <size android:height="@dimen/player_progress_drawable_height" />
-            <corners android:radius="@dimen/player_progress_drawable_radius" />
-            <solid android:color="@color/player_progressbar_background_color" />
-        </shape>
-    </item>
-
-    <item android:id="@android:id/secondaryProgress">
-        <clip>
-            <shape android:shape="rectangle">
-                <size android:height="@dimen/player_progress_drawable_height" />
-                <corners android:radius="@dimen/player_progress_drawable_radius" />
-                <solid android:color="@color/player_progressbar_buffered_color" />
-            </shape>
-        </clip>
-    </item>
-
-    <item android:id="@android:id/progress">
-        <clip>
-            <shape android:shape="rectangle">
-                <size android:height="@dimen/player_progress_drawable_height" />
-                <corners android:radius="@dimen/player_progress_drawable_radius" />
-                <solid android:color="@color/player_accent_color" />
-            </shape>
-        </clip>
-    </item>
-
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/player_progress_thumb.xml b/app/src/main/res/drawable/player_progress_thumb.xml
deleted file mode 100644
index 59b7d9087570..000000000000
--- a/app/src/main/res/drawable/player_progress_thumb.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Nextcloud - Android Client
-  ~
-  ~ SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com>
-  ~ SPDX-License-Identifier: AGPL-3.0-or-later
-  -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-
-    <size
-        android:width="@dimen/player_progress_thumb_size"
-        android:height="@dimen/player_progress_thumb_size" />
-
-    <solid android:color="@color/player_accent_color" />
-
-    <stroke
-        android:width="@dimen/player_progress_thumb_stroke_width"
-        android:color="@color/player_progressbar_thumb_stroke_color" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/player_progress_thumb_pressed.xml b/app/src/main/res/drawable/player_progress_thumb_pressed.xml
deleted file mode 100644
index 034ea94b38bf..000000000000
--- a/app/src/main/res/drawable/player_progress_thumb_pressed.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Nextcloud - Android Client
-  ~
-  ~ SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com>
-  ~ SPDX-License-Identifier: AGPL-3.0-or-later
-  -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item>
-        <shape android:shape="oval">
-            <size
-                android:width="@dimen/player_progress_thumb_pressed_size"
-                android:height="@dimen/player_progress_thumb_pressed_size" />
-
-            <solid android:color="@color/player_progressbar_thumb_halo_color" />
-        </shape>
-    </item>
-
-    <item android:gravity="center">
-        <shape android:shape="oval">
-            <size
-                android:width="@dimen/player_progress_thumb_size"
-                android:height="@dimen/player_progress_thumb_size" />
-
-            <solid android:color="@color/player_accent_color" />
-        </shape>
-    </item>
-
-</layer-list>
diff --git a/app/src/main/res/layout/player_control_view.xml b/app/src/main/res/layout/player_control_view.xml
index fc1b850c0e46..d76a9c1b5118 100644
--- a/app/src/main/res/layout/player_control_view.xml
+++ b/app/src/main/res/layout/player_control_view.xml
@@ -26,13 +26,12 @@
             android:id="@+id/tvElapsed"
             style="@style/PlayerTimeTextViewStyle" />
 
-        <SeekBar
-            android:id="@+id/progressBar"
-            style="@style/PlayerSeekBarStyle"
+        <com.google.android.material.slider.Slider
+            android:id="@+id/slider"
+            style="@style/PlayerSliderStyle"
             android:layout_width="0dp"
-            android:layout_height="@dimen/player_progressbar_height"
-            android:layout_weight="1"
-            android:longClickable="false" />
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/tvTotalTime"
@@ -48,36 +47,48 @@
         android:gravity="center"
         android:orientation="horizontal">
 
+        <Space style="@style/PlayerControlSpacerStyle" />
+
         <com.google.android.material.button.MaterialButton
             android:id="@+id/ivRepeat"
-            style="@style/PlayerButtonStyle"
+            style="@style/PlayerControlToggleButtonStyle"
             android:contentDescription="@string/player_control_view_repeat_button_content_description"
             app:icon="@drawable/player_ic_repeat" />
 
+        <Space style="@style/PlayerControlSpacerStyle" />
+
         <com.google.android.material.button.MaterialButton
             android:id="@+id/ivPrevious"
-            style="@style/PlayerButtonStyle"
+            style="@style/PlayerControlButtonStyle"
             android:contentDescription="@string/player_control_view_previous_button_content_description"
             app:icon="@drawable/player_ic_skip_previous" />
 
+        <Space style="@style/PlayerControlSpacerStyle" />
+
         <com.google.android.material.button.MaterialButton
             android:id="@+id/ivPlayPause"
-            style="@style/PlayerButtonStyle"
+            style="@style/PlayerPlayPauseButtonStyle"
             android:contentDescription="@string/player_control_view_play_pause_button_content_description"
-            app:icon="@drawable/player_ic_play" />
+            app:icon="@drawable/player_ic_play_pause" />
+
+        <Space style="@style/PlayerControlSpacerStyle" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/ivNext"
-            style="@style/PlayerButtonStyle"
+            style="@style/PlayerControlButtonStyle"
             android:contentDescription="@string/player_control_view_next_button_content_description"
             app:icon="@drawable/player_ic_skip_next" />
 
+        <Space style="@style/PlayerControlSpacerStyle" />
+
         <com.google.android.material.button.MaterialButton
             android:id="@+id/ivRandom"
-            style="@style/PlayerButtonStyle"
+            style="@style/PlayerControlToggleButtonStyle"
             android:contentDescription="@string/player_control_view_random_button_content_description"
             app:icon="@drawable/player_ic_shuffle" />
 
+        <Space style="@style/PlayerControlSpacerStyle" />
+
     </LinearLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/values-large/dims.xml b/app/src/main/res/values-large/dims.xml
index b7f1e53ab405..b57fcf9474c3 100644
--- a/app/src/main/res/values-large/dims.xml
+++ b/app/src/main/res/values-large/dims.xml
@@ -10,5 +10,4 @@
     <dimen name="player_file_fragment_padding_horizontal">24dp</dimen>
     <dimen name="player_cover_margin_vertical">24dp</dimen>
     <dimen name="player_file_margin_bottom">48dp</dimen>
-    <dimen name="player_button_margin_horizontal">40dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index afad3b71b8d4..1ee30472ae83 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -91,7 +91,6 @@
     <color name="bg_message_bubble">#EFEFEF</color>
 
     <!-- Player -->
-    <color name="player_accent_color">@color/color_accent</color>
     <color name="player_background_color">#111111</color>
     <color name="player_default_text_color">@color/white</color>
     <color name="player_toolbar_text_color">@color/white</color>
@@ -100,7 +99,4 @@
     <color name="player_video_toolbar_background_color">#21000000</color>
     <color name="player_video_control_view_background_color">#21000000</color>
     <color name="player_progressbar_background_color">#979797</color>
-    <color name="player_progressbar_thumb_stroke_color">#33000000</color>
-    <color name="player_progressbar_thumb_halo_color">#40FFFFFF</color>
-    <color name="player_progressbar_buffered_color">#CFCFCF</color>
 </resources>
diff --git a/app/src/main/res/values/dims.xml b/app/src/main/res/values/dims.xml
index e24be6d7d9be..b35b334e99cb 100644
--- a/app/src/main/res/values/dims.xml
+++ b/app/src/main/res/values/dims.xml
@@ -179,16 +179,8 @@
     <dimen name="player_file_margin_bottom">32dp</dimen>
     <dimen name="player_album_cover_size">350dp</dimen>
     <dimen name="player_file_icon_size">96dp</dimen>
-    <dimen name="player_progressbar_height">24dp</dimen>
     <dimen name="player_progress_panel_padding_horizontal">@dimen/standard_padding</dimen>
     <dimen name="player_panel_margin_bottom">@dimen/standard_padding</dimen>
-    <dimen name="player_progress_drawable_height">2dp</dimen>
-    <dimen name="player_progress_drawable_radius">4dp</dimen>
-    <dimen name="player_progress_thumb_size">12dp</dimen>
-    <dimen name="player_progress_thumb_pressed_size">24dp</dimen>
-    <dimen name="player_progress_thumb_stroke_width">1dp</dimen>
-    <dimen name="player_progress_thumb_halo_radius">12dp</dimen>
     <dimen name="player_progress_time_text_size">15sp</dimen>
-    <dimen name="player_button_margin_horizontal">16dp</dimen>
     <dimen name="player_button_margin_vertical">8dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 218a002a027b..f50464fdb0cd 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -552,33 +552,36 @@
 
     <style name="ShapeAppearance.App.Player.Media" parent="ShapeAppearance.Material3.Corner.None" />
 
-    <style name="PlayerSeekBarStyle" parent="@android:style/Widget.SeekBar">
-        <item name="android:progressDrawable">@drawable/player_progress_drawable</item>
-        <item name="android:thumb">@drawable/player_progress_thumb_selector</item>
-        <item name="android:paddingStart">@dimen/player_progress_thumb_halo_radius</item>
-        <item name="android:paddingEnd">@dimen/player_progress_thumb_halo_radius</item>
-        <item name="android:minHeight">@dimen/player_progress_drawable_height</item>
-        <item name="android:maxHeight">@dimen/player_progress_drawable_height</item>
+    <style name="PlayerSliderStyle" parent="Widget.Material3.Slider">
+        <item name="labelBehavior">gone</item>
+        <item name="trackColorInactive">@color/player_progressbar_background_color</item>
     </style>
 
-    <style name="PlayerButtonStyle" parent="@style/Widget.Material3.Button.IconButton">
-        <item name="iconSize">32dp</item>
+    <style name="PlayerControlSpacerStyle">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">1dp</item>
+        <item name="android:layout_weight">1</item>
+    </style>
 
-        <item name="android:layout_width">@dimen/minimum_size_for_touchable_area</item>
-        <item name="android:layout_height">@dimen/minimum_size_for_touchable_area</item>
+    <style name="PlayerControlButtonStyle" parent="Widget.Material3Expressive.Button.IconButton">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.Material3Expressive.Button.IconButton.Standard</item>
+        <item name="materialSizeOverlay">@style/SizeOverlay.Material3Expressive.Button.IconButton.Small</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">@dimen/player_button_margin_vertical</item>
+        <item name="android:layout_marginBottom">@dimen/player_button_margin_vertical</item>
+    </style>
 
-        <item name="android:padding">0dp</item>
-        <item name="android:insetLeft">0dp</item>
-        <item name="android:insetRight">0dp</item>
-        <item name="android:insetTop">0dp</item>
-        <item name="android:insetBottom">0dp</item>
+    <style name="PlayerControlToggleButtonStyle" parent="PlayerControlButtonStyle">
+        <item name="android:checkable">true</item>
+    </style>
 
-        <item name="android:layout_marginStart">@dimen/player_button_margin_horizontal</item>
-        <item name="android:layout_marginEnd">@dimen/player_button_margin_horizontal</item>
+    <style name="PlayerPlayPauseButtonStyle" parent="Widget.Material3Expressive.Button.IconButton.Filled">
+        <item name="materialSizeOverlay">@style/SizeOverlay.Material3Expressive.Button.IconButton.Medium</item>
+        <item name="android:checkable">true</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginTop">@dimen/player_button_margin_vertical</item>
         <item name="android:layout_marginBottom">@dimen/player_button_margin_vertical</item>
-
-        <item name="iconGravity">textStart</item>
-        <item name="iconPadding">0dp</item>
     </style>
 </resources>

From c09a1eadddcca2b3d9628729153cf0929c70e485 Mon Sep 17 00:00:00 2001
From: alperozturk96 <alper_ozturk@proton.me>
Date: Fri, 11 Sep 2026 16:37:01 +0200
Subject: [PATCH 5/7] handle paddings

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
---
 .../client/player/ui/PlayerProgressIndicator.kt |  2 --
 .../res/layout/player_audio_file_fragment.xml   |  6 +++---
 app/src/main/res/layout/player_top_bar.xml      |  8 +++++---
 app/src/main/res/values-large/dims.xml          |  2 +-
 app/src/main/res/values/dims.xml                |  9 ++-------
 app/src/main/res/values/styles.xml              | 17 ++++++++---------
 6 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/client/player/ui/PlayerProgressIndicator.kt b/app/src/main/java/com/nextcloud/client/player/ui/PlayerProgressIndicator.kt
index 947e9b04c46a..d605e7277876 100644
--- a/app/src/main/java/com/nextcloud/client/player/ui/PlayerProgressIndicator.kt
+++ b/app/src/main/java/com/nextcloud/client/player/ui/PlayerProgressIndicator.kt
@@ -34,8 +34,6 @@ class PlayerProgressIndicator @JvmOverloads constructor(
     private var playbackFile: PlaybackFile? = null
 
     init {
-        indicatorTrackGapSize = 0
-        trackStopIndicatorSize = 0
         if (!isInEditMode) {
             (context.applicationContext as HasAndroidInjector).androidInjector().inject(this)
         }
diff --git a/app/src/main/res/layout/player_audio_file_fragment.xml b/app/src/main/res/layout/player_audio_file_fragment.xml
index cb3cac12268b..02e5603116cc 100644
--- a/app/src/main/res/layout/player_audio_file_fragment.xml
+++ b/app/src/main/res/layout/player_audio_file_fragment.xml
@@ -42,7 +42,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintWidth_max="@dimen/player_album_cover_size"
-        app:shapeAppearance="@style/ShapeAppearance.App.Player.Media" />
+        app:shapeAppearance="@style/ShapeAppearance.App.Player.AlbumCover" />
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/title"
@@ -54,7 +54,7 @@
         android:scrollHorizontally="true"
         android:singleLine="true"
         android:textAppearance="@style/TextAppearance.App.Player.AudioTitle"
-        android:textColor="@color/white"
+        android:textColor="@color/player_default_text_color"
         app:layout_constraintBottom_toTopOf="@id/file_details"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -68,7 +68,7 @@
         android:ellipsize="end"
         android:singleLine="true"
         android:textAppearance="@style/TextAppearance.App.Player.AudioFileDetails"
-        android:textColor="@color/white"
+        android:textColor="@color/player_default_text_color"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/player_top_bar.xml b/app/src/main/res/layout/player_top_bar.xml
index b35dc7901c51..b333b61077ea 100644
--- a/app/src/main/res/layout/player_top_bar.xml
+++ b/app/src/main/res/layout/player_top_bar.xml
@@ -18,8 +18,8 @@
     <com.google.android.material.button.MaterialButton
         android:id="@+id/back"
         style="@style/PlayerToolbarIconButtonStyle"
-        android:layout_marginStart="@dimen/player_back_button_margin_start"
-        android:layout_marginEnd="@dimen/player_back_button_margin_end"
+        android:layout_marginStart="@dimen/player_toolbar_icon_margin_horizontal"
+        android:layout_marginEnd="@dimen/player_toolbar_title_margin_start"
         android:contentDescription="@string/common_back"
         app:icon="@drawable/ic_arrow_back" />
 
@@ -31,13 +31,15 @@
         android:ellipsize="end"
         android:gravity="center_vertical"
         android:singleLine="true"
-        android:textColor="@color/player_toolbar_text_color"
         android:textAppearance="@style/TextAppearance.App.Player.Toolbar"
+        android:textColor="@color/player_toolbar_text_color"
         tools:text="Player title" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/more"
         style="@style/PlayerToolbarIconButtonStyle"
+        android:layout_marginStart="@dimen/player_toolbar_title_margin_start"
+        android:layout_marginEnd="@dimen/player_toolbar_icon_margin_horizontal"
         android:contentDescription="@string/overflow_menu"
         app:icon="@drawable/ic_dots_vertical" />
 
diff --git a/app/src/main/res/values-large/dims.xml b/app/src/main/res/values-large/dims.xml
index b57fcf9474c3..b1b86cc3d881 100644
--- a/app/src/main/res/values-large/dims.xml
+++ b/app/src/main/res/values-large/dims.xml
@@ -6,7 +6,7 @@
   -->
 <resources>
     <dimen name="player_toolbar_height">64dp</dimen>
-    <dimen name="player_back_button_margin_start">12dp</dimen>
+    <dimen name="player_toolbar_icon_margin_horizontal">12dp</dimen>
     <dimen name="player_file_fragment_padding_horizontal">24dp</dimen>
     <dimen name="player_cover_margin_vertical">24dp</dimen>
     <dimen name="player_file_margin_bottom">48dp</dimen>
diff --git a/app/src/main/res/values/dims.xml b/app/src/main/res/values/dims.xml
index b35b334e99cb..0bf97b5df1e8 100644
--- a/app/src/main/res/values/dims.xml
+++ b/app/src/main/res/values/dims.xml
@@ -167,20 +167,15 @@
 
     <!-- Player -->
     <dimen name="player_toolbar_height">56dp</dimen>
-    <dimen name="player_toolbar_text_size">21sp</dimen>
-    <dimen name="player_toolbar_icon_size">24dp</dimen>
-    <dimen name="player_back_button_margin_start">4dp</dimen>
-    <dimen name="player_back_button_margin_end">12dp</dimen>
+    <dimen name="player_toolbar_icon_margin_horizontal">4dp</dimen>
+    <dimen name="player_toolbar_title_margin_start">12dp</dimen>
     <dimen name="player_file_fragment_padding_horizontal">16dp</dimen>
     <dimen name="player_cover_margin_vertical">16dp</dimen>
-    <dimen name="player_audio_title_text_size">16sp</dimen>
     <dimen name="player_title_margin_bottom">8dp</dimen>
-    <dimen name="player_audio_file_details_text_size">12sp</dimen>
     <dimen name="player_file_margin_bottom">32dp</dimen>
     <dimen name="player_album_cover_size">350dp</dimen>
     <dimen name="player_file_icon_size">96dp</dimen>
     <dimen name="player_progress_panel_padding_horizontal">@dimen/standard_padding</dimen>
     <dimen name="player_panel_margin_bottom">@dimen/standard_padding</dimen>
-    <dimen name="player_progress_time_text_size">15sp</dimen>
     <dimen name="player_button_margin_vertical">8dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f50464fdb0cd..8f0ebd159ea8 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -519,39 +519,38 @@
         <item name="android:singleLine">true</item>
         <item name="android:ellipsize">end</item>
         <item name="android:gravity">center</item>
-        <item name="android:textColor">@color/player_default_text_color</item>
         <item name="android:textAppearance">@style/TextAppearance.App.Player.ProgressTime</item>
+        <item name="android:textColor">@color/player_default_text_color</item>
     </style>
 
     <style name="TextAppearance.App.Player.Toolbar" parent="TextAppearance.Material3.TitleLarge">
         <item name="android:textColor">@color/player_toolbar_text_color</item>
-        <item name="android:textSize">@dimen/player_toolbar_text_size</item>
     </style>
 
-    <style name="TextAppearance.App.Player.ProgressTime" parent="TextAppearance.Material3.BodyMedium">
+    <style name="TextAppearance.App.Player.ProgressTime" parent="TextAppearance.Material3.LabelLarge">
         <item name="android:textColor">@color/player_default_text_color</item>
-        <item name="android:textSize">@dimen/player_progress_time_text_size</item>
     </style>
 
-    <style name="PlayerToolbarIconButtonStyle" parent="@style/Widget.AppTheme.Button.IconButton">
+    <style name="PlayerToolbarIconButtonStyle" parent="Widget.Material3Expressive.Button.IconButton">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.Material3Expressive.Button.IconButton.Standard</item>
+        <item name="materialSizeOverlay">@style/SizeOverlay.Material3Expressive.Button.IconButton.Small</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="iconSize">@dimen/player_toolbar_icon_size</item>
         <item name="iconTint">@color/player_toolbar_icon_color</item>
     </style>
 
-    <style name="TextAppearance.App.Player.AudioTitle" parent="TextAppearance.Material3.BodyLarge">
+    <style name="TextAppearance.App.Player.AudioTitle" parent="TextAppearance.Material3.TitleMedium">
         <item name="android:textColor">@color/player_default_text_color</item>
-        <item name="android:textSize">@dimen/player_audio_title_text_size</item>
     </style>
 
     <style name="TextAppearance.App.Player.AudioFileDetails" parent="TextAppearance.Material3.BodySmall">
         <item name="android:textColor">@color/player_default_text_color</item>
-        <item name="android:textSize">@dimen/player_audio_file_details_text_size</item>
     </style>
 
     <style name="ShapeAppearance.App.Player.Media" parent="ShapeAppearance.Material3.Corner.None" />
 
+    <style name="ShapeAppearance.App.Player.AlbumCover" parent="ShapeAppearance.Material3.Corner.Large" />
+
     <style name="PlayerSliderStyle" parent="Widget.Material3.Slider">
         <item name="labelBehavior">gone</item>
         <item name="trackColorInactive">@color/player_progressbar_background_color</item>

From 02046c7b316c46058efe4ddae2904d0e26b8e058 Mon Sep 17 00:00:00 2001
From: alperozturk96 <alper_ozturk@proton.me>
Date: Fri, 11 Sep 2026 17:14:21 +0200
Subject: [PATCH 6/7] use material toolbar

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
---
 .../client/player/ui/PlayerActivity.kt        |  4 +-
 .../nextcloud/client/player/ui/PlayerView.kt  | 27 +++++++++----
 .../client/player/ui/audio/AudioPlayerView.kt |  2 +-
 .../player/ui/control/PlayerControlView.kt    |  7 ----
 .../client/player/ui/video/VideoPlayerView.kt |  4 +-
 .../drawable/player_video_control_scrim.xml   | 15 +++++++
 .../res/drawable/player_video_top_scrim.xml   | 15 +++++++
 app/src/main/res/layout/player_top_bar.xml    | 39 +++----------------
 app/src/main/res/layout/player_video_view.xml |  2 +-
 .../res/layout/preview_playback_fragment.xml  |  2 +-
 app/src/main/res/menu/player_top_bar.xml      | 17 ++++++++
 app/src/main/res/values-large/dims.xml        |  1 -
 app/src/main/res/values/colors.xml            |  1 +
 app/src/main/res/values/dims.xml              |  2 -
 app/src/main/res/values/styles.xml            | 18 ++++++---
 15 files changed, 92 insertions(+), 64 deletions(-)
 create mode 100644 app/src/main/res/drawable/player_video_control_scrim.xml
 create mode 100644 app/src/main/res/drawable/player_video_top_scrim.xml
 create mode 100644 app/src/main/res/menu/player_top_bar.xml

diff --git a/app/src/main/java/com/nextcloud/client/player/ui/PlayerActivity.kt b/app/src/main/java/com/nextcloud/client/player/ui/PlayerActivity.kt
index dc7d5ebf1593..751f465c34c3 100644
--- a/app/src/main/java/com/nextcloud/client/player/ui/PlayerActivity.kt
+++ b/app/src/main/java/com/nextcloud/client/player/ui/PlayerActivity.kt
@@ -12,7 +12,6 @@ import android.content.Intent
 import android.content.res.Configuration
 import android.media.AudioManager
 import android.os.Bundle
-import android.view.View
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.addCallback
 import androidx.activity.enableEdgeToEdge
@@ -104,8 +103,7 @@ class PlayerActivity :
             PlaybackFileType.AUDIO -> AudioPlayerView(this)
             PlaybackFileType.VIDEO -> VideoPlayerView(this)
         }
-        val moreButton = playerView.findViewById<View>(R.id.more)
-        moreButton.setOnClickListener { viewModel.onMoreButtonClick() }
+        playerView.onMoreClick = { viewModel.onMoreButtonClick() }
         setContentView(playerView)
     }
 
diff --git a/app/src/main/java/com/nextcloud/client/player/ui/PlayerView.kt b/app/src/main/java/com/nextcloud/client/player/ui/PlayerView.kt
index 7dc7ca7e18fa..eb632ca452a7 100644
--- a/app/src/main/java/com/nextcloud/client/player/ui/PlayerView.kt
+++ b/app/src/main/java/com/nextcloud/client/player/ui/PlayerView.kt
@@ -9,14 +9,14 @@ package com.nextcloud.client.player.ui
 
 import android.content.Context
 import android.util.AttributeSet
-import android.view.View
 import android.widget.LinearLayout
-import android.widget.TextView
 import androidx.annotation.CallSuper
 import androidx.annotation.LayoutRes
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.graphics.Insets
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
+import com.google.android.material.appbar.MaterialToolbar
 import com.nextcloud.client.account.UserAccountManager
 import com.nextcloud.client.jobs.download.FileDownloadHelper
 import com.nextcloud.client.player.media3.PlaybackModel
@@ -63,11 +63,12 @@ abstract class PlayerView @JvmOverloads constructor(
     protected val activity: AppCompatActivity by lazy { context as AppCompatActivity }
     protected val windowWrapper: WindowWrapper by lazy { WindowWrapper(activity.window) }
 
-    protected val topBar: View by lazy { findViewById(R.id.topBar) }
-    protected val titleTextView: TextView by lazy { findViewById(R.id.title) }
+    protected val topBar: MaterialToolbar by lazy { findViewById(R.id.topBar) }
     protected val playerPager: PlayerPager by lazy { findViewById(R.id.playerPager) }
     protected val playerControlView: PlayerControlView by lazy { findViewById(R.id.playerControlView) }
 
+    var onMoreClick: (() -> Unit)? = null
+
     init {
         inflate(context, layoutRes, this)
         if (!isInEditMode) {
@@ -75,10 +76,22 @@ abstract class PlayerView @JvmOverloads constructor(
             playerPager.initialize(activity.supportFragmentManager, activity.lifecycle, createFragment)
             playerPager.onItemSelected = { playbackModel.switchToFile(it) }
             playerControlView.navigator = playerPager
-            findViewById<View>(R.id.back).setOnClickListener { activity.onBackPressedDispatcher.onBackPressed() }
+            topBar.setNavigationOnClickListener { activity.onBackPressedDispatcher.onBackPressed() }
+            topBar.setOnMenuItemClickListener { menuItem ->
+                val isMore = menuItem.itemId == R.id.action_more
+                if (isMore) {
+                    onMoreClick?.invoke()
+                }
+                isMore
+            }
         }
     }
 
+    protected fun applyTopBarInsets(insets: Insets) {
+        val actionInset = resources.getDimensionPixelSize(R.dimen.standard_quarter_padding)
+        topBar.setPadding(insets.left, insets.top, insets.right + actionInset, 0)
+    }
+
     @CallSuper
     open fun onStart() {
         val state = playbackModel.state
@@ -151,10 +164,10 @@ abstract class PlayerView @JvmOverloads constructor(
 
         if (state.currentItemState != null) {
             val file = state.currentItemState.file
-            titleTextView.text = file.getNameWithoutExtension()
+            topBar.title = file.getNameWithoutExtension()
             playerPager.setCurrentItem(file)
         } else {
-            titleTextView.text = ""
+            topBar.title = ""
         }
     }
 }
diff --git a/app/src/main/java/com/nextcloud/client/player/ui/audio/AudioPlayerView.kt b/app/src/main/java/com/nextcloud/client/player/ui/audio/AudioPlayerView.kt
index 5ef66985a46c..13f27a139a55 100644
--- a/app/src/main/java/com/nextcloud/client/player/ui/audio/AudioPlayerView.kt
+++ b/app/src/main/java/com/nextcloud/client/player/ui/audio/AudioPlayerView.kt
@@ -31,7 +31,7 @@ class AudioPlayerView(context: Context) : PlayerView(context) {
         val windowInsetsCompat = WindowInsetsCompat.toWindowInsetsCompat(windowInsets)
         val insets = windowInsetsCompat.getInsets(Type.systemBars() or Type.displayCutout())
 
-        topBar.setPadding(insets.left, insets.top, insets.right, 0)
+        applyTopBarInsets(insets)
         playerPager.setPadding(insets.left, 0, insets.right, 0)
         playerControlView.setPadding(insets.left, 0, insets.right, insets.bottom)
 
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 27be4ec1d34e..3f777bfaf70a 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
@@ -70,9 +70,6 @@ class PlayerControlView @JvmOverloads constructor(
 
     val binding = PlayerControlViewBinding.inflate(LayoutInflater.from(context), this, true)
 
-    // The panel always sits on the dark player background, so the scheme has to be the dark one
-    // regardless of the system theme: the light scheme resolves the server color to a low tone
-    // that is unreadable here.
     private val darkScheme: DynamicScheme by lazy {
         DynamicScheme.from(viewThemeUtils.getScheme(context), true)
     }
@@ -169,8 +166,6 @@ class PlayerControlView @JvmOverloads constructor(
             }
         }
 
-        // The model renders back synchronously, which resets the button that was just toggled, so the
-        // state the tap asked for has to be read before the first call into the model.
         binding.ivRepeat.setOnClickListener {
             val repeatSingle = binding.ivRepeat.isChecked
 
@@ -230,8 +225,6 @@ class PlayerControlView @JvmOverloads constructor(
         binding.tvTotalTime.text = if (enabled) formatTime(max, max) else INDETERMINATE_TIME
     }
 
-    // Slider rejects a value outside its range, so the value has to leave the old range before
-    // valueTo can shrink below it.
     private fun moveSliderTo(valueTo: Float, value: Float) {
         binding.slider.run {
             if (this.valueTo != valueTo) {
diff --git a/app/src/main/java/com/nextcloud/client/player/ui/video/VideoPlayerView.kt b/app/src/main/java/com/nextcloud/client/player/ui/video/VideoPlayerView.kt
index 808a69194efe..125e3e9890ba 100644
--- a/app/src/main/java/com/nextcloud/client/player/ui/video/VideoPlayerView.kt
+++ b/app/src/main/java/com/nextcloud/client/player/ui/video/VideoPlayerView.kt
@@ -36,7 +36,7 @@ class VideoPlayerView(context: Context) : PlayerView(context) {
     private var hideControlsTimerJob: Job? = null
 
     init {
-        topBar.setBackgroundResource(R.color.player_video_toolbar_background_color)
+        topBar.setBackgroundResource(R.drawable.player_video_top_scrim)
     }
 
     override fun onStart() {
@@ -56,7 +56,7 @@ class VideoPlayerView(context: Context) : PlayerView(context) {
         val windowInsetsCompat = WindowInsetsCompat.toWindowInsetsCompat(windowInsets)
         val insets = windowInsetsCompat.getInsets(Type.systemBars() or Type.displayCutout())
 
-        topBar.setPadding(insets.left, insets.top, insets.right, 0)
+        applyTopBarInsets(insets)
         playerControlView.setPadding(insets.left, 0, insets.right, insets.bottom)
 
         windowWrapper.setupStatusBar(R.color.player_video_toolbar_background_color)
diff --git a/app/src/main/res/drawable/player_video_control_scrim.xml b/app/src/main/res/drawable/player_video_control_scrim.xml
new file mode 100644
index 000000000000..caa78d3511f1
--- /dev/null
+++ b/app/src/main/res/drawable/player_video_control_scrim.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <gradient
+        android:angle="90"
+        android:endColor="@android:color/transparent"
+        android:startColor="@color/player_video_scrim_color" />
+
+</shape>
diff --git a/app/src/main/res/drawable/player_video_top_scrim.xml b/app/src/main/res/drawable/player_video_top_scrim.xml
new file mode 100644
index 000000000000..28424508e791
--- /dev/null
+++ b/app/src/main/res/drawable/player_video_top_scrim.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <gradient
+        android:angle="270"
+        android:endColor="@android:color/transparent"
+        android:startColor="@color/player_video_scrim_color" />
+
+</shape>
diff --git a/app/src/main/res/layout/player_top_bar.xml b/app/src/main/res/layout/player_top_bar.xml
index b333b61077ea..b6de94155ea8 100644
--- a/app/src/main/res/layout/player_top_bar.xml
+++ b/app/src/main/res/layout/player_top_bar.xml
@@ -5,42 +5,15 @@
   ~ SPDX-License-Identifier: AGPL-3.0-or-later
   -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.appbar.MaterialToolbar xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/topBar"
+    style="@style/PlayerToolbarStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:gravity="center_vertical"
     android:minHeight="@dimen/player_toolbar_height"
-    android:orientation="horizontal">
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/back"
-        style="@style/PlayerToolbarIconButtonStyle"
-        android:layout_marginStart="@dimen/player_toolbar_icon_margin_horizontal"
-        android:layout_marginEnd="@dimen/player_toolbar_title_margin_start"
-        android:contentDescription="@string/common_back"
-        app:icon="@drawable/ic_arrow_back" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/title"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:ellipsize="end"
-        android:gravity="center_vertical"
-        android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.App.Player.Toolbar"
-        android:textColor="@color/player_toolbar_text_color"
-        tools:text="Player title" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/more"
-        style="@style/PlayerToolbarIconButtonStyle"
-        android:layout_marginStart="@dimen/player_toolbar_title_margin_start"
-        android:layout_marginEnd="@dimen/player_toolbar_icon_margin_horizontal"
-        android:contentDescription="@string/overflow_menu"
-        app:icon="@drawable/ic_dots_vertical" />
-
-</LinearLayout>
+    app:menu="@menu/player_top_bar"
+    app:navigationContentDescription="@string/common_back"
+    app:navigationIcon="@drawable/ic_arrow_back"
+    tools:title="Player title" />
diff --git a/app/src/main/res/layout/player_video_view.xml b/app/src/main/res/layout/player_video_view.xml
index 6947f266bafd..dfa6d20b83a5 100644
--- a/app/src/main/res/layout/player_video_view.xml
+++ b/app/src/main/res/layout/player_video_view.xml
@@ -22,6 +22,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:background="@color/player_video_control_view_background_color" />
+        android:background="@drawable/player_video_control_scrim" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/preview_playback_fragment.xml b/app/src/main/res/layout/preview_playback_fragment.xml
index b20ee525a64f..2362b23a4631 100644
--- a/app/src/main/res/layout/preview_playback_fragment.xml
+++ b/app/src/main/res/layout/preview_playback_fragment.xml
@@ -36,6 +36,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:background="@color/player_video_control_view_background_color" />
+        android:background="@drawable/player_video_control_scrim" />
 
 </FrameLayout>
diff --git a/app/src/main/res/menu/player_top_bar.xml b/app/src/main/res/menu/player_top_bar.xml
new file mode 100644
index 000000000000..615cd9b2df21
--- /dev/null
+++ b/app/src/main/res/menu/player_top_bar.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com>
+  ~ SPDX-License-Identifier: AGPL-3.0-or-later
+  -->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_more"
+        android:icon="@drawable/ic_dots_vertical"
+        app:iconTint="@color/player_toolbar_icon_color"
+        android:title="@string/overflow_menu"
+        app:showAsAction="always" />
+
+</menu>
diff --git a/app/src/main/res/values-large/dims.xml b/app/src/main/res/values-large/dims.xml
index b1b86cc3d881..33939cb9b099 100644
--- a/app/src/main/res/values-large/dims.xml
+++ b/app/src/main/res/values-large/dims.xml
@@ -6,7 +6,6 @@
   -->
 <resources>
     <dimen name="player_toolbar_height">64dp</dimen>
-    <dimen name="player_toolbar_icon_margin_horizontal">12dp</dimen>
     <dimen name="player_file_fragment_padding_horizontal">24dp</dimen>
     <dimen name="player_cover_margin_vertical">24dp</dimen>
     <dimen name="player_file_margin_bottom">48dp</dimen>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1ee30472ae83..5a05b4786e5f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -98,5 +98,6 @@
     <color name="player_toolbar_icon_color">@color/white</color>
     <color name="player_video_toolbar_background_color">#21000000</color>
     <color name="player_video_control_view_background_color">#21000000</color>
+    <color name="player_video_scrim_color">#B3000000</color>
     <color name="player_progressbar_background_color">#979797</color>
 </resources>
diff --git a/app/src/main/res/values/dims.xml b/app/src/main/res/values/dims.xml
index 0bf97b5df1e8..14c61d430785 100644
--- a/app/src/main/res/values/dims.xml
+++ b/app/src/main/res/values/dims.xml
@@ -167,8 +167,6 @@
 
     <!-- Player -->
     <dimen name="player_toolbar_height">56dp</dimen>
-    <dimen name="player_toolbar_icon_margin_horizontal">4dp</dimen>
-    <dimen name="player_toolbar_title_margin_start">12dp</dimen>
     <dimen name="player_file_fragment_padding_horizontal">16dp</dimen>
     <dimen name="player_cover_margin_vertical">16dp</dimen>
     <dimen name="player_title_margin_bottom">8dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8f0ebd159ea8..8290142dd8f3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -531,12 +531,18 @@
         <item name="android:textColor">@color/player_default_text_color</item>
     </style>
 
-    <style name="PlayerToolbarIconButtonStyle" parent="Widget.Material3Expressive.Button.IconButton">
-        <item name="materialThemeOverlay">@style/ThemeOverlay.Material3Expressive.Button.IconButton.Standard</item>
-        <item name="materialSizeOverlay">@style/SizeOverlay.Material3Expressive.Button.IconButton.Small</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="iconTint">@color/player_toolbar_icon_color</item>
+    <style name="PlayerToolbarStyle" parent="Widget.Material3.Toolbar.OnSurface">
+        <item name="android:theme">@style/ThemeOverlay.App.Player.Toolbar</item>
+        <item name="titleTextAppearance">@style/TextAppearance.App.Player.Toolbar</item>
+        <item name="titleTextColor">@color/player_toolbar_text_color</item>
+        <item name="navigationIconTint">@color/player_toolbar_icon_color</item>
+        <item name="android:background">@android:color/transparent</item>
+    </style>
+
+    <style name="ThemeOverlay.App.Player.Toolbar" parent="">
+        <item name="colorControlNormal">@color/player_toolbar_icon_color</item>
+        <item name="colorOnSurface">@color/player_toolbar_text_color</item>
+        <item name="colorOnSurfaceVariant">@color/player_toolbar_icon_color</item>
     </style>
 
     <style name="TextAppearance.App.Player.AudioTitle" parent="TextAppearance.Material3.TitleMedium">

From 64f3fb85c1d0a12e7ede73d68792540f51a650f4 Mon Sep 17 00:00:00 2001
From: alperozturk96 <alper_ozturk@proton.me>
Date: Fri, 11 Sep 2026 17:33:14 +0200
Subject: [PATCH 7/7] apply branding

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
---
 .../player/ui/control/PlayerControlView.kt    | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 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 3f777bfaf70a..646f04a313d7 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
@@ -19,6 +19,7 @@ import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.Lifecycle
 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.PlaybackItemState
 import com.nextcloud.client.player.model.state.PlaybackState
@@ -29,7 +30,6 @@ import com.owncloud.android.R
 import com.owncloud.android.databinding.PlayerControlViewBinding
 import com.owncloud.android.utils.theme.ViewThemeUtils
 import dagger.android.HasAndroidInjector
-import dynamiccolor.DynamicScheme
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.FlowPreview
@@ -65,18 +65,21 @@ class PlayerControlView @JvmOverloads constructor(
     @Inject
     lateinit var viewThemeUtils: ViewThemeUtils
 
+    @Inject
+    lateinit var colorUtil: ColorUtil
+
     private val seekPositionFlow = MutableSharedFlow<Int>(extraBufferCapacity = 1)
     private var viewScope: CoroutineScope? = null
 
     val binding = PlayerControlViewBinding.inflate(LayoutInflater.from(context), this, true)
 
-    private val darkScheme: DynamicScheme by lazy {
-        DynamicScheme.from(viewThemeUtils.getScheme(context), true)
-    }
+    private val serverPrimaryColor: Int by lazy { viewThemeUtils.getScheme(context).sourceColorArgb }
 
-    private val accentTint: ColorStateList by lazy { ColorStateList.valueOf(darkScheme.primary) }
+    private val serverPrimaryTint: ColorStateList by lazy { ColorStateList.valueOf(serverPrimaryColor) }
 
-    private val onAccentTint: ColorStateList by lazy { ColorStateList.valueOf(darkScheme.onPrimary) }
+    private val onServerPrimaryTint: ColorStateList by lazy {
+        ColorStateList.valueOf(colorUtil.getForegroundColorForBackgroundColor(serverPrimaryColor))
+    }
 
     private val transportIconTint: ColorStateList? by lazy {
         ContextCompat.getColorStateList(context, R.color.player_control_icon_tint)
@@ -85,7 +88,7 @@ class PlayerControlView @JvmOverloads constructor(
     private val toggleIconTint: ColorStateList by lazy {
         ColorStateList(
             arrayOf(intArrayOf(android.R.attr.state_checked), intArrayOf()),
-            intArrayOf(darkScheme.primary, ContextCompat.getColor(context, R.color.player_default_icon_color))
+            intArrayOf(serverPrimaryColor, ContextCompat.getColor(context, R.color.player_default_icon_color))
         )
     }
 
@@ -148,11 +151,11 @@ class PlayerControlView @JvmOverloads constructor(
             ivNext.iconTint = transportIconTint
             ivRepeat.iconTint = toggleIconTint
             ivRandom.iconTint = toggleIconTint
-            ivPlayPause.backgroundTintList = accentTint
-            ivPlayPause.iconTint = onAccentTint
+            ivPlayPause.backgroundTintList = serverPrimaryTint
+            ivPlayPause.iconTint = onServerPrimaryTint
 
-            slider.trackActiveTintList = accentTint
-            slider.thumbTintList = accentTint
+            slider.trackActiveTintList = serverPrimaryTint
+            slider.thumbTintList = serverPrimaryTint
             slider.setLabelFormatter { formatTime(it.toInt(), slider.valueTo.toInt()) }
         }
     }