From 4a996f8edcd5bc6024aae90b4bc4f16fcea43784 Mon Sep 17 00:00:00 2001
From: tzugen <tzugen@riseup.net>
Date: Wed, 22 Dec 2021 13:26:58 +0100
Subject: [PATCH] Fix Scroll in MainFragment

---
 .../android-module-bootstrap.gradle           |   1 +
 ultrasonic/build.gradle                       |   5 +
 .../moire/ultrasonic/fragment/MainFragment.kt |   4 +-
 ultrasonic/src/main/res/layout/main.xml       | 376 +++++++++---------
 4 files changed, 198 insertions(+), 188 deletions(-)

diff --git a/gradle_scripts/android-module-bootstrap.gradle b/gradle_scripts/android-module-bootstrap.gradle
index 88519a56..ab63228b 100644
--- a/gradle_scripts/android-module-bootstrap.gradle
+++ b/gradle_scripts/android-module-bootstrap.gradle
@@ -40,6 +40,7 @@ android {
 
     buildFeatures {
         buildConfig = false
+        viewBinding true
     }
 }
 
diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle
index 0f330201..536f5627 100644
--- a/ultrasonic/build.gradle
+++ b/ultrasonic/build.gradle
@@ -58,6 +58,11 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+
+    buildFeatures {
+        viewBinding true
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/MainFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/MainFragment.kt
index 6969a47f..a9e3a41a 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/MainFragment.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/MainFragment.kt
@@ -4,7 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.LinearLayout
+import android.widget.ScrollView
 import android.widget.TextView
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
@@ -21,7 +21,7 @@ import org.moire.ultrasonic.util.Util
  */
 class MainFragment : Fragment(), KoinComponent {
 
-    private lateinit var list: LinearLayout
+    private lateinit var list: ScrollView
     private lateinit var musicTitle: TextView
     private lateinit var artistsButton: TextView
     private lateinit var albumsButton: TextView
diff --git a/ultrasonic/src/main/res/layout/main.xml b/ultrasonic/src/main/res/layout/main.xml
index e6763155..83d627aa 100644
--- a/ultrasonic/src/main/res/layout/main.xml
+++ b/ultrasonic/src/main/res/layout/main.xml
@@ -1,211 +1,215 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-    a:id="@+id/main_list"
+<ScrollView xmlns:a="http://schemas.android.com/apk/res/android"
     a:layout_width="fill_parent"
     a:layout_height="fill_parent"
-    a:orientation="vertical">
+    a:id="@+id/main_list">
 
-    <TextView
-        a:id="@+id/main_music"
+    <LinearLayout
         a:layout_width="fill_parent"
         a:layout_height="wrap_content"
-        a:gravity="center_vertical"
-        a:paddingStart="6dp"
-        a:text="@string/main.music"
-        a:textAllCaps="true"
-        a:textAppearance="?android:attr/textAppearanceSmall"
-        a:textColor="@color/cyan"
-        a:textStyle="bold" />
+        a:orientation="vertical">
 
-    <TextView
-        a:id="@+id/main_artists_button"
-        a:layout_width="fill_parent"
-        a:layout_height="wrap_content"
-        a:gravity="center_vertical"
-        a:minHeight="40dip"
-        a:paddingStart="6dip"
-        a:paddingEnd="6dip"
-        a:text="@string/main.artists_title"
-        a:textAppearance="?android:attr/textAppearanceMedium" />
+        <TextView
+            a:id="@+id/main_music"
+            a:layout_width="fill_parent"
+            a:layout_height="wrap_content"
+            a:gravity="center_vertical"
+            a:paddingStart="6dp"
+            a:text="@string/main.music"
+            a:textAllCaps="true"
+            a:textAppearance="?android:attr/textAppearanceSmall"
+            a:textColor="@color/cyan"
+            a:textStyle="bold" />
 
-    <TextView
-        a:id="@+id/main_albums_button"
-        a:layout_width="fill_parent"
-        a:layout_height="wrap_content"
-        a:gravity="center_vertical"
-        a:minHeight="40dip"
-        a:paddingStart="6dip"
-        a:paddingEnd="6dip"
-        a:text="@string/main.albums_title"
-        a:textAppearance="?android:attr/textAppearanceMedium" />
+        <TextView
+            a:id="@+id/main_artists_button"
+            a:layout_width="fill_parent"
+            a:layout_height="wrap_content"
+            a:gravity="center_vertical"
+            a:minHeight="40dip"
+            a:paddingStart="6dip"
+            a:paddingEnd="6dip"
+            a:text="@string/main.artists_title"
+            a:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <TextView
-        a:id="@+id/main_genres_button"
-        a:layout_width="fill_parent"
-        a:layout_height="wrap_content"
-        a:gravity="center_vertical"
-        a:minHeight="40dip"
-        a:paddingStart="6dip"
-        a:paddingEnd="6dip"
-        a:text="@string/main.genres_title"
-        a:textAppearance="?android:attr/textAppearanceMedium" />
+        <TextView
+            a:id="@+id/main_albums_button"
+            a:layout_width="fill_parent"
+            a:layout_height="wrap_content"
+            a:gravity="center_vertical"
+            a:minHeight="40dip"
+            a:paddingStart="6dip"
+            a:paddingEnd="6dip"
+            a:text="@string/main.albums_title"
+            a:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <TextView
-        a:id="@+id/main_songs"
-        a:layout_width="fill_parent"
-        a:layout_height="wrap_content"
-        a:gravity="center_vertical"
-        a:paddingStart="6dp"
-        a:text="@string/main.songs_title"
-        a:textAllCaps="true"
-        a:textAppearance="?android:attr/textAppearanceSmall"
-        a:textColor="@color/cyan"
-        a:textStyle="bold" />
+        <TextView
+            a:id="@+id/main_genres_button"
+            a:layout_width="fill_parent"
+            a:layout_height="wrap_content"
+            a:gravity="center_vertical"
+            a:minHeight="40dip"
+            a:paddingStart="6dip"
+            a:paddingEnd="6dip"
+            a:text="@string/main.genres_title"
+            a:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <TextView
-        a:id="@+id/main_songs_button"
-        a:layout_width="fill_parent"
-        a:layout_height="wrap_content"
-        a:gravity="center_vertical"
-        a:minHeight="40dip"
-        a:paddingStart="6dip"
-        a:paddingEnd="6dip"
-        a:text="@string/main.songs_random"
-        a:textAppearance="?android:attr/textAppearanceMedium" />
+        <TextView
+            a:id="@+id/main_songs"
+            a:layout_width="fill_parent"
+            a:layout_height="wrap_content"
+            a:gravity="center_vertical"
+            a:paddingStart="6dp"
+            a:text="@string/main.songs_title"
+            a:textAllCaps="true"
+            a:textAppearance="?android:attr/textAppearanceSmall"
+            a:textColor="@color/cyan"
+            a:textStyle="bold" />
 
-    <TextView
-        a:id="@+id/main_songs_starred"
-        a:layout_width="fill_parent"
-        a:layout_height="wrap_content"
-        a:gravity="center_vertical"
-        a:minHeight="40dip"
-        a:paddingStart="6dip"
-        a:paddingEnd="6dip"
-        a:text="@string/main.songs_starred"
-        a:textAppearance="?android:attr/textAppearanceMedium" />
+        <TextView
+            a:id="@+id/main_songs_button"
+            a:layout_width="fill_parent"
+            a:layout_height="wrap_content"
+            a:gravity="center_vertical"
+            a:minHeight="40dip"
+            a:paddingStart="6dip"
+            a:paddingEnd="6dip"
+            a:text="@string/main.songs_random"
+            a:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <TextView
-        a:id="@+id/main_albums"
-        a:layout_width="fill_parent"
-        a:layout_height="wrap_content"
-        a:gravity="center_vertical"
-        a:paddingStart="6dp"
-        a:text="@string/main.albums_title"
-        a:textAllCaps="true"
-        a:textAppearance="?android:attr/textAppearanceSmall"
-        a:textColor="@color/cyan"
-        a:textStyle="bold" />
+        <TextView
+            a:id="@+id/main_songs_starred"
+            a:layout_width="fill_parent"
+            a:layout_height="wrap_content"
+            a:gravity="center_vertical"
+            a:minHeight="40dip"
+            a:paddingStart="6dip"
+            a:paddingEnd="6dip"
+            a:text="@string/main.songs_starred"
+            a:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <TextView
-        a:id="@+id/main_albums_newest"
-        a:layout_width="fill_parent"
-        a:layout_height="wrap_content"
-        a:gravity="center_vertical"
-        a:minHeight="40dip"
-        a:paddingStart="6dip"
-        a:paddingEnd="6dip"
-        a:text="@string/main.albums_newest"
-        a:textAppearance="?android:attr/textAppearanceMedium" />
+        <TextView
+            a:id="@+id/main_albums"
+            a:layout_width="fill_parent"
+            a:layout_height="wrap_content"
+            a:gravity="center_vertical"
+            a:paddingStart="6dp"
+            a:text="@string/main.albums_title"
+            a:textAllCaps="true"
+            a:textAppearance="?android:attr/textAppearanceSmall"
+            a:textColor="@color/cyan"
+            a:textStyle="bold" />
 
-    <TextView
-        a:id="@+id/main_albums_recent"
-        a:layout_width="fill_parent"
-        a:layout_height="wrap_content"
-        a:gravity="center_vertical"
-        a:minHeight="40dip"
-        a:paddingStart="6dip"
-        a:paddingEnd="6dip"
-        a:text="@string/main.albums_recent"
-        a:textAppearance="?android:attr/textAppearanceMedium" />
+        <TextView
+            a:id="@+id/main_albums_newest"
+            a:layout_width="fill_parent"
+            a:layout_height="wrap_content"
+            a:gravity="center_vertical"
+            a:minHeight="40dip"
+            a:paddingStart="6dip"
+            a:paddingEnd="6dip"
+            a:text="@string/main.albums_newest"
+            a:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <TextView
-        a:id="@+id/main_albums_frequent"
-        a:layout_width="fill_parent"
-        a:layout_height="wrap_content"
-        a:gravity="center_vertical"
-        a:minHeight="40dip"
-        a:paddingStart="6dip"
-        a:paddingEnd="6dip"
-        a:text="@string/main.albums_frequent"
-        a:textAppearance="?android:attr/textAppearanceMedium" />
+        <TextView
+            a:id="@+id/main_albums_recent"
+            a:layout_width="fill_parent"
+            a:layout_height="wrap_content"
+            a:gravity="center_vertical"
+            a:minHeight="40dip"
+            a:paddingStart="6dip"
+            a:paddingEnd="6dip"
+            a:text="@string/main.albums_recent"
+            a:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <TextView
-        a:id="@+id/main_albums_highest"
-        a:layout_width="fill_parent"
-        a:layout_height="wrap_content"
-        a:gravity="center_vertical"
-        a:minHeight="40dip"
-        a:paddingStart="6dip"
-        a:paddingEnd="6dip"
-        a:text="@string/main.albums_highest"
-        a:textAppearance="?android:attr/textAppearanceMedium" />
+        <TextView
+            a:id="@+id/main_albums_frequent"
+            a:layout_width="fill_parent"
+            a:layout_height="wrap_content"
+            a:gravity="center_vertical"
+            a:minHeight="40dip"
+            a:paddingStart="6dip"
+            a:paddingEnd="6dip"
+            a:text="@string/main.albums_frequent"
+            a:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <TextView
-        a:id="@+id/main_albums_random"
-        a:layout_width="fill_parent"
-        a:layout_height="wrap_content"
-        a:gravity="center_vertical"
-        a:minHeight="40dip"
-        a:paddingStart="6dip"
-        a:paddingEnd="6dip"
-        a:text="@string/main.albums_random"
-        a:textAppearance="?android:attr/textAppearanceMedium" />
+        <TextView
+            a:id="@+id/main_albums_highest"
+            a:layout_width="fill_parent"
+            a:layout_height="wrap_content"
+            a:gravity="center_vertical"
+            a:minHeight="40dip"
+            a:paddingStart="6dip"
+            a:paddingEnd="6dip"
+            a:text="@string/main.albums_highest"
+            a:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <TextView
-        a:id="@+id/main_albums_starred"
-        a:layout_width="fill_parent"
-        a:layout_height="wrap_content"
-        a:gravity="center_vertical"
-        a:minHeight="40dip"
-        a:paddingStart="6dip"
-        a:paddingEnd="6dip"
-        a:text="@string/main.albums_starred"
-        a:textAppearance="?android:attr/textAppearanceMedium" />
+        <TextView
+            a:id="@+id/main_albums_random"
+            a:layout_width="fill_parent"
+            a:layout_height="wrap_content"
+            a:gravity="center_vertical"
+            a:minHeight="40dip"
+            a:paddingStart="6dip"
+            a:paddingEnd="6dip"
+            a:text="@string/main.albums_random"
+            a:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <TextView
-        a:id="@+id/main_albums_alphaByName"
-        a:layout_width="fill_parent"
-        a:layout_height="wrap_content"
-        a:gravity="center_vertical"
-        a:minHeight="40dip"
-        a:paddingStart="6dip"
-        a:paddingEnd="6dip"
-        a:text="@string/main.albums_alphaByName"
-        a:textAppearance="?android:attr/textAppearanceMedium" />
+        <TextView
+            a:id="@+id/main_albums_starred"
+            a:layout_width="fill_parent"
+            a:layout_height="wrap_content"
+            a:gravity="center_vertical"
+            a:minHeight="40dip"
+            a:paddingStart="6dip"
+            a:paddingEnd="6dip"
+            a:text="@string/main.albums_starred"
+            a:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <TextView
-        a:id="@+id/main_albums_alphaByArtist"
-        a:layout_width="fill_parent"
-        a:layout_height="wrap_content"
-        a:gravity="center_vertical"
-        a:minHeight="40dip"
-        a:paddingStart="6dip"
-        a:paddingEnd="6dip"
-        a:text="@string/main.albums_alphaByArtist"
-        a:textAppearance="?android:attr/textAppearanceMedium" />
+        <TextView
+            a:id="@+id/main_albums_alphaByName"
+            a:layout_width="fill_parent"
+            a:layout_height="wrap_content"
+            a:gravity="center_vertical"
+            a:minHeight="40dip"
+            a:paddingStart="6dip"
+            a:paddingEnd="6dip"
+            a:text="@string/main.albums_alphaByName"
+            a:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <TextView
-        a:id="@+id/main_videos_title"
-        a:layout_width="fill_parent"
-        a:layout_height="wrap_content"
-        a:gravity="center_vertical"
-        a:paddingStart="6dp"
-        a:text="@string/main.videos"
-        a:textAllCaps="true"
-        a:textAppearance="?android:attr/textAppearanceSmall"
-        a:textColor="@color/cyan"
-        a:textStyle="bold" />
+        <TextView
+            a:id="@+id/main_albums_alphaByArtist"
+            a:layout_width="fill_parent"
+            a:layout_height="wrap_content"
+            a:gravity="center_vertical"
+            a:minHeight="40dip"
+            a:paddingStart="6dip"
+            a:paddingEnd="6dip"
+            a:text="@string/main.albums_alphaByArtist"
+            a:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <TextView
-        a:id="@+id/main_videos"
-        a:layout_width="fill_parent"
-        a:layout_height="wrap_content"
-        a:gravity="center_vertical"
-        a:minHeight="40dip"
-        a:paddingStart="6dip"
-        a:paddingEnd="6dip"
-        a:text="@string/main.videos"
-        a:textAppearance="?android:attr/textAppearanceMedium" />
+        <TextView
+            a:id="@+id/main_videos_title"
+            a:layout_width="fill_parent"
+            a:layout_height="wrap_content"
+            a:gravity="center_vertical"
+            a:paddingStart="6dp"
+            a:text="@string/main.videos"
+            a:textAllCaps="true"
+            a:textAppearance="?android:attr/textAppearanceSmall"
+            a:textColor="@color/cyan"
+            a:textStyle="bold" />
 
-</LinearLayout>
+        <TextView
+            a:id="@+id/main_videos"
+            a:layout_width="fill_parent"
+            a:layout_height="wrap_content"
+            a:gravity="center_vertical"
+            a:minHeight="40dip"
+            a:paddingStart="6dip"
+            a:paddingEnd="6dip"
+            a:text="@string/main.videos"
+            a:textAppearance="?android:attr/textAppearanceMedium" />
 
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file