From 6393923274879080657eb2f039f4a6c637cece2c Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Tue, 29 Oct 2019 01:51:54 +0900
Subject: [PATCH] hide the seekbar value on all devices

---
 .../fdroid/fdroid/views/LiveSeekBarPreference.java | 14 +++++++++-----
 .../fdroid/views/SeekBarForegroundThumb.java       |  1 +
 app/src/main/res/drawable/seekbar_thumb.xml        |  6 +++---
 app/src/main/res/drawable/seekbar_tickmark.xml     |  6 +++---
 app/src/main/res/values/styles.xml                 |  3 ++-
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/views/LiveSeekBarPreference.java b/app/src/main/java/org/fdroid/fdroid/views/LiveSeekBarPreference.java
index 81009edb2..11916434c 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/LiveSeekBarPreference.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/LiveSeekBarPreference.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.support.v7.preference.PreferenceViewHolder;
 import android.support.v7.preference.SeekBarPreference;
 import android.util.AttributeSet;
+import android.view.View;
 import android.widget.SeekBar;
 import android.widget.TextView;
 import org.fdroid.fdroid.R;
@@ -37,8 +38,11 @@ public class LiveSeekBarPreference extends SeekBarPreference {
     public void onBindViewHolder(final PreferenceViewHolder holder) {
         super.onBindViewHolder(holder);
 
-        SeekBarForegroundThumb seekbar = holder.itemView.findViewById(R.id.seekbar);
-        seekbar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+        View seekBarValue = holder.findViewById(R.id.seekbar_value);
+        seekBarValue.setVisibility(View.GONE);
+
+        SeekBarForegroundThumb seekBar = holder.itemView.findViewById(R.id.seekbar);
+        seekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
             @Override
             public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
                 value = progress;
@@ -65,12 +69,12 @@ public class LiveSeekBarPreference extends SeekBarPreference {
                 persistInt(value);
             }
         });
-        seekbar.setProgress(value);
+        seekBar.setProgress(value);
 
         if (isEnabled()) {
-            seekbar.setAlpha(1.0f);
+            seekBar.setAlpha(1.0f);
         } else {
-            seekbar.setAlpha(0.3f);
+            seekBar.setAlpha(0.3f);
         }
     }
 
diff --git a/app/src/main/java/org/fdroid/fdroid/views/SeekBarForegroundThumb.java b/app/src/main/java/org/fdroid/fdroid/views/SeekBarForegroundThumb.java
index 4a5f1d509..0ac13e55a 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/SeekBarForegroundThumb.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/SeekBarForegroundThumb.java
@@ -6,6 +6,7 @@ import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.support.v7.widget.AppCompatSeekBar;
 import android.util.AttributeSet;
+
 import org.fdroid.fdroid.R;
 
 /**
diff --git a/app/src/main/res/drawable/seekbar_thumb.xml b/app/src/main/res/drawable/seekbar_thumb.xml
index 23a860ce6..7a0837c26 100644
--- a/app/src/main/res/drawable/seekbar_thumb.xml
+++ b/app/src/main/res/drawable/seekbar_thumb.xml
@@ -2,10 +2,10 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="oval">
-            <solid android:color="@color/fdroid_green"/>
             <size
-                    android:width="20dp"
-                    android:height="20dp"/>
+                android:width="20dp"
+                android:height="20dp" />
+            <solid android:color="@color/fdroid_green" />
         </shape>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/seekbar_tickmark.xml b/app/src/main/res/drawable/seekbar_tickmark.xml
index cae711ded..fcd7d74c8 100644
--- a/app/src/main/res/drawable/seekbar_tickmark.xml
+++ b/app/src/main/res/drawable/seekbar_tickmark.xml
@@ -2,10 +2,10 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="oval">
-            <solid android:color="#818181"/>
             <size
-                    android:width="6dp"
-                    android:height="6dp"/>
+                android:width="6dp"
+                android:height="6dp" />
+            <solid android:color="#818181" />
         </shape>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6e95ef0a5..c28975a84 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -201,6 +201,7 @@
     <style name="AppThemeLight.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
 
     <style name="DiscreteSeekBar" parent="Base.Widget.AppCompat.SeekBar.Discrete">
-        <item name="tickMark">@null</item> <!-- Disable default tickMarks. We draw our own in SeekBarForegroundThumb -->
+        <!-- Disable default tickMarks. We draw our own in SeekBarForegroundThumb -->
+        <item name="tickMark">@null</item>
     </style>
 </resources>