From 24fbf41d081e9b7036d59dd0a0fc05732a52832a Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Thu, 21 Dec 2023 18:11:51 +0100
Subject: Fix issue #994 - Add a scroll bar for timelines (default: disabled)

---
 app/src/main/res/drawables/peertube/drawable/progress_bar.xml    | 4 ++--
 app/src/main/res/layouts/mastodon/layout/fragment_pagination.xml | 3 ++-
 app/src/main/res/values/strings.xml                              | 2 ++
 app/src/main/res/xml/pref_timelines.xml                          | 8 ++++++++
 4 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawables/peertube/drawable/progress_bar.xml b/app/src/main/res/drawables/peertube/drawable/progress_bar.xml
index c0a479c89..049d4b601 100644
--- a/app/src/main/res/drawables/peertube/drawable/progress_bar.xml
+++ b/app/src/main/res/drawables/peertube/drawable/progress_bar.xml
@@ -3,7 +3,7 @@
     <item android:id="@android:id/background">
         <shape>
             <corners android:radius="8dp" />
-            <solid android:color="?secondaryColor" />
+            <solid android:color="?colorSecondary" />
         </shape>
     </item>
 
@@ -17,7 +17,7 @@
         <scale android:scaleWidth="100%">
             <shape>
                 <corners android:radius="8dp" />
-                <solid android:color="?primaryColor" />
+                <solid android:color="?colorPrimary" />
             </shape>
         </scale>
     </item>
diff --git a/app/src/main/res/layouts/mastodon/layout/fragment_pagination.xml b/app/src/main/res/layouts/mastodon/layout/fragment_pagination.xml
index 6801a9698..3ec6f30b0 100644
--- a/app/src/main/res/layouts/mastodon/layout/fragment_pagination.xml
+++ b/app/src/main/res/layouts/mastodon/layout/fragment_pagination.xml
@@ -38,7 +38,8 @@
                 android:layout_height="wrap_content"
                 android:clipToPadding="false"
                 android:paddingBottom="6dp"
-                android:scrollbars="none" />
+                android:scrollbarThumbVertical="?colorPrimary"
+                android:scrollbars="vertical" />
 
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fc6d95008..565a3579a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1190,6 +1190,7 @@
 
     <string name="SET_GROUP_REBLOGS" translatable="false">SET_GROUP_REBLOGS</string>
     <string name="SET_BOOST_ORIGINAL_DATE" translatable="false">SET_BOOST_ORIGINAL_DATE</string>
+    <string name="SET_TIMELINE_SCROLLBAR" translatable="false">SET_TIMELINE_SCROLLBAR</string>
     <string name="SET_MARKDOWN_SUPPORT" translatable="false">SET_MARKDOWN_SUPPORT</string>
     <string name="SET_TRUNCATE_LINKS" translatable="false">SET_TRUNCATE_LINKS</string>
     <string name="SET_UNDERLINE_CLICKABLE" translatable="false">SET_UNDERLINE_CLICKABLE</string>
@@ -1951,6 +1952,7 @@
     <string name="also_followed_by">Followed by:</string>
     <string name="Directory">Directory</string>
     <string name="boost_original_date">Display original date for boosts</string>
+    <string name="timeline_scrollbar">Display a scroll bar for timelines</string>
     <string name="markdown_support">Markdown support</string>
     <string name="set_disable_release_notes">Disable release notes</string>
     <string name="set_disable_release_notes_indication">When a new version is published, you will not be alerted inside the app.</string>
diff --git a/app/src/main/res/xml/pref_timelines.xml b/app/src/main/res/xml/pref_timelines.xml
index c59d8b788..ecf37ffd1 100644
--- a/app/src/main/res/xml/pref_timelines.xml
+++ b/app/src/main/res/xml/pref_timelines.xml
@@ -50,6 +50,14 @@
         app:singleLineTitle="false"
         app:title="@string/boost_original_date" />
 
+
+    <SwitchPreferenceCompat
+        android:defaultValue="false"
+        app:iconSpaceReserved="false"
+        app:key="@string/SET_TIMELINE_SCROLLBAR"
+        app:singleLineTitle="false"
+        app:title="@string/timeline_scrollbar" />
+
     <SwitchPreferenceCompat
         android:defaultValue="true"
         app:iconSpaceReserved="false"
-- 
cgit v1.2.3