diff options
9 files changed, 50 insertions, 43 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/view/EpisodeItemListRecyclerView.java b/app/src/main/java/de/danoeh/antennapod/view/EpisodeItemListRecyclerView.java index cbc6ca630..58d562616 100644 --- a/app/src/main/java/de/danoeh/antennapod/view/EpisodeItemListRecyclerView.java +++ b/app/src/main/java/de/danoeh/antennapod/view/EpisodeItemListRecyclerView.java @@ -4,9 +4,11 @@ import android.content.Context; import android.content.SharedPreferences; import android.util.AttributeSet; import android.view.View; +import androidx.appcompat.view.ContextThemeWrapper; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.yqritc.recyclerviewflexibledivider.HorizontalDividerItemDecoration; +import de.danoeh.antennapod.R; import io.reactivex.annotations.Nullable; public class EpisodeItemListRecyclerView extends RecyclerView { @@ -17,17 +19,17 @@ public class EpisodeItemListRecyclerView extends RecyclerView { private LinearLayoutManager layoutManager; public EpisodeItemListRecyclerView(Context context) { - super(context); + super(new ContextThemeWrapper(context, R.style.FastScrollRecyclerView)); setup(); } public EpisodeItemListRecyclerView(Context context, @Nullable AttributeSet attrs) { - super(context, attrs); + super(new ContextThemeWrapper(context, R.style.FastScrollRecyclerView), attrs); setup(); } public EpisodeItemListRecyclerView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); + super(new ContextThemeWrapper(context, R.style.FastScrollRecyclerView), attrs, defStyleAttr); setup(); } diff --git a/core/src/main/res/drawable/scrollbar_line.xml b/core/src/main/res/drawable/scrollbar_line.xml deleted file mode 100644 index 1d5362840..000000000 --- a/core/src/main/res/drawable/scrollbar_line.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle"> - - <solid android:color="#33666666"/> - - <padding - android:top="10dp" - android:left="10dp" - android:right="10dp" - android:bottom="10dp"/> -</shape> diff --git a/core/src/main/res/drawable/scrollbar_line_drawable.xml b/core/src/main/res/drawable/scrollbar_line_drawable.xml deleted file mode 100644 index 1339fa4a4..000000000 --- a/core/src/main/res/drawable/scrollbar_line_drawable.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item - android:state_pressed="true" - android:drawable="@drawable/scrollbar_line"/> - - <item - android:drawable="@drawable/scrollbar_line"/> -</selector> diff --git a/core/src/main/res/drawable/scrollbar_thumb.xml b/core/src/main/res/drawable/scrollbar_thumb.xml index 0416c8be9..4b08668bf 100644 --- a/core/src/main/res/drawable/scrollbar_thumb.xml +++ b/core/src/main/res/drawable/scrollbar_thumb.xml @@ -1,11 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle"> - - <padding - android:paddingLeft="22dp" - android:paddingRight="22dp" /> - - <solid android:color="#99666666" /> - -</shape> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" android:drawable="@drawable/scrollbar_thumb_pressed"/> + <item android:drawable="@drawable/scrollbar_thumb_default"/> +</selector> diff --git a/core/src/main/res/drawable/scrollbar_thumb_default.xml b/core/src/main/res/drawable/scrollbar_thumb_default.xml new file mode 100644 index 000000000..5e8a98b44 --- /dev/null +++ b/core/src/main/res/drawable/scrollbar_thumb_default.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item> + <shape android:shape="rectangle"> + <size android:height="24dp" android:width="24dp"/> + </shape> + </item> + <item android:gravity="end"> + <shape android:shape="rectangle"> + <solid android:color="#99666666"/> + <size android:height="4dp" android:width="4dp"/> + </shape> + </item> +</layer-list> diff --git a/core/src/main/res/drawable/scrollbar_thumb_drawable.xml b/core/src/main/res/drawable/scrollbar_thumb_drawable.xml deleted file mode 100644 index efed1748c..000000000 --- a/core/src/main/res/drawable/scrollbar_thumb_drawable.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item - android:state_pressed="true" - android:drawable="@drawable/scrollbar_thumb"/> - - <item - android:drawable="@drawable/scrollbar_thumb"/> -</selector> diff --git a/core/src/main/res/drawable/scrollbar_thumb_pressed.xml b/core/src/main/res/drawable/scrollbar_thumb_pressed.xml new file mode 100644 index 000000000..4f3ad719e --- /dev/null +++ b/core/src/main/res/drawable/scrollbar_thumb_pressed.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item> + <shape android:shape="rectangle"> + <size android:height="24dp" android:width="24dp"/> + </shape> + </item> + <item android:gravity="end"> + <shape android:shape="rectangle"> + <solid android:color="@color/antennapod_blue"/> + <size android:height="4dp" android:width="4dp"/> + </shape> + </item> +</layer-list> diff --git a/core/src/main/res/drawable/scrollbar_track.xml b/core/src/main/res/drawable/scrollbar_track.xml new file mode 100644 index 000000000..ce838abe9 --- /dev/null +++ b/core/src/main/res/drawable/scrollbar_track.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@android:color/transparent"/> +</selector> diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml index bbfd4eee5..c880ba5c0 100644 --- a/core/src/main/res/values/styles.xml +++ b/core/src/main/res/values/styles.xml @@ -309,4 +309,13 @@ <item name="android:progressDrawable">@drawable/progress_bar_horizontal_trueblack</item> </style> + <style name="FastScrollRecyclerView" parent="android:Widget"> + <item name="android:scrollbars">none</item> + <item name="fastScrollEnabled">true</item> + <item name="fastScrollHorizontalThumbDrawable">@drawable/scrollbar_thumb</item> + <item name="fastScrollHorizontalTrackDrawable">@drawable/scrollbar_track</item> + <item name="fastScrollVerticalThumbDrawable">@drawable/scrollbar_thumb</item> + <item name="fastScrollVerticalTrackDrawable">@drawable/scrollbar_track</item> + </style> + </resources> |