Twelve: Artist fragment layout UI
Change-Id: Idf21678afc3108b7774238f36e8d12439054f8af
diff --git a/app/src/main/java/org/lineageos/twelve/fragments/ArtistFragment.kt b/app/src/main/java/org/lineageos/twelve/fragments/ArtistFragment.kt
index 5c3d0ca..22c48d0 100644
--- a/app/src/main/java/org/lineageos/twelve/fragments/ArtistFragment.kt
+++ b/app/src/main/java/org/lineageos/twelve/fragments/ArtistFragment.kt
@@ -11,11 +11,11 @@
import android.view.View
import android.widget.ImageView
import android.widget.LinearLayout
+import android.widget.TextView
import androidx.core.os.bundleOf
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.isVisible
-import androidx.core.view.updatePadding
import androidx.core.widget.NestedScrollView
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
@@ -34,6 +34,7 @@
import org.lineageos.twelve.ext.getParcelable
import org.lineageos.twelve.ext.getViewProperty
import org.lineageos.twelve.ext.setProgressCompat
+import org.lineageos.twelve.ext.updatePadding
import org.lineageos.twelve.models.Album
import org.lineageos.twelve.models.Playlist
import org.lineageos.twelve.models.RequestStatus
@@ -58,6 +59,8 @@
private val appearsInAlbumRecyclerView by getViewProperty<RecyclerView>(R.id.appearsInAlbumRecyclerView)
private val appearsInPlaylistLinearLayout by getViewProperty<LinearLayout>(R.id.appearsInPlaylistLinearLayout)
private val appearsInPlaylistRecyclerView by getViewProperty<RecyclerView>(R.id.appearsInPlaylistRecyclerView)
+ private val artistNameTextView by getViewProperty<TextView>(R.id.artistNameTextView)
+ private val infoNestedScrollView by getViewProperty<NestedScrollView?>(R.id.infoNestedScrollView)
private val linearProgressIndicator by getViewProperty<LinearProgressIndicator>(R.id.linearProgressIndicator)
private val nestedScrollView by getViewProperty<NestedScrollView>(R.id.nestedScrollView)
private val noElementsNestedScrollView by getViewProperty<NestedScrollView>(R.id.noElementsNestedScrollView)
@@ -126,13 +129,37 @@
super.onViewCreated(view, savedInstanceState)
// Insets
+ ViewCompat.setOnApplyWindowInsetsListener(toolbar) { v, windowInsets ->
+ val insets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())
+
+ v.updatePadding(
+ insets,
+ start = true,
+ end = true,
+ )
+
+ windowInsets
+ }
+
+ infoNestedScrollView?.let {
+ ViewCompat.setOnApplyWindowInsetsListener(it) { v, windowInsets ->
+ val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+
+ v.updatePadding(
+ insets,
+ bottom = true,
+ )
+
+ windowInsets
+ }
+ }
+
ViewCompat.setOnApplyWindowInsetsListener(nestedScrollView) { v, windowInsets ->
val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
v.updatePadding(
- left = insets.left,
- right = insets.right,
- bottom = insets.bottom,
+ insets,
+ bottom = true,
)
windowInsets
@@ -142,9 +169,8 @@
val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
v.updatePadding(
- left = insets.left,
- right = insets.right,
- bottom = insets.bottom,
+ insets,
+ bottom = true,
)
windowInsets
@@ -188,6 +214,7 @@
val (artist, artistWorks) = it.data
toolbar.title = artist.name
+ artistNameTextView.text = artist.name
artist.thumbnail?.uri?.also { uri ->
thumbnailImageView.load(uri)
diff --git a/app/src/main/res/layout-land/fragment_artist.xml b/app/src/main/res/layout-land/fragment_artist.xml
new file mode 100644
index 0000000..4ee243e
--- /dev/null
+++ b/app/src/main/res/layout-land/fragment_artist.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ SPDX-FileCopyrightText: 2024 The LineageOS Project
+ SPDX-License-Identifier: Apache-2.0
+-->
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:fitsSystemWindows="true">
+
+ <com.google.android.material.appbar.AppBarLayout
+ android:id="@+id/appBarLayout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:fitsSystemWindows="true"
+ app:liftOnScrollTargetViewId="@+id/nestedScrollView">
+
+ <com.google.android.material.appbar.MaterialToolbar
+ android:id="@+id/toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ tools:title="Ryuichi Sakamoto" />
+
+ </com.google.android.material.appbar.AppBarLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:baselineAligned="false"
+ android:orientation="horizontal"
+ app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+ <androidx.core.widget.NestedScrollView
+ android:id="@+id/infoNestedScrollView"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:clipToPadding="false"
+ android:fillViewport="true">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:paddingHorizontal="32dp"
+ android:paddingVertical="8dp">
+
+ <com.google.android.material.card.MaterialCardView
+ style="@style/Widget.Material3.CardView.Elevated"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginVertical="16dp"
+ app:cardCornerRadius="16dp">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <ImageView
+ android:id="@+id/thumbnailImageView"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ app:layout_constraintDimensionRatio="H,1:1"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ </com.google.android.material.card.MaterialCardView>
+
+ <include
+ layout="@layout/artist_labels"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+ </LinearLayout>
+
+ </androidx.core.widget.NestedScrollView>
+
+ <include
+ layout="@layout/artist_content"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="2" />
+
+ </LinearLayout>
+
+ <com.google.android.material.progressindicator.LinearProgressIndicator
+ android:id="@+id/linearProgressIndicator"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:indeterminate="true"
+ app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/artist_content.xml b/app/src/main/res/layout/artist_content.xml
new file mode 100644
index 0000000..9364a8a
--- /dev/null
+++ b/app/src/main/res/layout/artist_content.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ SPDX-FileCopyrightText: 2024 The LineageOS Project
+ SPDX-License-Identifier: Apache-2.0
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <androidx.core.widget.NestedScrollView
+ android:id="@+id/nestedScrollView"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:clipToPadding="false">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:id="@+id/albumsLinearLayout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="24dp"
+ android:orientation="vertical"
+ android:paddingTop="16dp"
+ android:visibility="gone"
+ tools:visibility="visible">
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="18dp"
+ android:paddingHorizontal="16dp"
+ android:text="@string/artist_albums_header"
+ android:textAppearance="?attr/textAppearanceTitleLarge" />
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/albumsRecyclerView"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+ app:spanCount="1" />
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/appearsInAlbumLinearLayout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="24dp"
+ android:orientation="vertical"
+ android:paddingTop="16dp"
+ android:visibility="gone"
+ tools:visibility="visible">
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="18dp"
+ android:paddingHorizontal="16dp"
+ android:text="@string/artist_appears_in_album_header"
+ android:textAppearance="?attr/textAppearanceTitleLarge" />
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/appearsInAlbumRecyclerView"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+ app:spanCount="1" />
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/appearsInPlaylistLinearLayout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="24dp"
+ android:orientation="vertical"
+ android:paddingTop="16dp"
+ android:visibility="gone"
+ tools:visibility="visible">
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="18dp"
+ android:paddingHorizontal="16dp"
+ android:text="@string/artist_appears_in_playlist_header"
+ android:textAppearance="?attr/textAppearanceTitleLarge" />
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/appearsInPlaylistRecyclerView"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+ app:spanCount="1" />
+
+ </LinearLayout>
+
+ </LinearLayout>
+
+ </androidx.core.widget.NestedScrollView>
+
+ <androidx.core.widget.NestedScrollView
+ android:id="@+id/noElementsNestedScrollView"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:clipToPadding="false"
+ android:visibility="gone">
+
+ <LinearLayout
+ style="@style/Theme.Twelve.NoElements.LinearLayout"
+ android:layout_gravity="center">
+
+ <ImageView
+ style="@style/Theme.Twelve.NoElements.ImageView"
+ android:contentDescription="@string/no_albums"
+ android:src="@drawable/ic_album" />
+
+ <Space style="@style/Theme.Twelve.NoElements.Space" />
+
+ <TextView
+ style="@style/Theme.Twelve.NoElements.TextView"
+ android:text="@string/no_albums" />
+
+ </LinearLayout>
+
+ </androidx.core.widget.NestedScrollView>
+
+</FrameLayout>
diff --git a/app/src/main/res/layout/artist_labels.xml b/app/src/main/res/layout/artist_labels.xml
new file mode 100644
index 0000000..b96a63b
--- /dev/null
+++ b/app/src/main/res/layout/artist_labels.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ SPDX-FileCopyrightText: 2024 The LineageOS Project
+ SPDX-License-Identifier: Apache-2.0
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/artistNameTextView"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="?attr/textAppearanceHeadlineMedium"
+ tools:text="Ryuichi Sakamoto" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_artist.xml b/app/src/main/res/layout/fragment_artist.xml
index 0f9fd05..4cbc019 100644
--- a/app/src/main/res/layout/fragment_artist.xml
+++ b/app/src/main/res/layout/fragment_artist.xml
@@ -21,8 +21,7 @@
style="?attr/collapsingToolbarLayoutLargeStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:expandedTitleMarginBottom="28dp"
- app:expandedTitleTextAppearance="?attr/textAppearanceHeadlineMedium"
+ app:expandedTitleTextColor="@android:color/transparent"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
app:maxLines="3">
@@ -64,6 +63,14 @@
</androidx.constraintlayout.widget.ConstraintLayout>
+ <include
+ layout="@layout/artist_labels"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:layout_marginBottom="28dp"
+ android:layout_marginHorizontal="16dp" />
+
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
@@ -77,131 +84,11 @@
</com.google.android.material.appbar.AppBarLayout>
- <androidx.core.widget.NestedScrollView
- android:id="@+id/nestedScrollView"
+ <include
+ layout="@layout/artist_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:clipToPadding="false"
- app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
-
- <LinearLayout
- android:id="@+id/albumsLinearLayout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="24dp"
- android:orientation="vertical"
- android:paddingTop="16dp"
- android:visibility="gone"
- tools:visibility="visible">
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="18dp"
- android:paddingHorizontal="16dp"
- android:text="@string/artist_albums_header"
- android:textAppearance="?attr/textAppearanceTitleLarge" />
-
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/albumsRecyclerView"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
- app:spanCount="1" />
-
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/appearsInAlbumLinearLayout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="24dp"
- android:orientation="vertical"
- android:paddingTop="16dp"
- android:visibility="gone"
- tools:visibility="visible">
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="18dp"
- android:paddingHorizontal="16dp"
- android:text="@string/artist_appears_in_album_header"
- android:textAppearance="?attr/textAppearanceTitleLarge" />
-
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/appearsInAlbumRecyclerView"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
- app:spanCount="1" />
-
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/appearsInPlaylistLinearLayout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="24dp"
- android:orientation="vertical"
- android:paddingTop="16dp"
- android:visibility="gone"
- tools:visibility="visible">
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="18dp"
- android:paddingHorizontal="16dp"
- android:text="@string/artist_appears_in_playlist_header"
- android:textAppearance="?attr/textAppearanceTitleLarge" />
-
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/appearsInPlaylistRecyclerView"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
- app:spanCount="1" />
-
- </LinearLayout>
-
- </LinearLayout>
-
- </androidx.core.widget.NestedScrollView>
-
- <androidx.core.widget.NestedScrollView
- android:id="@+id/noElementsNestedScrollView"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:clipToPadding="false"
- app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
- <LinearLayout
- style="@style/Theme.Twelve.NoElements.LinearLayout"
- android:layout_gravity="center">
-
- <ImageView
- style="@style/Theme.Twelve.NoElements.ImageView"
- android:contentDescription="@string/no_albums"
- android:src="@drawable/ic_album" />
-
- <Space style="@style/Theme.Twelve.NoElements.Space" />
-
- <TextView
- style="@style/Theme.Twelve.NoElements.TextView"
- android:text="@string/no_albums" />
-
- </LinearLayout>
-
- </androidx.core.widget.NestedScrollView>
+ app:layout_behavior="@string/appbar_scrolling_view_behavior" />
<com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/linearProgressIndicator"