From 982abe8cdb4518da82e473daf473239574c0d37f Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Fri, 12 Aug 2022 16:00:30 -0600
Subject: [PATCH] strings: remove system ok/cancel names [#215]

Auxio tried to leverage built-in android string attributes for Ok and
Cancel while still completing them for other translations that were not
supported by the OS.

Turns out this was a terrible idea when I switched to Weblate, which
has no knowledge of this trick and could lead to a misleading
translation value. Remove it.

Resolves #215.
---
 CHANGELOG.md                                        |  4 ++++
 app/src/main/java/org/oxycblt/auxio/MainFragment.kt |  7 ++++++-
 app/src/main/res/layout/item_album_song.xml         |  4 ++--
 app/src/main/res/layout/item_parent.xml             |  6 +++---
 app/src/main/res/layout/item_queue_song.xml         |  4 ++--
 app/src/main/res/layout/item_song.xml               |  6 +++---
 app/src/main/res/layout/item_sort_header.xml        |  6 ++++--
 app/src/main/res/values-es/strings.xml              |  4 ++--
 app/src/main/res/values-in/strings.xml              |  4 ++--
 app/src/main/res/values-lt/strings.xml              |  4 ++--
 app/src/main/res/values-nl/strings.xml              |  4 ++--
 app/src/main/res/values-ru/strings.xml              |  4 ++--
 app/src/main/res/values-tr/strings.xml              |  4 ++--
 app/src/main/res/values/strings.xml                 |  6 ++----
 app/src/main/res/values/styles_ui.xml               | 12 ++++++------
 15 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d093d9b3..5afebd8f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@
 - Playback bar now has a marquee effect
 - Added a way to access the system equalizer from the playback menu.
 
+#### What's Fixed
+-  Fixed "@android:string/<ok/cancel>" strings from appearing in dialog
+buttons
+
 #### What's Changed
 - Menus are now opened using a new button to the side of all items
 - ReplayGain can now no longer be disabled. Remove ReplayGain tags from
diff --git a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
index 4ecc42f99..c956ee145 100644
--- a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
@@ -179,7 +179,6 @@ class MainFragment :
             // No queue sheet, fade normally based on the playback sheet
             binding.playbackBarFragment.alpha = 1 - halfOutRatio
             binding.playbackPanelFragment.alpha = halfInPlaybackRatio
-            binding.queueSheet.alpha = halfInPlaybackRatio
         }
 
         binding.exploreNavHost.apply {
@@ -196,6 +195,12 @@ class MainFragment :
         }
 
         binding.playbackPanelFragment.isInvisible = binding.playbackPanelFragment.alpha == 0f
+
+        binding.queueSheet.apply {
+            alpha = halfInPlaybackRatio
+            binding.queueSheet.isInvisible = alpha == 0f
+        }
+
         binding.queueFragment.isInvisible = binding.queueFragment.alpha == 0f
 
         if (playbackModel.song.value == null) {
diff --git a/app/src/main/res/layout/item_album_song.xml b/app/src/main/res/layout/item_album_song.xml
index 6326ab911..2058e77e9 100644
--- a/app/src/main/res/layout/item_album_song.xml
+++ b/app/src/main/res/layout/item_album_song.xml
@@ -8,7 +8,7 @@
     android:background="?attr/selectableItemBackground"
     android:paddingTop="@dimen/spacing_medium"
     android:paddingBottom="@dimen/spacing_medium"
-    android:paddingEnd="@dimen/spacing_small"
+    android:paddingEnd="@dimen/spacing_mid_medium"
     android:paddingStart="@dimen/spacing_medium">
 
     <!--
@@ -67,7 +67,7 @@
         style="@style/Widget.Auxio.TextView.Item.Secondary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/spacing_small"
+        android:layout_marginEnd="@dimen/spacing_mid_medium"
         android:textColor="?android:attr/textColorSecondary"
         app:layout_constraintBottom_toBottomOf="@+id/song_track_bg"
         app:layout_constraintEnd_toStartOf="@+id/song_menu"
diff --git a/app/src/main/res/layout/item_parent.xml b/app/src/main/res/layout/item_parent.xml
index dbfcc198c..d5e1fc2e3 100644
--- a/app/src/main/res/layout/item_parent.xml
+++ b/app/src/main/res/layout/item_parent.xml
@@ -7,7 +7,7 @@
     android:background="?attr/selectableItemBackground"
     android:paddingTop="@dimen/spacing_medium"
     android:paddingBottom="@dimen/spacing_medium"
-    android:paddingEnd="@dimen/spacing_small"
+    android:paddingEnd="@dimen/spacing_mid_medium"
     android:paddingStart="@dimen/spacing_medium">
 
     <org.oxycblt.auxio.image.ImageGroup
@@ -24,7 +24,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:textColor="@color/sel_accented_primary"
-        android:layout_marginEnd="@dimen/spacing_small"
+        android:layout_marginEnd="@dimen/spacing_mid_medium"
         app:layout_constraintBottom_toTopOf="@+id/parent_info"
         app:layout_constraintEnd_toStartOf="@+id/parent_menu"
         app:layout_constraintStart_toEndOf="@+id/parent_image"
@@ -37,7 +37,7 @@
         style="@style/Widget.Auxio.TextView.Item.Secondary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/spacing_small"
+        android:layout_marginEnd="@dimen/spacing_mid_medium"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/parent_menu"
         app:layout_constraintStart_toEndOf="@+id/parent_image"
diff --git a/app/src/main/res/layout/item_queue_song.xml b/app/src/main/res/layout/item_queue_song.xml
index 0ecc2b6b9..5886cbe05 100644
--- a/app/src/main/res/layout/item_queue_song.xml
+++ b/app/src/main/res/layout/item_queue_song.xml
@@ -61,7 +61,7 @@
                 style="@style/Widget.Auxio.TextView.Item.Secondary"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/spacing_small"
+                android:layout_marginEnd="@dimen/spacing_mid_medium"
                 android:textColor="@color/sel_toggleable_secondary"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/song_drag_handle"
@@ -74,7 +74,7 @@
                 style="@style/Widget.Auxio.Button.Icon.Small"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/spacing_small"
+                android:layout_marginEnd="@dimen/spacing_mid_medium"
                 android:contentDescription="@string/desc_queue_handle"
                 app:icon="@drawable/ic_handle_24"
                 app:layout_constraintBottom_toBottomOf="@+id/song_album_cover"
diff --git a/app/src/main/res/layout/item_song.xml b/app/src/main/res/layout/item_song.xml
index 5cdc0c173..626f86983 100644
--- a/app/src/main/res/layout/item_song.xml
+++ b/app/src/main/res/layout/item_song.xml
@@ -7,7 +7,7 @@
     android:background="?attr/selectableItemBackground"
     android:paddingTop="@dimen/spacing_medium"
     android:paddingBottom="@dimen/spacing_medium"
-    android:paddingEnd="@dimen/spacing_small"
+    android:paddingEnd="@dimen/spacing_mid_medium"
     android:paddingStart="@dimen/spacing_medium">
 
     <org.oxycblt.auxio.image.ImageGroup
@@ -24,7 +24,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:textColor="@color/sel_accented_primary"
-        android:layout_marginEnd="@dimen/spacing_small"
+        android:layout_marginEnd="@dimen/spacing_mid_medium"
         app:layout_constraintBottom_toTopOf="@+id/song_info"
         app:layout_constraintEnd_toStartOf="@+id/song_menu"
         app:layout_constraintStart_toEndOf="@+id/song_album_cover"
@@ -37,7 +37,7 @@
         style="@style/Widget.Auxio.TextView.Item.Secondary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/spacing_small"
+        android:layout_marginEnd="@dimen/spacing_mid_medium"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/song_menu"
         app:layout_constraintStart_toEndOf="@+id/song_album_cover"
diff --git a/app/src/main/res/layout/item_sort_header.xml b/app/src/main/res/layout/item_sort_header.xml
index 6ff82d4f1..3497e4770 100644
--- a/app/src/main/res/layout/item_sort_header.xml
+++ b/app/src/main/res/layout/item_sort_header.xml
@@ -9,9 +9,11 @@
     <TextView
         android:id="@+id/header_title"
         style="@style/Widget.Auxio.TextView.Header"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/spacing_mid_medium"
         app:layout_constraintBottom_toTopOf="@id/header_divider"
+        app:layout_constraintEnd_toStartOf="@+id/header_button"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Songs" />
@@ -21,7 +23,7 @@
         style="@style/Widget.Auxio.Button.Icon.Small"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/spacing_small"
+        android:layout_marginEnd="@dimen/spacing_mid_medium"
         android:contentDescription="@string/lbl_sort"
         app:icon="@drawable/ic_sort_24"
         app:layout_constraintBottom_toTopOf="@id/header_divider"
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index a8b7362f3..14863fdc6 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -152,7 +152,7 @@
     <string name="lbl_song_detail">Ver propiedades</string>
     <string name="lbl_shuffle_shortcut_short">Mezclar</string>
     <string name="lbl_shuffle_shortcut_long">Mezclar todo</string>
-    <string name="lbl_ok">\@android:string/ok</string>
+    <string name="lbl_ok">@android:string/ok</string>
     <string name="lbl_library_counts">Estadísticas de la biblioteca</string>
     <string name="set_pre_amp_without">Ajuste sin etiquetas</string>
     <string name="set_pre_amp_warning">Advertencia: Cambiar el pre-amp a un valor alto puede resultar en picos en algunas pistas de audio.</string>
@@ -184,7 +184,7 @@
     <string name="lbl_sort_date_added">Fecha de añadido</string>
     <string name="lbl_props">Propiedades de la canción</string>
     <string name="lbl_sample_rate">Frecuencia de muestreo</string>
-    <string name="lbl_cancel">\@android:string/cancel</string>
+    <string name="lbl_cancel">@android:string/cancel</string>
     <string name="set_headset_autoplay">Reproducción automática con auriculares</string>
     <string name="set_restore_state">Reestablecer el estado de reproducción</string>
     <string name="set_restore_desc">Reestablecer el estado de reproducción guardado previamente (si existe)</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 0e2a8ffa8..1ed97f74c 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -56,8 +56,8 @@
     <string name="lbl_props">Properti lagu</string>
     <string name="lbl_file_name">Nama file</string>
     <string name="lbl_bitrate">Laju bit</string>
-    <string name="lbl_ok">\@android:string/ok</string>
-    <string name="lbl_cancel">\@android:string/cancel</string>
+    <string name="lbl_ok">@android:string/ok</string>
+    <string name="lbl_cancel">@android:string/cancel</string>
     <string name="lbl_add">Tambah</string>
     <string name="lbl_save">Simpan</string>
     <string name="set_black_mode">Tema hitam</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index b2aac4cdc..25ed028f6 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -79,12 +79,12 @@
     <string name="lbl_shuffle_shortcut_long">Išmaišyti viską</string>
     <string name="lbl_state_restored">Atkurta grojimo būsena</string>
     <string name="lbl_state_saved">Išsaugota grojamo būsena</string>
-    <string name="lbl_cancel">\@android:string/atšaukti</string>
+    <string name="lbl_cancel">Atšaukti</string>
     <string name="lbl_code">Peržiūrėti per „Github“</string>
     <string name="set_display">Rodyti</string>
     <string name="set_replay_gain">„ReplayGain“</string>
     <string name="lbl_singles">Singlaiai</string>
-    <string name="lbl_ok">\@android:string/gerai</string>
+    <string name="lbl_ok">Gerai</string>
     <string name="set_show_covers">Rodyti albumų viršelius</string>
     <string name="set_show_covers_desc">Išjungti, kad sutaupytumėte atminties naudojimą</string>
     <string name="set_quality_covers_desc">Pagerėja albumo viršelio kokybė, tačiau ilgėja įkrovimo laikas ir naudojama daugiau atminties</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 64093661a..4d785d1ae 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -126,7 +126,7 @@
     <string name="lbl_song_detail">Bekijk eigenschappen</string>
     <string name="lbl_sort_name">Naam</string>
     <string name="lbl_artist">Artiest</string>
-    <string name="lbl_cancel">\@android:string/cancel</string>
+    <string name="lbl_cancel">@android:string/cancel</string>
     <string name="set_lib_tabs">Bibliotheek tabbladen</string>
     <string name="lbl_sort_year">Jaar</string>
     <string name="lbl_relative_path">Ouderpad</string>
@@ -142,7 +142,7 @@
     <string name="set_dirs_desc">Bepaal waar muziek vandaan moet worden geladen</string>
     <string name="fmt_lib_total_duration">Totale duur: %s</string>
     <string name="lbl_shuffle_shortcut_long">Shuffle Alles</string>
-    <string name="lbl_ok">\@android:string/ok</string>
+    <string name="lbl_ok">@android:string/ok</string>
     <string name="set_replay_gain_off">Uit</string>
     <string name="set_headset_autoplay_desc">Altijd beginnen met spelen als een headset is aangesloten (werkt mogelijk niet op alle apparaten)</string>
     <string name="desc_shuffle">Schakel shuffle aan of uit</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index d17b545f5..02ed2ce75 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -154,7 +154,7 @@
     <string name="lbl_observing">Мониторинг музыкальной библиотеки</string>
     <string name="lbl_shuffle_shortcut_short">Перемешать</string>
     <string name="lbl_shuffle_shortcut_long">Перемешать всё</string>
-    <string name="lbl_ok">\@android:string/ok</string>
+    <string name="lbl_ok">@android:string/ok</string>
     <string name="set_detail_song_playback_mode">При воспроизведении из сведений</string>
     <string name="set_playback_mode_none">Воспроизведение с показанного элемента</string>
     <string name="lbl_sort_count">Номер песни</string>
@@ -162,7 +162,7 @@
     <string name="lbl_sort_disc">Диск</string>
     <string name="lbl_sort_track">Трек</string>
     <string name="lbl_state_restored">Состояние восстановлено</string>
-    <string name="lbl_cancel">\@android:string/cancel</string>
+    <string name="lbl_cancel">@android:string/cancel</string>
     <string name="set_pre_amp_warning">Внимание: Изменение предусилителя на большое положительное значение может привести к появлению искажений на некоторых звуковых дорожках.</string>
     <string name="lbl_song_detail">Свойства</string>
     <string name="lbl_props">Свойства песни</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 954fbd8bc..dbbcfbae5 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -61,8 +61,8 @@
     <string name="lbl_format">Biçim</string>
     <string name="lbl_shuffle_shortcut_short">Karıştır</string>
     <string name="lbl_shuffle_shortcut_long">Tümünü karıştır</string>
-    <string name="lbl_ok">\@android:string/tamam</string>
-    <string name="lbl_cancel">\@android:string/iptal</string>
+    <string name="lbl_ok">Tamam</string>
+    <string name="lbl_cancel">Iptal</string>
     <string name="lbl_add">Ekle</string>
     <string name="lbl_save">Kaydet</string>
     <string name="fmt_lib_total_duration">Toplam süre: %s</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0656881de..662a3367a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -114,10 +114,8 @@
     <!-- Limit to 25 characters -->
     <string name="lbl_shuffle_shortcut_long">Shuffle all</string>
 
-    <!-- Actual string: Ok -->
-    <string name="lbl_ok">@android:string/ok</string>
-    <!-- Actual string: Cancel -->
-    <string name="lbl_cancel">@android:string/cancel</string>
+    <string name="lbl_ok">OK</string>
+    <string name="lbl_cancel">Cancel</string>
     <!-- As in to add a new folder in the "Music folders" setting -->
     <string name="lbl_add">Add</string>
     <!-- As in to save the "Music folders" setting -->
diff --git a/app/src/main/res/values/styles_ui.xml b/app/src/main/res/values/styles_ui.xml
index a14e6d6ee..f47faa020 100644
--- a/app/src/main/res/values/styles_ui.xml
+++ b/app/src/main/res/values/styles_ui.xml
@@ -213,16 +213,16 @@
 
     <style name="Widget.Auxio.Button.Icon.Large" parent="Widget.Auxio.Button.Icon.Base">
         <item name="iconSize">@dimen/size_icon_large</item>
-        <item name="android:minWidth">56dp</item>
-        <item name="android:minHeight">56dp</item>
+        <item name="android:minWidth">@dimen/size_btn</item>
+        <item name="android:minHeight">@dimen/size_btn</item>
         <item name="android:insetTop">0dp</item>
         <item name="android:insetBottom">0dp</item>
         <item name="android:insetLeft">0dp</item>
         <item name="android:insetRight">0dp</item>
-        <item name="android:paddingStart">@dimen/spacing_mid_medium</item>
-        <item name="android:paddingEnd">@dimen/spacing_mid_medium</item>
-        <item name="android:paddingTop">@dimen/spacing_mid_medium</item>
-        <item name="android:paddingBottom">@dimen/spacing_mid_medium</item>
+        <item name="android:paddingStart">@dimen/spacing_small</item>
+        <item name="android:paddingEnd">@dimen/spacing_small</item>
+        <item name="android:paddingTop">@dimen/spacing_small</item>
+        <item name="android:paddingBottom">@dimen/spacing_small</item>
     </style>
 
     <style name="Widget.Auxio.Button.PlayPause" parent="Widget.Material3.Button.IconButton.Filled.Tonal">