Merge pull request #28 from Carifio24/ui-improvements

UI improvements
Carifio24 · Sep 4, 2023 · d78ea7c · d78ea7c
2 parents 1f7bcad + 5f5ccdd
commit d78ea7c
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 6 deletions.
diff --git a/app/src/main/java/dnd/jon/spellbook/ShortScrollbarRVScrollView.java b/app/src/main/java/dnd/jon/spellbook/ShortScrollbarRVScrollView.java
@@ -0,0 +1,47 @@
+package dnd.jon.spellbook;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.ScrollView;
+
+public class ShortScrollbarRVScrollView extends ScrollView {
+    public ShortScrollbarRVScrollView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public ShortScrollbarRVScrollView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public ShortScrollbarRVScrollView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public ShortScrollbarRVScrollView(Context context) {
+        super(context);
+    }
+
+    // This is the value of scrollY when the RV is fully scrolled
+    private int yScrollRange() {
+        return super.computeVerticalScrollRange() - getHeight();
+    }
+
+    @Override
+    public int computeVerticalScrollExtent() {
+        final int yRange = yScrollRange();
+        if (yRange <= 0) {
+            return 0;
+        }
+        return super.computeVerticalScrollExtent() / 5;
+    }
+
+    @Override
+    public int computeVerticalScrollOffset() {
+        final int yRange = yScrollRange();
+        if (yRange <= 0) {
+            return 0;
+        }
+        return getScrollY() * (getHeight() - computeVerticalScrollExtent()) / yRange;
+    }
+
+}
diff --git a/app/src/main/res/layout/character_selection.xml b/app/src/main/res/layout/character_selection.xml
@@ -91,20 +91,24 @@
 
         </com.google.android.flexbox.FlexboxLayout>
 
-        <ScrollView
-            android:layout_width="wrap_content"
-            android:layout_height="126dp"
+        <dnd.jon.spellbook.ShortScrollbarRVScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="126dp"
             android:id="@+id/selection_table_scrollview"
             android:layout_below="@id/import_character_button_layout"
+            android:fadeScrollbars="false"
             >
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/selection_recycler_view"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:paddingStart="4dp"
+                android:paddingEnd="8dp"
                 >
             </androidx.recyclerview.widget.RecyclerView>
-        </ScrollView>
+        </dnd.jon.spellbook.ShortScrollbarRVScrollView>
 
     </RelativeLayout>
 

diff --git a/app/src/main/res/layout/name_row.xml b/app/src/main/res/layout/name_row.xml
@@ -7,7 +7,7 @@
     </data>
 
     <RelativeLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/name_row"
         >

diff --git a/app/src/main/res/xml/settings_screen.xml b/app/src/main/res/xml/settings_screen.xml
@@ -61,6 +61,7 @@
         <SwitchPreference
             android:key="@string/fab_movable_key"
             android:title="@string/fab_movable_title"
+            android:defaultValue="true"
             />
 
     </androidx.preference.PreferenceCategory>