From 30f76ac92e73447c72d77ca6631160385f865026 Mon Sep 17 00:00:00 2001
From: nift4 <nift4@protonmail.com>
Date: Tue, 8 Oct 2024 07:38:32 +0200
Subject: [PATCH] Fix accessibility issues and some warnings

---
 .idea/misc.xml                                |  1 -
 .../org/akanework/gramophone/SdScanner.kt     |  2 +-
 .../gramophone/logic/ui/MyRecyclerView.kt     |  1 -
 .../gramophone/logic/utils/LrcUtils.kt        |  2 +-
 .../akanework/gramophone/ui/MainActivity.kt   |  1 -
 .../gramophone/ui/adapters/BaseAdapter.kt     |  2 +-
 .../ui/adapters/BaseDecorAdapter.kt           |  2 +-
 .../ui/adapters/DetailedFolderAdapter.kt      |  2 +-
 .../gramophone/ui/adapters/FolderAdapter.kt   |  2 +-
 .../ui/components/FullBottomSheet.kt          | 18 +++++------
 .../ui/components/PlayerBottomSheet.kt        | 24 +++++++--------
 .../ui/components/TabOrderPreference.kt       |  1 -
 .../ui/fragments/DetailDialogFragment.kt      |  2 +-
 .../gramophone/ui/fragments/SearchFragment.kt |  6 ++--
 .../ui/fragments/ViewPagerFragment.kt         |  1 -
 app/src/main/res/layout-land/full_player.xml  | 27 +++++++++++++++--
 .../res/layout/activity_audio_preview.xml     | 12 +++++---
 .../main/res/layout/activity_bug_handler.xml  | 10 ++++---
 .../layout/adapter_blacklist_folder_card.xml  |  1 -
 app/src/main/res/layout/adapter_list_card.xml |  2 ++
 .../res/layout/adapter_list_card_larger.xml   |  2 ++
 .../res/layout/adapter_list_card_playlist.xml |  2 ++
 app/src/main/res/layout/bottom_sheet.xml      |  4 +++
 .../layout/fragment_blacklist_settings.xml    |  1 +
 .../main/res/layout/fragment_general_sub.xml  |  1 +
 .../main/res/layout/fragment_info_song.xml    |  1 +
 .../main/res/layout/fragment_recyclerview.xml |  1 +
 app/src/main/res/layout/fragment_search.xml   |  1 +
 .../main/res/layout/fragment_top_settings.xml |  1 +
 .../main/res/layout/fragment_viewpager.xml    |  2 +-
 app/src/main/res/layout/full_player.xml       | 19 ++++++++++--
 app/src/main/res/layout/general_decor.xml     | 30 ++++++++++++-------
 .../main/res/layout/playlist_bottom_sheet.xml |  1 +
 .../main/res/layout/preference_seekbar.xml    |  1 +
 app/src/main/res/layout/tab_order_dialog.xml  |  1 +
 .../main/res/layout/tab_order_seperator.xml   |  4 ++-
 app/src/main/res/values-ar/strings.xml        |  2 +-
 app/src/main/res/values-be/strings.xml        |  2 +-
 app/src/main/res/values-de/strings.xml        |  2 +-
 app/src/main/res/values-es/strings.xml        |  2 +-
 app/src/main/res/values-et/strings.xml        |  2 +-
 app/src/main/res/values-fa/strings.xml        |  2 +-
 app/src/main/res/values-fr/strings.xml        |  2 +-
 app/src/main/res/values-ia/strings.xml        |  2 +-
 app/src/main/res/values-it/strings.xml        |  2 +-
 app/src/main/res/values-ja/strings.xml        |  2 +-
 app/src/main/res/values-ko/strings.xml        |  2 +-
 app/src/main/res/values-pl/strings.xml        |  2 +-
 app/src/main/res/values-ro/strings.xml        |  2 +-
 app/src/main/res/values-ru/strings.xml        |  2 +-
 app/src/main/res/values-sr/strings.xml        |  2 +-
 app/src/main/res/values-uk/strings.xml        |  2 +-
 app/src/main/res/values-uz/strings.xml        |  2 +-
 app/src/main/res/values/strings.xml           | 17 ++++++++++-
 libphonograph                                 |  2 +-
 55 files changed, 164 insertions(+), 80 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6282bcfa9..00536fbcc 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CheckstyleConfigurable">
     <option name="suppFilterFilename" value="" />
diff --git a/app/src/debug/java/org/akanework/gramophone/SdScanner.kt b/app/src/debug/java/org/akanework/gramophone/SdScanner.kt
index b53fb9c6d..12965f309 100644
--- a/app/src/debug/java/org/akanework/gramophone/SdScanner.kt
+++ b/app/src/debug/java/org/akanework/gramophone/SdScanner.kt
@@ -63,7 +63,7 @@ class SdScanner(private val context: Context) {
 				}
 			}
 		}
-		if (filesToProcess.size == 0) {
+		if (filesToProcess.isEmpty()) {
 			scannerEnded()
 		} else {
 			val pathsToProcess = filesToProcess.map { it.absolutePath }.toMutableList()
diff --git a/app/src/main/kotlin/org/akanework/gramophone/logic/ui/MyRecyclerView.kt b/app/src/main/kotlin/org/akanework/gramophone/logic/ui/MyRecyclerView.kt
index 6baf7a26c..4ae178b82 100644
--- a/app/src/main/kotlin/org/akanework/gramophone/logic/ui/MyRecyclerView.kt
+++ b/app/src/main/kotlin/org/akanework/gramophone/logic/ui/MyRecyclerView.kt
@@ -23,7 +23,6 @@ import android.util.Log
 import android.view.View
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.core.view.doOnLayout
 import androidx.recyclerview.widget.ConcatAdapter
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/kotlin/org/akanework/gramophone/logic/utils/LrcUtils.kt b/app/src/main/kotlin/org/akanework/gramophone/logic/utils/LrcUtils.kt
index 37e2f842b..b9f084c25 100644
--- a/app/src/main/kotlin/org/akanework/gramophone/logic/utils/LrcUtils.kt
+++ b/app/src/main/kotlin/org/akanework/gramophone/logic/utils/LrcUtils.kt
@@ -130,7 +130,7 @@ object LrcUtils {
         markTranslations(lyricsList)
 
         lyricsList.takeWhile { it.content.isEmpty() }
-            .forEach { _ -> lyricsList.removeFirst() }
+            .forEach { _ -> lyricsList.removeAt(0) }
 
         if (lyricsList.isEmpty() && lrcContent.isNotEmpty()) {
             lyricsList.add(MediaStoreUtils.Lyric(null, lrcContent, false))
diff --git a/app/src/main/kotlin/org/akanework/gramophone/ui/MainActivity.kt b/app/src/main/kotlin/org/akanework/gramophone/ui/MainActivity.kt
index 747b6fb03..6094a9826 100644
--- a/app/src/main/kotlin/org/akanework/gramophone/ui/MainActivity.kt
+++ b/app/src/main/kotlin/org/akanework/gramophone/ui/MainActivity.kt
@@ -18,7 +18,6 @@
 package org.akanework.gramophone.ui
 
 import android.app.NotificationManager
-import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.Uri
diff --git a/app/src/main/kotlin/org/akanework/gramophone/ui/adapters/BaseAdapter.kt b/app/src/main/kotlin/org/akanework/gramophone/ui/adapters/BaseAdapter.kt
index d011e3de1..7d812fb08 100644
--- a/app/src/main/kotlin/org/akanework/gramophone/ui/adapters/BaseAdapter.kt
+++ b/app/src/main/kotlin/org/akanework/gramophone/ui/adapters/BaseAdapter.kt
@@ -282,7 +282,7 @@ abstract class BaseAdapter<T>(
                         else comparator?.compare(o1, o2) ?: 0
                     }
                 }
-                val diff = if (((list.size != 0 && newList.size != 0) || allowDiffUtils) && canDiff)
+                val diff = if (((list.isNotEmpty() && newList.isNotEmpty()) || allowDiffUtils) && canDiff)
                     DiffUtil.calculateDiff(SongDiffCallback(list, newList)) else null
                 val oldCount = list.size
                 val newCount = newList.size
diff --git a/app/src/main/kotlin/org/akanework/gramophone/ui/adapters/BaseDecorAdapter.kt b/app/src/main/kotlin/org/akanework/gramophone/ui/adapters/BaseDecorAdapter.kt
index c2213a68a..d94336062 100644
--- a/app/src/main/kotlin/org/akanework/gramophone/ui/adapters/BaseDecorAdapter.kt
+++ b/app/src/main/kotlin/org/akanework/gramophone/ui/adapters/BaseDecorAdapter.kt
@@ -164,7 +164,7 @@ open class BaseDecorAdapter<T : BaseAdapter<*>>(
                     shuffleModeEnabled = false
                     repeatMode = REPEAT_MODE_OFF
                     setMediaItems(songList, 0, C.TIME_UNSET)
-                    if (songList.size > 0) {
+                    if (songList.isNotEmpty()) {
                         prepare()
                         play()
                     }
diff --git a/app/src/main/kotlin/org/akanework/gramophone/ui/adapters/DetailedFolderAdapter.kt b/app/src/main/kotlin/org/akanework/gramophone/ui/adapters/DetailedFolderAdapter.kt
index 7594587b4..219957bf9 100644
--- a/app/src/main/kotlin/org/akanework/gramophone/ui/adapters/DetailedFolderAdapter.kt
+++ b/app/src/main/kotlin/org/akanework/gramophone/ui/adapters/DetailedFolderAdapter.kt
@@ -240,7 +240,7 @@ class DetailedFolderAdapter(
         override fun getItemCount(): Int = if (enabled) 1 else 0
     }
 
-    private abstract class FolderCardAdapter(protected val folderFragment: DetailedFolderAdapter) :
+    private abstract class FolderCardAdapter(val folderFragment: DetailedFolderAdapter) :
         MyRecyclerView.Adapter<FolderCardAdapter.ViewHolder>() {
         override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder =
             ViewHolder(
diff --git a/app/src/main/kotlin/org/akanework/gramophone/ui/adapters/FolderAdapter.kt b/app/src/main/kotlin/org/akanework/gramophone/ui/adapters/FolderAdapter.kt
index defeedd35..b05a512e4 100644
--- a/app/src/main/kotlin/org/akanework/gramophone/ui/adapters/FolderAdapter.kt
+++ b/app/src/main/kotlin/org/akanework/gramophone/ui/adapters/FolderAdapter.kt
@@ -266,7 +266,7 @@ class FolderAdapter(
         override fun getItemCount(): Int = if (enabled) 1 else 0
     }
 
-    private abstract class FolderCardAdapter(protected val folderFragment: FolderAdapter) :
+    private abstract class FolderCardAdapter(val folderFragment: FolderAdapter) :
         MyRecyclerView.Adapter<FolderCardAdapter.ViewHolder>() {
         override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder =
             ViewHolder(
diff --git a/app/src/main/kotlin/org/akanework/gramophone/ui/components/FullBottomSheet.kt b/app/src/main/kotlin/org/akanework/gramophone/ui/components/FullBottomSheet.kt
index 8808f4236..781fdd83a 100644
--- a/app/src/main/kotlin/org/akanework/gramophone/ui/components/FullBottomSheet.kt
+++ b/app/src/main/kotlin/org/akanework/gramophone/ui/components/FullBottomSheet.kt
@@ -510,7 +510,7 @@ class FullBottomSheet
 			instance?.addListener(this@FullBottomSheet)
 			updateTimer()
 			onRepeatModeChanged(instance?.repeatMode ?: Player.REPEAT_MODE_OFF)
-			onShuffleModeEnabledChanged(instance?.shuffleModeEnabled ?: false)
+			onShuffleModeEnabledChanged(instance?.shuffleModeEnabled == true)
 			onPlaybackStateChanged(instance?.playbackState ?: Player.STATE_IDLE)
 			onMediaItemTransition(
 				instance?.currentMediaItem,
@@ -561,11 +561,11 @@ class FullBottomSheet
 	private fun refreshSettings(key: String?) {
 		if (key == null || key == "default_progress_bar") {
 			if (prefs.getBooleanStrict("default_progress_bar", false)) {
-				bottomSheetFullSlider.visibility = View.VISIBLE
-				bottomSheetFullSeekBar.visibility = View.GONE
+				bottomSheetFullSlider.visibility = VISIBLE
+				bottomSheetFullSeekBar.visibility = GONE
 			} else {
-				bottomSheetFullSlider.visibility = View.GONE
-				bottomSheetFullSeekBar.visibility = View.VISIBLE
+				bottomSheetFullSlider.visibility = GONE
+				bottomSheetFullSeekBar.visibility = VISIBLE
 			}
 		}
 		if (key == null || key == "centered_title") {
@@ -1086,19 +1086,19 @@ class FullBottomSheet
 		override fun onCreateViewHolder(
 			parent: ViewGroup,
 			viewType: Int
-		): LyricAdapter.ViewHolder =
+		): ViewHolder =
 			ViewHolder(
 				LayoutInflater
 					.from(parent.context)
 					.inflate(R.layout.lyrics, parent, false),
 			)
 
-		override fun onBindViewHolder(holder: LyricAdapter.ViewHolder, position: Int) {
+		override fun onBindViewHolder(holder: ViewHolder, position: Int) {
 
 		}
 
 		override fun onBindViewHolder(
-			holder: LyricAdapter.ViewHolder,
+			holder: ViewHolder,
 			position: Int,
 			payloads: MutableList<Any>
 		) {
@@ -1123,7 +1123,7 @@ class FullBottomSheet
 			}
 
 			with(holder.lyricTextView) {
-				visibility = if (lyric.content.isNotEmpty()) View.VISIBLE else View.GONE
+				visibility = if (lyric.content.isNotEmpty()) VISIBLE else GONE
 				text = lyric.content
 				gravity = if (isLyricCentered) Gravity.CENTER else Gravity.START
 				translationY = 0f
diff --git a/app/src/main/kotlin/org/akanework/gramophone/ui/components/PlayerBottomSheet.kt b/app/src/main/kotlin/org/akanework/gramophone/ui/components/PlayerBottomSheet.kt
index 7b9bf5236..2a2291fe9 100644
--- a/app/src/main/kotlin/org/akanework/gramophone/ui/components/PlayerBottomSheet.kt
+++ b/app/src/main/kotlin/org/akanework/gramophone/ui/components/PlayerBottomSheet.kt
@@ -164,29 +164,29 @@ class PlayerBottomSheet private constructor(
         ) {
             when (newState) {
                 BottomSheetBehavior.STATE_COLLAPSED -> {
-                    fullPlayer.visibility = View.GONE
-                    previewPlayer.visibility = View.VISIBLE
+                    fullPlayer.visibility = GONE
+                    previewPlayer.visibility = VISIBLE
                     previewPlayer.alpha = 1f
                     fullPlayer.alpha = 0f
                     bottomSheetBackCallback!!.isEnabled = false
                 }
 
                 BottomSheetBehavior.STATE_DRAGGING, BottomSheetBehavior.STATE_SETTLING -> {
-                    fullPlayer.visibility = View.VISIBLE
-                    previewPlayer.visibility = View.VISIBLE
+                    fullPlayer.visibility = VISIBLE
+                    previewPlayer.visibility = VISIBLE
                 }
 
                 BottomSheetBehavior.STATE_EXPANDED, BottomSheetBehavior.STATE_HALF_EXPANDED -> {
-                    previewPlayer.visibility = View.GONE
-                    fullPlayer.visibility = View.VISIBLE
+                    previewPlayer.visibility = GONE
+                    fullPlayer.visibility = VISIBLE
                     previewPlayer.alpha = 0f
                     fullPlayer.alpha = 1f
                     bottomSheetBackCallback!!.isEnabled = true
                 }
 
                 BottomSheetBehavior.STATE_HIDDEN -> {
-                    previewPlayer.visibility = View.GONE
-                    fullPlayer.visibility = View.GONE
+                    previewPlayer.visibility = GONE
+                    fullPlayer.visibility = GONE
                     previewPlayer.alpha = 0f
                     fullPlayer.alpha = 0f
                     bottomSheetBackCallback!!.isEnabled = false
@@ -219,7 +219,7 @@ class PlayerBottomSheet private constructor(
             bottomSheetBackCallback = object : OnBackPressedCallback(enabled = false) {
                 override fun handleOnBackStarted(backEvent: BackEventCompat) {
                     if (fullPlayer.bottomSheetFullLyricRecyclerView.visibility ==
-                        View.VISIBLE
+                        VISIBLE
                     ) {
                         fullPlayer.bottomSheetFullLyricRecyclerView.fadOutAnimation(FullBottomSheet.LYRIC_FADE_TRANSITION_SEC)
                         fullPlayer.bottomSheetLyricButton.isChecked = false
@@ -230,7 +230,7 @@ class PlayerBottomSheet private constructor(
 
                 override fun handleOnBackProgressed(backEvent: BackEventCompat) {
                     if (fullPlayer.bottomSheetFullLyricRecyclerView.visibility ==
-                        View.VISIBLE
+                        VISIBLE
                     ) {
                         // TODO
                     } else {
@@ -240,7 +240,7 @@ class PlayerBottomSheet private constructor(
 
                 override fun handleOnBackPressed() {
                     if (fullPlayer.bottomSheetFullLyricRecyclerView.visibility ==
-                        View.VISIBLE
+                        VISIBLE
                     ) {
                         fullPlayer.bottomSheetFullLyricRecyclerView.fadOutAnimation(FullBottomSheet.LYRIC_FADE_TRANSITION_SEC)
                         fullPlayer.bottomSheetLyricButton.isChecked = false
@@ -251,7 +251,7 @@ class PlayerBottomSheet private constructor(
 
                 override fun handleOnBackCancelled() {
                     if (fullPlayer.bottomSheetFullLyricRecyclerView.visibility ==
-                        View.VISIBLE
+                        VISIBLE
                     ) {
                         fullPlayer.bottomSheetFullLyricRecyclerView.fadInAnimation(FullBottomSheet.LYRIC_FADE_TRANSITION_SEC)
                         fullPlayer.bottomSheetLyricButton.isChecked = false
diff --git a/app/src/main/kotlin/org/akanework/gramophone/ui/components/TabOrderPreference.kt b/app/src/main/kotlin/org/akanework/gramophone/ui/components/TabOrderPreference.kt
index 65a2a2169..95e5ee607 100644
--- a/app/src/main/kotlin/org/akanework/gramophone/ui/components/TabOrderPreference.kt
+++ b/app/src/main/kotlin/org/akanework/gramophone/ui/components/TabOrderPreference.kt
@@ -15,7 +15,6 @@ import androidx.recyclerview.widget.ItemTouchHelper.DOWN
 import androidx.recyclerview.widget.ItemTouchHelper.UP
 import androidx.recyclerview.widget.RecyclerView
 import org.akanework.gramophone.R
-import org.akanework.gramophone.logic.replaceAllSupport
 import org.akanework.gramophone.logic.ui.MyRecyclerView
 import org.akanework.gramophone.ui.adapters.ViewPager2Adapter.Companion.mapSettingToTabList
 import org.akanework.gramophone.ui.adapters.ViewPager2Adapter.Companion.mapTabListToSetting
diff --git a/app/src/main/kotlin/org/akanework/gramophone/ui/fragments/DetailDialogFragment.kt b/app/src/main/kotlin/org/akanework/gramophone/ui/fragments/DetailDialogFragment.kt
index 7c66c45fa..00fe48af9 100644
--- a/app/src/main/kotlin/org/akanework/gramophone/ui/fragments/DetailDialogFragment.kt
+++ b/app/src/main/kotlin/org/akanework/gramophone/ui/fragments/DetailDialogFragment.kt
@@ -79,7 +79,7 @@ class DetailDialogFragment : BaseFragment(false) {
         if (mediaMetadata.releaseYear != null || mediaMetadata.recordingYear != null) {
             yearTextView.text = (mediaMetadata.releaseYear ?: mediaMetadata.recordingYear)?.toLocaleString()
         }
-	    mediaMetadata.durationMs?.let { durationTextView.text = convertDurationToTimeStamp(it) }
+        mediaMetadata.durationMs?.let { durationTextView.text = convertDurationToTimeStamp(it) }
         mimeTypeTextView.text = mediaItem.localConfiguration?.mimeType ?: "(null)"
         pathTextView.text = mediaItem.getFile()?.path
             ?: mediaItem.requestMetadata.mediaUri?.toString() ?: "(null)"
diff --git a/app/src/main/kotlin/org/akanework/gramophone/ui/fragments/SearchFragment.kt b/app/src/main/kotlin/org/akanework/gramophone/ui/fragments/SearchFragment.kt
index 3ecaf6f0e..51d878b27 100644
--- a/app/src/main/kotlin/org/akanework/gramophone/ui/fragments/SearchFragment.kt
+++ b/app/src/main/kotlin/org/akanework/gramophone/ui/fragments/SearchFragment.kt
@@ -94,11 +94,11 @@ class SearchFragment : BaseFragment(false) {
                     filteredList.clear()
                     // Filter the library.
                     libraryViewModel.mediaItemList.value?.filter {
-                        val isMatchingTitle = it.mediaMetadata.title?.contains(text, true) ?: false
+                        val isMatchingTitle = it.mediaMetadata.title?.contains(text, true) == true
                         val isMatchingAlbum =
-                            it.mediaMetadata.albumTitle?.contains(text, true) ?: false
+	                        it.mediaMetadata.albumTitle?.contains(text, true) == true
                         val isMatchingArtist =
-                            it.mediaMetadata.artist?.contains(text, true) ?: false
+	                        it.mediaMetadata.artist?.contains(text, true) == true
                         isMatchingTitle || isMatchingAlbum || isMatchingArtist
                     }?.let {
                         filteredList.addAll(
diff --git a/app/src/main/kotlin/org/akanework/gramophone/ui/fragments/ViewPagerFragment.kt b/app/src/main/kotlin/org/akanework/gramophone/ui/fragments/ViewPagerFragment.kt
index f58732c51..89c6f653f 100644
--- a/app/src/main/kotlin/org/akanework/gramophone/ui/fragments/ViewPagerFragment.kt
+++ b/app/src/main/kotlin/org/akanework/gramophone/ui/fragments/ViewPagerFragment.kt
@@ -41,7 +41,6 @@ import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import org.akanework.gramophone.R
 import org.akanework.gramophone.logic.clone
-import org.akanework.gramophone.logic.dpToPx
 import org.akanework.gramophone.logic.enableEdgeToEdgePaddingListener
 import org.akanework.gramophone.logic.getSessionId
 import org.akanework.gramophone.logic.needsManualSnackBarInset
diff --git a/app/src/main/res/layout-land/full_player.xml b/app/src/main/res/layout-land/full_player.xml
index f8365545a..eaca69292 100644
--- a/app/src/main/res/layout-land/full_player.xml
+++ b/app/src/main/res/layout-land/full_player.xml
@@ -18,6 +18,8 @@
 		android:layout_marginStart="24dp"
 		android:layout_marginTop="16dp"
 		android:background="@drawable/rp_buttons"
+		android:tooltipText="@string/expand_less"
+		android:contentDescription="@string/expand_less"
 		app:icon="@drawable/ic_expand_more"
 		app:iconGravity="textStart"
 		app:iconPadding="0dp"
@@ -122,14 +124,16 @@
 				android:id="@+id/slider_squiggly"
 				style="@style/MediaPlayer.ProgressBar"
 				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
+				android:layout_height="48dp"
 				android:layout_gravity="center"
 				android:progress="0"
 				android:thumbTint="?attr/colorPrimary"
 				android:visibility="gone"
+				android:contentDescription="@string/position_slider"
 				app:labelBehavior="gone"
 				tools:progress="20"
-				tools:visibility="visible" />
+				tools:visibility="visible"
+				tools:ignore="DuplicateClickableBoundsCheck" />
 
 			<com.google.android.material.slider.Slider
 				android:id="@+id/slider_vert"
@@ -138,6 +142,7 @@
 				android:layout_gravity="center"
 				android:value="0"
 				android:visibility="gone"
+				android:contentDescription="@string/position_slider"
 				app:labelBehavior="gone"
 				style="@style/Widget.Material3.Slider.Legacy"
 				app:thumbElevation="0dp"
@@ -193,6 +198,8 @@
 			android:insetTop="0dp"
 			android:insetRight="0dp"
 			android:insetBottom="0dp"
+			android:tooltipText="@string/play"
+			android:contentDescription="@string/play"
 			app:backgroundTint="?attr/colorSecondaryContainer"
 			app:icon="@drawable/play_anim"
 			app:iconGravity="textStart"
@@ -216,6 +223,8 @@
 			android:insetTop="0dp"
 			android:insetRight="0dp"
 			android:insetBottom="0dp"
+			android:tooltipText="@string/skip_previous"
+			android:contentDescription="@string/skip_previous"
 			app:icon="@drawable/ic_skip_previous"
 			app:iconGravity="textStart"
 			app:iconPadding="0dp"
@@ -239,6 +248,8 @@
 			android:insetTop="0dp"
 			android:insetRight="0dp"
 			android:insetBottom="0dp"
+			android:tooltipText="@string/skip_next"
+			android:contentDescription="@string/skip_next"
 			app:icon="@drawable/ic_skip_next"
 			app:iconGravity="textStart"
 			app:iconPadding="0dp"
@@ -277,6 +288,8 @@
 			android:insetRight="0dp"
 			android:insetBottom="0dp"
 			android:saveEnabled="false"
+			android:tooltipText="@string/dialog_lyrics"
+			android:contentDescription="@string/dialog_lyrics"
 			app:icon="@drawable/ic_article"
 			app:iconGravity="textStart"
 			app:iconPadding="0dp"
@@ -295,6 +308,8 @@
 			android:insetRight="0dp"
 			android:insetBottom="0dp"
 			android:saveEnabled="false"
+			android:tooltipText="@string/repeat_mode"
+			android:contentDescription="@string/repeat_mode"
 			app:icon="@drawable/ic_repeat"
 			app:iconGravity="textStart"
 			app:iconPadding="0dp"
@@ -313,6 +328,8 @@
 			android:insetRight="0dp"
 			android:insetBottom="0dp"
 			android:saveEnabled="false"
+			android:tooltipText="@string/shuffle"
+			android:contentDescription="@string/shuffle"
 			app:icon="@drawable/ic_shuffle"
 			app:iconGravity="textStart"
 			app:iconPadding="0dp"
@@ -332,6 +349,8 @@
 			android:insetBottom="0dp"
 			android:saveEnabled="false"
 			android:visibility="gone"
+			android:tooltipText="@string/playlist_favourite"
+			android:contentDescription="@string/playlist_favourite"
 			app:icon="@drawable/sl_check_fav"
 			app:iconGravity="textStart"
 			app:iconPadding="0dp"
@@ -350,6 +369,8 @@
 			android:insetRight="0dp"
 			android:insetBottom="0dp"
 			android:saveEnabled="false"
+			android:tooltipText="@string/timer"
+			android:contentDescription="@string/timer"
 			app:toggleCheckedStateOnClick="false"
 			app:icon="@drawable/sl_check_timer"
 			app:iconGravity="textStart"
@@ -367,6 +388,8 @@
 			android:insetTop="0dp"
 			android:insetRight="0dp"
 			android:insetBottom="0dp"
+			android:tooltipText="@string/current_playlist"
+			android:contentDescription="@string/current_playlist"
 			app:icon="@drawable/ic_playlist_play"
 			app:iconGravity="textStart"
 			app:iconPadding="0dp"
diff --git a/app/src/main/res/layout/activity_audio_preview.xml b/app/src/main/res/layout/activity_audio_preview.xml
index 2639c72ae..b86fa0c65 100644
--- a/app/src/main/res/layout/activity_audio_preview.xml
+++ b/app/src/main/res/layout/activity_audio_preview.xml
@@ -46,7 +46,8 @@
         app:layout_constraintBottom_toTopOf="@id/artist_text_view"
         app:layout_constraintEnd_toStartOf="@id/play_pause_replay_button"
         app:layout_constraintStart_toEndOf="@id/coverCardView"
-        app:layout_constraintTop_toTopOf="@id/coverCardView" />
+        app:layout_constraintTop_toTopOf="@id/coverCardView"
+        tools:ignore="SpeakableTextPresentCheck" />
 
     <org.akanework.gramophone.ui.components.MarqueeTextView
         android:id="@+id/artist_text_view"
@@ -62,12 +63,13 @@
         app:layout_constraintEnd_toStartOf="@id/play_pause_replay_button"
         app:layout_constraintStart_toEndOf="@id/coverCardView"
         app:layout_constraintTop_toBottomOf="@id/title_text_view"
-        app:layout_constraintVertical_chainStyle="packed" />
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:ignore="SpeakableTextPresentCheck" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/play_pause_replay_button"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
         android:layout_marginEnd="16dp"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:insetLeft="0dp"
@@ -76,6 +78,8 @@
         android:insetBottom="0dp"
         android:padding="4dp"
         android:src="@drawable/ic_play_arrow"
+        android:tooltipText="@string/play"
+        android:contentDescription="@string/play"
         app:icon="@drawable/play_anim"
         app:iconGravity="textStart"
         app:iconPadding="0dp"
diff --git a/app/src/main/res/layout/activity_bug_handler.xml b/app/src/main/res/layout/activity_bug_handler.xml
index 160b6d6df..f00cb9aec 100644
--- a/app/src/main/res/layout/activity_bug_handler.xml
+++ b/app/src/main/res/layout/activity_bug_handler.xml
@@ -34,6 +34,7 @@
                 android:paddingStart="4dp"
                 android:paddingEnd="8dp"
                 app:layout_collapseMode="pin"
+                app:navigationContentDescription="@string/back"
                 app:navigationIcon="@drawable/ic_arrow_back"
                 app:navigationIconTint="?colorOnSurface" />
 
@@ -49,14 +50,15 @@
 
         <TextView
             android:id="@+id/error"
-            android:textIsSelectable="true"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:textColor="?attr/colorOnSurface"
-            android:paddingTop="12dp"
             android:paddingStart="24dp"
+            android:paddingTop="12dp"
             android:paddingEnd="24dp"
-            android:textSize="11sp" />
+            android:textColor="?attr/colorOnSurface"
+            android:textIsSelectable="true"
+            android:textSize="11sp"
+            tools:ignore="SpeakableTextPresentCheck" />
 
     </androidx.core.widget.NestedScrollView>
 
diff --git a/app/src/main/res/layout/adapter_blacklist_folder_card.xml b/app/src/main/res/layout/adapter_blacklist_folder_card.xml
index 661908ea5..00e1bf780 100644
--- a/app/src/main/res/layout/adapter_blacklist_folder_card.xml
+++ b/app/src/main/res/layout/adapter_blacklist_folder_card.xml
@@ -21,7 +21,6 @@
         android:layout_width="0dp"
         android:layout_weight="1"
         android:layout_height="wrap_content"
-        android:singleLine="true"
         android:paddingTop="12dp"
         android:paddingBottom="12dp"
         android:textColor="?attr/colorOnSurface"
diff --git a/app/src/main/res/layout/adapter_list_card.xml b/app/src/main/res/layout/adapter_list_card.xml
index 533fe4040..01c67a7c1 100644
--- a/app/src/main/res/layout/adapter_list_card.xml
+++ b/app/src/main/res/layout/adapter_list_card.xml
@@ -92,6 +92,8 @@
         android:insetTop="0dp"
         android:insetRight="0dp"
         android:insetBottom="0dp"
+        android:tooltipText="@string/more"
+        android:contentDescription="@string/more"
         app:icon="@drawable/ic_more_vert_alt"
         app:iconGravity="textStart"
         app:iconPadding="0dp"
diff --git a/app/src/main/res/layout/adapter_list_card_larger.xml b/app/src/main/res/layout/adapter_list_card_larger.xml
index d10ca3635..08d21b88e 100644
--- a/app/src/main/res/layout/adapter_list_card_larger.xml
+++ b/app/src/main/res/layout/adapter_list_card_larger.xml
@@ -90,6 +90,8 @@
         android:insetTop="0dp"
         android:insetRight="0dp"
         android:insetBottom="0dp"
+        android:tooltipText="@string/more"
+        android:contentDescription="@string/more"
         app:icon="@drawable/ic_more_vert_alt"
         app:iconGravity="textStart"
         app:iconPadding="0dp"
diff --git a/app/src/main/res/layout/adapter_list_card_playlist.xml b/app/src/main/res/layout/adapter_list_card_playlist.xml
index 2466c1903..5dc940b53 100644
--- a/app/src/main/res/layout/adapter_list_card_playlist.xml
+++ b/app/src/main/res/layout/adapter_list_card_playlist.xml
@@ -90,6 +90,8 @@
         android:insetTop="0dp"
         android:insetRight="0dp"
         android:insetBottom="0dp"
+        android:tooltipText="@string/remove"
+        android:contentDescription="@string/remove"
         app:icon="@drawable/ic_close"
         app:iconGravity="textStart"
         app:iconPadding="0dp"
diff --git a/app/src/main/res/layout/bottom_sheet.xml b/app/src/main/res/layout/bottom_sheet.xml
index 11602c13a..56c706389 100644
--- a/app/src/main/res/layout/bottom_sheet.xml
+++ b/app/src/main/res/layout/bottom_sheet.xml
@@ -76,6 +76,8 @@
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
+            android:tooltipText="@string/play"
+            android:contentDescription="@string/play"
             app:icon="@drawable/play_anim"
             app:iconGravity="textStart"
             app:iconPadding="0dp"
@@ -96,6 +98,8 @@
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
+            android:tooltipText="@string/skip_next"
+            android:contentDescription="@string/skip_next"
             app:icon="@drawable/ic_skip_next"
             app:iconGravity="textStart"
             app:iconPadding="0dp"
diff --git a/app/src/main/res/layout/fragment_blacklist_settings.xml b/app/src/main/res/layout/fragment_blacklist_settings.xml
index 458c1062c..b866931d9 100644
--- a/app/src/main/res/layout/fragment_blacklist_settings.xml
+++ b/app/src/main/res/layout/fragment_blacklist_settings.xml
@@ -47,6 +47,7 @@
                 android:paddingStart="4dp"
                 android:paddingEnd="8dp"
                 app:layout_collapseMode="pin"
+                app:navigationContentDescription="@string/back"
                 app:navigationIcon="@drawable/ic_arrow_back"
                 app:navigationIconTint="?colorOnSurface" />
 
diff --git a/app/src/main/res/layout/fragment_general_sub.xml b/app/src/main/res/layout/fragment_general_sub.xml
index c5c2e28cc..125756f86 100644
--- a/app/src/main/res/layout/fragment_general_sub.xml
+++ b/app/src/main/res/layout/fragment_general_sub.xml
@@ -31,6 +31,7 @@
                 android:paddingStart="4dp"
                 android:paddingEnd="8dp"
                 app:layout_collapseMode="pin"
+                app:navigationContentDescription="@string/back"
                 app:navigationIcon="@drawable/ic_arrow_back"
                 app:navigationIconTint="?colorOnSurface" />
 
diff --git a/app/src/main/res/layout/fragment_info_song.xml b/app/src/main/res/layout/fragment_info_song.xml
index 8c396e85c..bf67ce4b6 100644
--- a/app/src/main/res/layout/fragment_info_song.xml
+++ b/app/src/main/res/layout/fragment_info_song.xml
@@ -33,6 +33,7 @@
                 android:paddingStart="4dp"
                 android:paddingEnd="8dp"
                 app:layout_collapseMode="pin"
+                app:navigationContentDescription="@string/back"
                 app:navigationIcon="@drawable/ic_arrow_back"
                 app:navigationIconTint="?colorOnSurface" />
 
diff --git a/app/src/main/res/layout/fragment_recyclerview.xml b/app/src/main/res/layout/fragment_recyclerview.xml
index 9e741e910..b64d92f10 100644
--- a/app/src/main/res/layout/fragment_recyclerview.xml
+++ b/app/src/main/res/layout/fragment_recyclerview.xml
@@ -11,6 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:clipToPadding="false"
+        android:contentDescription="@null"
         android:scrollbars="none" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 0e9864a90..921cecd62 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -25,6 +25,7 @@
                 android:layout_width="64dp"
                 android:layout_height="64dp"
                 android:backgroundTint="@android:color/transparent"
+                android:contentDescription="@string/back"
                 app:icon="@drawable/ic_arrow_back"
                 app:iconGravity="textStart"
                 app:iconPadding="8dp"
diff --git a/app/src/main/res/layout/fragment_top_settings.xml b/app/src/main/res/layout/fragment_top_settings.xml
index 4a103bf4e..fa16aa6c2 100644
--- a/app/src/main/res/layout/fragment_top_settings.xml
+++ b/app/src/main/res/layout/fragment_top_settings.xml
@@ -47,6 +47,7 @@
                 android:paddingStart="4dp"
                 android:paddingEnd="8dp"
                 app:layout_collapseMode="pin"
+                app:navigationContentDescription="@string/back"
                 app:navigationIcon="@drawable/ic_arrow_back"
                 app:navigationIconTint="?colorOnSurface" />
 
diff --git a/app/src/main/res/layout/fragment_viewpager.xml b/app/src/main/res/layout/fragment_viewpager.xml
index e9b789b8a..8c5a7e6f3 100644
--- a/app/src/main/res/layout/fragment_viewpager.xml
+++ b/app/src/main/res/layout/fragment_viewpager.xml
@@ -34,7 +34,7 @@
                 android:layout_height="?attr/actionBarSize"
                 android:elevation="0dp"
                 android:paddingStart="24dp"
-                android:paddingEnd="8dp"
+                android:paddingEnd="16dp"
                 app:layout_collapseMode="pin"
                 app:menu="@menu/home_menu" />
 
diff --git a/app/src/main/res/layout/full_player.xml b/app/src/main/res/layout/full_player.xml
index 3738b8c74..7b32258a1 100644
--- a/app/src/main/res/layout/full_player.xml
+++ b/app/src/main/res/layout/full_player.xml
@@ -18,6 +18,8 @@
 		android:layout_marginStart="24dp"
 		android:layout_marginTop="16dp"
 		android:background="@drawable/rp_buttons"
+		android:tooltipText="@string/expand_less"
+		android:contentDescription="@string/expand_less"
 		app:icon="@drawable/ic_expand_more"
 		app:iconGravity="textStart"
 		app:iconPadding="0dp"
@@ -123,14 +125,16 @@
 				android:id="@+id/slider_squiggly"
 				style="@style/MediaPlayer.ProgressBar"
 				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
+				android:layout_height="48dp"
 				android:layout_gravity="center"
 				android:progress="0"
 				android:thumbTint="?attr/colorPrimary"
 				android:visibility="gone"
+				android:contentDescription="@string/position_slider"
 				app:labelBehavior="gone"
 				tools:progress="20"
-				tools:visibility="visible" />
+				tools:visibility="visible"
+				tools:ignore="DuplicateClickableBoundsCheck" />
 
 			<com.google.android.material.slider.Slider
 				android:id="@+id/slider_vert"
@@ -139,6 +143,7 @@
 				android:layout_gravity="center"
 				android:value="0"
 				android:visibility="gone"
+				android:contentDescription="@string/position_slider"
 				app:labelBehavior="gone"
 				style="@style/Widget.Material3.Slider.Legacy"
 				app:thumbElevation="0dp"
@@ -194,6 +199,8 @@
 			android:insetTop="0dp"
 			android:insetRight="0dp"
 			android:insetBottom="0dp"
+			android:tooltipText="@string/play"
+			android:contentDescription="@string/play"
 			app:backgroundTint="?attr/colorSecondaryContainer"
 			app:icon="@drawable/play_anim"
 			app:iconGravity="textStart"
@@ -217,6 +224,8 @@
 			android:insetTop="0dp"
 			android:insetRight="0dp"
 			android:insetBottom="0dp"
+			android:tooltipText="@string/skip_previous"
+			android:contentDescription="@string/skip_previous"
 			app:icon="@drawable/ic_skip_previous"
 			app:iconGravity="textStart"
 			app:iconPadding="0dp"
@@ -240,6 +249,8 @@
 			android:insetTop="0dp"
 			android:insetRight="0dp"
 			android:insetBottom="0dp"
+			android:tooltipText="@string/skip_next"
+			android:contentDescription="@string/skip_next"
 			app:icon="@drawable/ic_skip_next"
 			app:iconGravity="textStart"
 			app:iconPadding="0dp"
@@ -299,6 +310,7 @@
 			android:insetBottom="0dp"
 			android:saveEnabled="false"
 			android:tooltipText="@string/repeat_mode"
+			android:contentDescription="@string/repeat_mode"
 			app:icon="@drawable/ic_repeat"
 			app:iconGravity="textStart"
 			app:iconPadding="0dp"
@@ -318,6 +330,7 @@
 			android:insetBottom="0dp"
 			android:saveEnabled="false"
 			android:tooltipText="@string/shuffle"
+			android:contentDescription="@string/shuffle"
 			app:icon="@drawable/ic_shuffle"
 			app:iconGravity="textStart"
 			app:iconPadding="0dp"
@@ -338,6 +351,7 @@
 			android:saveEnabled="false"
 			android:visibility="gone"
 			android:tooltipText="@string/playlist_favourite"
+			android:contentDescription="@string/playlist_favourite"
 			app:icon="@drawable/sl_check_fav"
 			app:iconGravity="textStart"
 			app:iconPadding="0dp"
@@ -357,6 +371,7 @@
 			android:insetBottom="0dp"
 			android:saveEnabled="false"
 			android:tooltipText="@string/timer"
+			android:contentDescription="@string/timer"
 			app:toggleCheckedStateOnClick="false"
 			app:icon="@drawable/sl_check_timer"
 			app:iconGravity="textStart"
diff --git a/app/src/main/res/layout/general_decor.xml b/app/src/main/res/layout/general_decor.xml
index 720ed5245..210b39d79 100644
--- a/app/src/main/res/layout/general_decor.xml
+++ b/app/src/main/res/layout/general_decor.xml
@@ -26,14 +26,16 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/play_all"
-            android:layout_width="42dp"
-            android:layout_height="42dp"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
             android:background="@drawable/rp_buttons"
             android:insetLeft="0dp"
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
             android:visibility="gone"
+            android:tooltipText="@string/play_all"
+            android:contentDescription="@string/play_all"
             app:icon="@drawable/ic_play_arrow"
             app:iconGravity="textStart"
             app:iconPadding="0dp"
@@ -43,14 +45,16 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/shuffle_all"
-            android:layout_width="42dp"
-            android:layout_height="42dp"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
             android:background="@drawable/rp_buttons"
             android:insetLeft="0dp"
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
             android:visibility="gone"
+            android:tooltipText="@string/shuffle_all"
+            android:contentDescription="@string/shuffle_all"
             app:icon="@drawable/ic_shuffle"
             app:iconGravity="textStart"
             app:iconPadding="0dp"
@@ -60,13 +64,15 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/sort"
-            android:layout_width="42dp"
-            android:layout_height="42dp"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
             android:background="@drawable/rp_buttons"
             android:insetLeft="0dp"
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
+            android:tooltipText="@string/sort"
+            android:contentDescription="@string/sort"
             app:icon="@drawable/ic_sort"
             app:iconGravity="textStart"
             app:iconPadding="0dp"
@@ -75,14 +81,16 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/jumpUp"
-            android:layout_width="42dp"
-            android:layout_height="42dp"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
             android:visibility="gone"
             android:background="@drawable/rp_buttons"
             android:insetLeft="0dp"
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
+            android:tooltipText="@string/scroll_to_albums"
+            android:contentDescription="@string/scroll_to_albums"
             app:icon="@drawable/baseline_arrow_upward_24"
             app:iconGravity="textStart"
             app:iconPadding="0dp"
@@ -92,14 +100,16 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/jumpDown"
-            android:layout_width="42dp"
-            android:layout_height="42dp"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
             android:visibility="gone"
             android:background="@drawable/rp_buttons"
             android:insetLeft="0dp"
             android:insetTop="0dp"
             android:insetRight="0dp"
             android:insetBottom="0dp"
+            android:tooltipText="@string/scroll_to_songs"
+            android:contentDescription="@string/scroll_to_songs"
             app:icon="@drawable/baseline_arrow_downward_24"
             app:iconGravity="textStart"
             app:iconPadding="0dp"
diff --git a/app/src/main/res/layout/playlist_bottom_sheet.xml b/app/src/main/res/layout/playlist_bottom_sheet.xml
index 51d559875..e9eadb48c 100644
--- a/app/src/main/res/layout/playlist_bottom_sheet.xml
+++ b/app/src/main/res/layout/playlist_bottom_sheet.xml
@@ -82,6 +82,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:clipToPadding="false"
+        android:contentDescription="@null"
         android:scrollbars="none" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/preference_seekbar.xml b/app/src/main/res/layout/preference_seekbar.xml
index f99e486e9..69a3ef035 100644
--- a/app/src/main/res/layout/preference_seekbar.xml
+++ b/app/src/main/res/layout/preference_seekbar.xml
@@ -92,6 +92,7 @@
                 android:layout_marginHorizontal="8dp"
                 android:layout_marginTop="12dp"
                 android:background="@null"
+                android:contentDescription="@string/seekbar"
                 android:progress="50"
                 android:thumbTint="?colorAccent" />
 
diff --git a/app/src/main/res/layout/tab_order_dialog.xml b/app/src/main/res/layout/tab_order_dialog.xml
index 339d224e9..795dec84c 100644
--- a/app/src/main/res/layout/tab_order_dialog.xml
+++ b/app/src/main/res/layout/tab_order_dialog.xml
@@ -6,4 +6,5 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:padding="9dp"
+	android:contentDescription="@null"
 	app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/tab_order_seperator.xml b/app/src/main/res/layout/tab_order_seperator.xml
index 49131be12..05bf463e8 100644
--- a/app/src/main/res/layout/tab_order_seperator.xml
+++ b/app/src/main/res/layout/tab_order_seperator.xml
@@ -7,12 +7,14 @@
 	android:clickable="true"
 	android:focusable="true"
 	android:paddingHorizontal="18dp"
-	android:background="?attr/selectableItemBackground">
+	android:background="?attr/selectableItemBackground"
+	tools:ignore="Overdraw">
 
 	<View
 		android:layout_width="0dp"
 		android:layout_height="3dp"
 		android:background="?colorControlNormal"
+		android:contentDescription="@string/divider"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toStartOf="@id/dragHandle"
 		app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 3a00c983c..57a3cc4f1 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -180,5 +180,5 @@
     <string name="current_playlist">قائمة التشغيل الحالية</string>
     <string name="timer">مؤقت النوم</string>
     <string name="timer_expiry">سيُوقِف مؤقِّت النّوم الموسيقى خلال %s ثانية</string>
-    <string name="seperator_dot">•</string>
+    <string name="separator_dot">•</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 3e2cb1b38..cc266e665 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -171,7 +171,7 @@
     <string name="fgs_failed_channel">Не ўдалося аднавіць прайграванне</string>
     <string name="fgs_failed_title">Не ўдалося аднавіць прайграванне музыкі</string>
     <string name="fgs_failed_text">Націсніце тут, каб адкрыць праграму і працягнуць прайграванне</string>
-    <string name="seperator_dot">•</string>
+    <string name="separator_dot">•</string>
     <string name="timer_expiry">Таймер сну прыпыніць музыку на %s</string>
     <string name="grant_audio">Калі ласка, дайце дазвол на «Музыку і аўдыё»</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 13f595c32..8d6fbe29e 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -165,5 +165,5 @@
     <string name="settings_lyrics_multiline_summary">Behandele alle Zeilen zwischen Synchronisationspunkten als ein Liedtext</string>
     <string name="settings_lyrics_contrast_summary">Nützlich, falls man die inaktiven Liedtextzeilen tatsächlich sehen können will</string>
     <string name="timer">Einschlaftimer</string>
-    <string name="seperator_dot">•</string>
+    <string name="separator_dot">•</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 2e42177ca..b95e14c60 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -168,6 +168,6 @@
     <string name="album_covers_enhance_desc">Admite portadas de canciones de alta calidad y permite que la portada del álbum y la canción sean diferentes (requiere acceso a las fotos)</string>
     <string name="sort_by_release_date">Fecha de lanzamiento</string>
     <string name="timer_expiry">El temporizador de apagado pausará la música en %s</string>
-    <string name="seperator_dot">•</string>
+    <string name="separator_dot">•</string>
     <string name="grant_audio">Por favor, concede el permiso para \"Música y audio</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index efb160b95..67fadbbe3 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -137,7 +137,7 @@
     <string name="fgs_failed_text">Rakenduse avamiseks ja taasesituse jätkamiseks klõpsi siin</string>
     <string name="sort_by_release_date">Avaldamise kuupäev</string>
     <string name="timer_expiry">Unetaimer peatab muusika esitamise kell %s</string>
-    <string name="seperator_dot">•</string>
+    <string name="separator_dot">•</string>
     <string name="settings_category_filters">Filtrid</string>
     <string name="fgs_failed_channel">Taasesituse jätkamine ei õnnestunud</string>
     <string name="settings_skip_silence">Jäta vaikus vahele</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index f5012f717..1bdbd6d27 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -164,6 +164,6 @@
     <string name="fgs_failed_channel">ازسرگیری پخش شکست خورد</string>
     <string name="timer_expiry">زمان‌سنج خواب پخش را در %s نگه خواهد داشت</string>
     <string name="fgs_failed_title">ازسرگیری پخش آهنگ شکست خورد</string>
-    <string name="seperator_dot">•</string>
+    <string name="separator_dot">•</string>
     <string name="grant_audio">لطفا دسترسی \"صدا و موسیقی\" را بپذیرید</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 2971138f3..f5b410068 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -168,5 +168,5 @@
     <string name="fgs_failed_text">Cliquez ici pour ouvrir l\'application et continuer la lecture</string>
     <string name="fgs_failed_channel">La reprise de la lecture a échoué</string>
     <string name="settings_lyrics_contrast_summary">Utile si vous avez besoin de lire les lignes de paroles inactives</string>
-    <string name="seperator_dot">•</string>
+    <string name="separator_dot">•</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ia/strings.xml b/app/src/main/res/values-ia/strings.xml
index d75c9105c..47f25a026 100644
--- a/app/src/main/res/values-ia/strings.xml
+++ b/app/src/main/res/values-ia/strings.xml
@@ -159,7 +159,7 @@
     <string name="fgs_failed_title">Fallimento in resumer le reproduction de musica</string>
     <string name="sort_by_release_date">Data de lanceamento</string>
     <string name="timer_expiry">Le temporisator de somno pausara le musica in %s</string>
-    <string name="seperator_dot">•</string>
+    <string name="separator_dot">•</string>
     <string name="album_covers_enhance">Carga meliorate del copertura de album</string>
     <string name="album_covers_enhance_desc">Supporta coperturas de cantos de alte qualitate e permitte haber coperturas de album e canto different (require accesso al photos)</string>
     <string name="settings_lyrics_multiline">Leger le parolas de canto multilinea</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index f71ebaeaa..fe0c64654 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -168,6 +168,6 @@
     <string name="album_covers_enhance_desc">Supporto per copertine di alta qualità delle canzoni e possibilità di differenziare tra copertine di album e canzoni (richiede l\'accesso alle foto)</string>
     <string name="sort_by_release_date">Data di pubblicazione</string>
     <string name="timer_expiry">Timer riposo fermerà la musica a %s</string>
-    <string name="seperator_dot">•</string>
+    <string name="separator_dot">•</string>
     <string name="grant_audio">Per favore consenti l\'autorizzazione \"Musica e audio\"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index d32ebfd01..f544fbf11 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -160,6 +160,6 @@
     <string name="album_covers_enhance_desc">曲とアルバムで高画質なカバー画像に変更できるようにします (写真へのアクセス許可が必要です)</string>
     <string name="sort_by_release_date">リリース日</string>
     <string name="timer_expiry">スリープタイマーは %s に再生を一時停止します</string>
-    <string name="seperator_dot">•</string>
+    <string name="separator_dot">•</string>
     <string name="grant_audio">「音楽とオーディオ」の権限を許可してください</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index ea1b05199..07838068f 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -96,7 +96,7 @@
     <string name="crash_clipboard">충돌 로그를 클립보드에 복사했습니다</string>
     <string name="home_menu_settings">설정</string>
     <string name="sort_by_release_date">발매 날짜</string>
-    <string name="seperator_dot">•</string>
+    <string name="separator_dot">•</string>
     <string name="current_playlist">현재 재생 목록</string>
     <string name="timer">수면 타이머</string>
     <string name="settings_lyrics_contrast">고대비 모드</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 8edcd2909..46df3a3a0 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -172,6 +172,6 @@
     <string name="crash_clipboard">Skopiowano dziennik awarii do schowka</string>
     <string name="deny_images">Odrzuć uprawnienie: \"Zdjęcia i filmy\"</string>
     <string name="timer_expiry">Wyłącznik czasowy wstrzyma odtwarzanie muzyki o %s</string>
-    <string name="seperator_dot">•</string>
+    <string name="separator_dot">•</string>
     <string name="grant_audio">Przyznaj uprawnienia: \"Muzyka i dźwięk\"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index bdb929cb4..ff834af7e 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -167,6 +167,6 @@
     <string name="settings_trim_lyrics">Elimină spațiul din jurul versurilor</string>
     <string name="grant_images">Vă rugăm permiteți accesul la \"Imagini &amp; Clipuri Video\"</string>
     <string name="settings_lyrics_contrast_summary">Utilă dacă doriți să vedeți rândurile de versuri inactive</string>
-    <string name="seperator_dot">•</string>
+    <string name="separator_dot">•</string>
     <string name="timer_expiry">Cronometrul de somn va opri muzica la %s</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 34f7fc362..215fda506 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -174,6 +174,6 @@
     <string name="fgs_failed_text">Нажмите здесь, чтобы открыть приложение и продолжить воспроизведение</string>
     <string name="fgs_failed_channel">Не удалось возобновить воспроизведение</string>
     <string name="timer_expiry">Таймер сна приостановит музыку на %s</string>
-    <string name="seperator_dot">•</string>
+    <string name="separator_dot">•</string>
     <string name="grant_audio">Пожалуйста, предоставьте разрешение на «Музыку и аудио»</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 02d8ae70a..b72af0acf 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -79,7 +79,7 @@
     <string name="fgs_failed_text">Kliknite ovde da otvorite aplikaciju i nastavite sa reprodukcijom</string>
     <string name="fgs_failed_channel">Nastavak reprodukcije nije uspeo</string>
     <string name="sort_by_release_date">Datum izlaska</string>
-    <string name="seperator_dot">•</string>
+    <string name="separator_dot">•</string>
     <string name="unknown_version">Nepoznata verzija</string>
     <string name="dialog_title">Naslov</string>
     <string name="dialog_genre">Žanr</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index fb9a98386..e8fcf1c9d 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -172,6 +172,6 @@
     <string name="fgs_failed_title">Не вдалося відновити відтворення музики</string>
     <string name="fgs_failed_channel">Не вдалося відновити відтворення</string>
     <string name="sort_by_release_date">Дата виходу</string>
-    <string name="seperator_dot">•</string>
+    <string name="separator_dot">•</string>
     <string name="timer_expiry">Таймер сну призупинить музику на %s</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uz/strings.xml b/app/src/main/res/values-uz/strings.xml
index b6ee93629..89bd4ede2 100644
--- a/app/src/main/res/values-uz/strings.xml
+++ b/app/src/main/res/values-uz/strings.xml
@@ -63,7 +63,7 @@
     <string name="current_playlist">Hozirgi pleylist</string>
     <string name="fgs_failed_text">Ilovani ochish va ijroni davom ettirish uchun shu yerni bosing</string>
     <string name="fgs_failed_channel">Ijro davom ettirilmadi</string>
-    <string name="seperator_dot">•</string>
+    <string name="separator_dot">•</string>
     <string name="category_albums">Albomlar</string>
     <plurals name="albums">
         <item quantity="one">%d Albom</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9ba03a190..cf3fb5443 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -177,8 +177,23 @@
     <string name="fgs_failed_channel">Playback failed to resume</string>
     <string name="sort_by_release_date">Release date</string>
     <string name="timer_expiry">Sleep timer will pause music at %s</string>
-    <string name="seperator_dot">•</string>
+    <string name="separator_dot">•</string>
 	<string name="settings_preference_category_home">Home screen</string>
     <string name="tab_order">Configure tab order</string>
     <string name="tab_order_summary">The app will show the first tab on startup. Tabs after the divider will be hidden.</string>
+	<string name="seekbar">Seekbar</string>
+    <string name="divider">Divider</string>
+    <string name="back">Back</string>
+	<string name="play_all">Play all</string>
+    <string name="shuffle_all">Shuffle all</string>
+    <string name="sort">Sort</string>
+    <string name="scroll_to_albums">Scroll to albums</string>
+    <string name="scroll_to_songs">Scroll to songs</string>
+	<string name="play">Play</string>
+	<string name="more">More</string>
+    <string name="remove">Remove</string>
+    <string name="skip_next">Skip to next</string>
+	<string name="expand_less">Close</string>
+    <string name="skip_previous">Skip to previous</string>
+    <string name="position_slider">Position slider</string>
 </resources>
diff --git a/libphonograph b/libphonograph
index 8240e06b8..b94e3ed2b 160000
--- a/libphonograph
+++ b/libphonograph
@@ -1 +1 @@
-Subproject commit 8240e06b8487eb778c063b684590e173082313ea
+Subproject commit b94e3ed2bb4c5cd8e32eb50a1ca5b8aeed29def8