Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hide-seekbar-value' into 'master'

Browse Source 
Hide the seekbar value on all devices

See merge request fdroid/fdroidclient!849
This commit is contained in:
Hans-Christoph Steiner 2019-10-28 17:17:16 +00:00
commit a2583f0255
5 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/fdroid/fdroid/views/LiveSeekBarPreference.java
View File

@ -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);
}
}

1
app/src/main/java/org/fdroid/fdroid/views/SeekBarForegroundThumb.java
View File

@ -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;
/**

4
app/src/main/res/drawable/seekbar_thumb.xml
View File

@ -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:height="20dp" />
<solid android:color="@color/fdroid_green" />
</shape>
</item>
</layer-list>

4
app/src/main/res/drawable/seekbar_tickmark.xml
View File

@ -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:height="6dp" />
<solid android:color="#818181" />
</shape>
</item>
</layer-list>

3
app/src/main/res/values/styles.xml
View File

@ -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>