Funkwhale
/
ultrasonic-app-subsonic-android
mirror of https://github.com/ultrasonic/ultrasonic
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix Scroll in MainFragment

This commit is contained in:
tzugen 2021-12-22 13:26:58 +01:00
parent 8d5675f461
commit 4a996f8edc
No known key found for this signature in database
GPG Key ID: 61E9C34BC10EC930
4 changed files with 198 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gradle_scripts/android-module-bootstrap.gradle
View File

@ -40,6 +40,7 @@ android {
buildFeatures { buildFeatures {
buildConfig = false buildConfig = false
viewBinding true
} }
} }

5
ultrasonic/build.gradle
View File

@ -58,6 +58,11 @@ android {
kotlinOptions { kotlinOptions {
jvmTarget = "1.8" jvmTarget = "1.8"
} }
buildFeatures {
viewBinding true
}
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8

4
ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/MainFragment.kt
View File

@ -4,7 +4,7 @@ import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.LinearLayout import android.widget.ScrollView
import android.widget.TextView import android.widget.TextView
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
@ -21,7 +21,7 @@ import org.moire.ultrasonic.util.Util
*/ */
class MainFragment : Fragment(), KoinComponent { class MainFragment : Fragment(), KoinComponent {
private lateinit var list: LinearLayout private lateinit var list: ScrollView
private lateinit var musicTitle: TextView private lateinit var musicTitle: TextView
private lateinit var artistsButton: TextView private lateinit var artistsButton: TextView
private lateinit var albumsButton: TextView private lateinit var albumsButton: TextView

376
ultrasonic/src/main/res/layout/main.xml
View File

@ -1,211 +1,215 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <ScrollView xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_list"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="fill_parent" a:layout_height="fill_parent"
a:orientation="vertical"> a:id="@+id/main_list">
<TextView <LinearLayout
a:id="@+id/main_music"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:gravity="center_vertical" a:orientation="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 <TextView
a:id="@+id/main_artists_button" a:id="@+id/main_music"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:gravity="center_vertical" a:gravity="center_vertical"
a:minHeight="40dip" a:paddingStart="6dp"
a:paddingStart="6dip" a:text="@string/main.music"
a:paddingEnd="6dip" a:textAllCaps="true"
a:text="@string/main.artists_title" a:textAppearance="?android:attr/textAppearanceSmall"
a:textAppearance="?android:attr/textAppearanceMedium" /> a:textColor="@color/cyan"
a:textStyle="bold" />
<TextView <TextView
a:id="@+id/main_albums_button" a:id="@+id/main_artists_button"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:gravity="center_vertical" a:gravity="center_vertical"
a:minHeight="40dip" a:minHeight="40dip"
a:paddingStart="6dip" a:paddingStart="6dip"
a:paddingEnd="6dip" a:paddingEnd="6dip"
a:text="@string/main.albums_title" a:text="@string/main.artists_title"
a:textAppearance="?android:attr/textAppearanceMedium" /> a:textAppearance="?android:attr/textAppearanceMedium" />
<TextView <TextView
a:id="@+id/main_genres_button" a:id="@+id/main_albums_button"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:gravity="center_vertical" a:gravity="center_vertical"
a:minHeight="40dip" a:minHeight="40dip"
a:paddingStart="6dip" a:paddingStart="6dip"
a:paddingEnd="6dip" a:paddingEnd="6dip"
a:text="@string/main.genres_title" a:text="@string/main.albums_title"
a:textAppearance="?android:attr/textAppearanceMedium" /> a:textAppearance="?android:attr/textAppearanceMedium" />
<TextView <TextView
a:id="@+id/main_songs" a:id="@+id/main_genres_button"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:gravity="center_vertical" a:gravity="center_vertical"
a:paddingStart="6dp" a:minHeight="40dip"
a:text="@string/main.songs_title" a:paddingStart="6dip"
a:textAllCaps="true" a:paddingEnd="6dip"
a:textAppearance="?android:attr/textAppearanceSmall" a:text="@string/main.genres_title"
a:textColor="@color/cyan" a:textAppearance="?android:attr/textAppearanceMedium" />
a:textStyle="bold" />
<TextView <TextView
a:id="@+id/main_songs_button" a:id="@+id/main_songs"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:gravity="center_vertical" a:gravity="center_vertical"
a:minHeight="40dip" a:paddingStart="6dp"
a:paddingStart="6dip" a:text="@string/main.songs_title"
a:paddingEnd="6dip" a:textAllCaps="true"
a:text="@string/main.songs_random" a:textAppearance="?android:attr/textAppearanceSmall"
a:textAppearance="?android:attr/textAppearanceMedium" /> a:textColor="@color/cyan"
a:textStyle="bold" />
<TextView <TextView
a:id="@+id/main_songs_starred" a:id="@+id/main_songs_button"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:gravity="center_vertical" a:gravity="center_vertical"
a:minHeight="40dip" a:minHeight="40dip"
a:paddingStart="6dip" a:paddingStart="6dip"
a:paddingEnd="6dip" a:paddingEnd="6dip"
a:text="@string/main.songs_starred" a:text="@string/main.songs_random"
a:textAppearance="?android:attr/textAppearanceMedium" /> a:textAppearance="?android:attr/textAppearanceMedium" />
<TextView <TextView
a:id="@+id/main_albums" a:id="@+id/main_songs_starred"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:gravity="center_vertical" a:gravity="center_vertical"
a:paddingStart="6dp" a:minHeight="40dip"
a:text="@string/main.albums_title" a:paddingStart="6dip"
a:textAllCaps="true" a:paddingEnd="6dip"
a:textAppearance="?android:attr/textAppearanceSmall" a:text="@string/main.songs_starred"
a:textColor="@color/cyan" a:textAppearance="?android:attr/textAppearanceMedium" />
a:textStyle="bold" />
<TextView <TextView
a:id="@+id/main_albums_newest" a:id="@+id/main_albums"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:gravity="center_vertical" a:gravity="center_vertical"
a:minHeight="40dip" a:paddingStart="6dp"
a:paddingStart="6dip" a:text="@string/main.albums_title"
a:paddingEnd="6dip" a:textAllCaps="true"
a:text="@string/main.albums_newest" a:textAppearance="?android:attr/textAppearanceSmall"
a:textAppearance="?android:attr/textAppearanceMedium" /> a:textColor="@color/cyan"
a:textStyle="bold" />
<TextView <TextView
a:id="@+id/main_albums_recent" a:id="@+id/main_albums_newest"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:gravity="center_vertical" a:gravity="center_vertical"
a:minHeight="40dip" a:minHeight="40dip"
a:paddingStart="6dip" a:paddingStart="6dip"
a:paddingEnd="6dip" a:paddingEnd="6dip"
a:text="@string/main.albums_recent" a:text="@string/main.albums_newest"
a:textAppearance="?android:attr/textAppearanceMedium" /> a:textAppearance="?android:attr/textAppearanceMedium" />
<TextView <TextView
a:id="@+id/main_albums_frequent" a:id="@+id/main_albums_recent"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:gravity="center_vertical" a:gravity="center_vertical"
a:minHeight="40dip" a:minHeight="40dip"
a:paddingStart="6dip" a:paddingStart="6dip"
a:paddingEnd="6dip" a:paddingEnd="6dip"
a:text="@string/main.albums_frequent" a:text="@string/main.albums_recent"
a:textAppearance="?android:attr/textAppearanceMedium" /> a:textAppearance="?android:attr/textAppearanceMedium" />
<TextView <TextView
a:id="@+id/main_albums_highest" a:id="@+id/main_albums_frequent"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:gravity="center_vertical" a:gravity="center_vertical"
a:minHeight="40dip" a:minHeight="40dip"
a:paddingStart="6dip" a:paddingStart="6dip"
a:paddingEnd="6dip" a:paddingEnd="6dip"
a:text="@string/main.albums_highest" a:text="@string/main.albums_frequent"
a:textAppearance="?android:attr/textAppearanceMedium" /> a:textAppearance="?android:attr/textAppearanceMedium" />
<TextView <TextView
a:id="@+id/main_albums_random" a:id="@+id/main_albums_highest"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:gravity="center_vertical" a:gravity="center_vertical"
a:minHeight="40dip" a:minHeight="40dip"
a:paddingStart="6dip" a:paddingStart="6dip"
a:paddingEnd="6dip" a:paddingEnd="6dip"
a:text="@string/main.albums_random" a:text="@string/main.albums_highest"
a:textAppearance="?android:attr/textAppearanceMedium" /> a:textAppearance="?android:attr/textAppearanceMedium" />
<TextView <TextView
a:id="@+id/main_albums_starred" a:id="@+id/main_albums_random"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:gravity="center_vertical" a:gravity="center_vertical"
a:minHeight="40dip" a:minHeight="40dip"
a:paddingStart="6dip" a:paddingStart="6dip"
a:paddingEnd="6dip" a:paddingEnd="6dip"
a:text="@string/main.albums_starred" a:text="@string/main.albums_random"
a:textAppearance="?android:attr/textAppearanceMedium" /> a:textAppearance="?android:attr/textAppearanceMedium" />
<TextView <TextView
a:id="@+id/main_albums_alphaByName" a:id="@+id/main_albums_starred"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:gravity="center_vertical" a:gravity="center_vertical"
a:minHeight="40dip" a:minHeight="40dip"
a:paddingStart="6dip" a:paddingStart="6dip"
a:paddingEnd="6dip" a:paddingEnd="6dip"
a:text="@string/main.albums_alphaByName" a:text="@string/main.albums_starred"
a:textAppearance="?android:attr/textAppearanceMedium" /> a:textAppearance="?android:attr/textAppearanceMedium" />
<TextView <TextView
a:id="@+id/main_albums_alphaByArtist" a:id="@+id/main_albums_alphaByName"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:gravity="center_vertical" a:gravity="center_vertical"
a:minHeight="40dip" a:minHeight="40dip"
a:paddingStart="6dip" a:paddingStart="6dip"
a:paddingEnd="6dip" a:paddingEnd="6dip"
a:text="@string/main.albums_alphaByArtist" a:text="@string/main.albums_alphaByName"
a:textAppearance="?android:attr/textAppearanceMedium" /> a:textAppearance="?android:attr/textAppearanceMedium" />
<TextView <TextView
a:id="@+id/main_videos_title" a:id="@+id/main_albums_alphaByArtist"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:gravity="center_vertical" a:gravity="center_vertical"
a:paddingStart="6dp" a:minHeight="40dip"
a:text="@string/main.videos" a:paddingStart="6dip"
a:textAllCaps="true" a:paddingEnd="6dip"
a:textAppearance="?android:attr/textAppearanceSmall" a:text="@string/main.albums_alphaByArtist"
a:textColor="@color/cyan" a:textAppearance="?android:attr/textAppearanceMedium" />
a:textStyle="bold" />
<TextView <TextView
a:id="@+id/main_videos" a:id="@+id/main_videos_title"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:gravity="center_vertical" a:gravity="center_vertical"
a:minHeight="40dip" a:paddingStart="6dp"
a:paddingStart="6dip" a:text="@string/main.videos"
a:paddingEnd="6dip" a:textAllCaps="true"
a:text="@string/main.videos" a:textAppearance="?android:attr/textAppearanceSmall"
a:textAppearance="?android:attr/textAppearanceMedium" /> 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>