From 421f75ca8ac3cabfe17fff89aaebc8851087dd04 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 10 May 2020 16:19:48 +0200
Subject: [PATCH] Fixed blue buttons with blue text

---
 .../dialog/PlaybackControlsDialog.java        |  4 ++--
 app/src/main/res/layout/audio_controls.xml    | 20 ++++++++++++-------
 .../download_authentication_activity.xml      | 14 ++++---------
 core/src/main/res/values/strings.xml          |  2 ++
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java
index 83debaecb..d1ffdc148 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java
@@ -80,7 +80,7 @@ public class PlaybackControlsDialog extends DialogFragment {
 
     private void setupUi() {
         final SeekBar barPlaybackSpeed = dialog.findViewById(R.id.playback_speed);
-        final Button butDecSpeed = dialog.findViewById(R.id.butDecSpeed);
+        final TextView butDecSpeed = dialog.findViewById(R.id.butDecSpeed);
         butDecSpeed.setOnClickListener(v -> {
             if (controller != null && controller.canSetPlaybackSpeed()) {
                 barPlaybackSpeed.setProgress(barPlaybackSpeed.getProgress() - 2);
@@ -88,7 +88,7 @@ public class PlaybackControlsDialog extends DialogFragment {
                 VariableSpeedDialog.showGetPluginDialog(getContext());
             }
         });
-        final Button butIncSpeed = (Button) dialog.findViewById(R.id.butIncSpeed);
+        final TextView butIncSpeed = dialog.findViewById(R.id.butIncSpeed);
         butIncSpeed.setOnClickListener(v -> {
             if (controller != null && controller.canSetPlaybackSpeed()) {
                 barPlaybackSpeed.setProgress(barPlaybackSpeed.getProgress() + 2);
diff --git a/app/src/main/res/layout/audio_controls.xml b/app/src/main/res/layout/audio_controls.xml
index 6cb87282f..9a1c525a7 100644
--- a/app/src/main/res/layout/audio_controls.xml
+++ b/app/src/main/res/layout/audio_controls.xml
@@ -41,18 +41,22 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:gravity="center_vertical">
 
-            <Button
+            <TextView
                 android:id="@+id/butDecSpeed"
                 android:layout_width="32dp"
                 android:layout_height="32dp"
                 android:gravity="center"
                 android:text="-"
+                android:clickable="true"
+                android:focusable="true"
                 android:textStyle="bold"
-                android:textColor="?attr/colorAccent"
                 android:textSize="24sp"
-                android:background="?attr/selectableItemBackgroundBorderless" />
+                android:textColor="?attr/colorSecondary"
+                android:contentDescription="@string/decrease_volume"
+                android:background="?attr/selectableItemBackgroundBorderless"/>
 
             <SeekBar
                 android:id="@+id/playback_speed"
@@ -61,16 +65,18 @@
                 android:max="70"
                 android:layout_weight="1" />
 
-            <Button
+            <TextView
                 android:id="@+id/butIncSpeed"
                 android:layout_width="32dp"
                 android:layout_height="32dp"
-                android:minWidth="0dp"
                 android:gravity="center"
                 android:text="+"
+                android:clickable="true"
+                android:focusable="true"
                 android:textStyle="bold"
-                android:textColor="?attr/colorAccent"
                 android:textSize="24sp"
+                android:textColor="?attr/colorSecondary"
+                android:contentDescription="@string/increase_volume"
                 android:background="?attr/selectableItemBackgroundBorderless" />
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/download_authentication_activity.xml b/app/src/main/res/layout/download_authentication_activity.xml
index 58c2c10e6..e16a8b3a8 100644
--- a/app/src/main/res/layout/download_authentication_activity.xml
+++ b/app/src/main/res/layout/download_authentication_activity.xml
@@ -50,21 +50,15 @@
                 android:id="@+id/butCancel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/selectableItemBackground"
-                android:textColor="?attr/colorAccent"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:text="@string/cancel_label"/>
+                android:text="@string/cancel_label"
+                style="@style/Widget.MaterialComponents.Button.TextButton"/>
 
         <Button
                 android:id="@+id/butConfirm"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/selectableItemBackground"
-                android:textColor="?attr/colorAccent"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:text="@string/confirm_label"/>
+                android:text="@string/confirm_label"
+                style="@style/Widget.MaterialComponents.Button.TextButton"/>
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 1c2db3a5b..bb3b6f896 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -671,6 +671,8 @@
     <!-- Content descriptions for image buttons -->
     <string name="rewind_label">Rewind</string>
     <string name="fast_forward_label">Fast forward</string>
+    <string name="increase_volume">Increase volume</string>
+    <string name="decrease_volume">Decrease volume</string>
     <string name="media_type_audio_label">Audio</string>
     <string name="media_type_video_label">Video</string>
     <string name="navigate_upwards_label">Navigate upwards</string>