From 58149077985f461c37d90e9e883e10e227108c1f Mon Sep 17 00:00:00 2001
From: OxygenCobalt <alexyx@tutanota.com>
Date: Thu, 10 Sep 2020 15:53:03 -0600
Subject: [PATCH] Change LibraryFragment to Nav Fragment

Change LibraryFragment to extend NavHostFragment, so that the child fragments arent as extensively nested as they were before.
---
 app/proguard-rules.pro                        |  2 +-
 .../oxycblt/auxio/library/LibraryFragment.kt  | 32 ++------
 .../auxio/{ => loading}/LoadingFragment.kt    |  3 +-
 app/src/main/res/layout/activity_main.xml     |  5 +-
 .../res/layout/fragment_artist_detail.xml     |  3 +-
 app/src/main/res/layout/fragment_library.xml  | 30 -------
 .../main/res/layout/fragment_library_list.xml | 23 ++++--
 app/src/main/res/layout/fragment_loading.xml  |  5 +-
 app/src/main/res/layout/fragment_songs.xml    |  3 +-
 app/src/main/res/layout/song_item.xml         | 81 -------------------
 10 files changed, 37 insertions(+), 150 deletions(-)
 rename app/src/main/java/org/oxycblt/auxio/{ => loading}/LoadingFragment.kt (98%)
 delete mode 100644 app/src/main/res/layout/fragment_library.xml
 delete mode 100644 app/src/main/res/layout/song_item.xml

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index c86a273d7..0544a3bb3 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -21,4 +21,4 @@
 #-renamesourcefileattribute SourceFile
 
 -dontobfuscate
--keep class org.oxycblt.auxio.LoadingFragment
\ No newline at end of file
+-keep class org.oxycblt.auxio.loading.LoadingFragment
\ No newline at end of file
diff --git a/app/src/main/java/org/oxycblt/auxio/library/LibraryFragment.kt b/app/src/main/java/org/oxycblt/auxio/library/LibraryFragment.kt
index c9191a95a..42c797c31 100644
--- a/app/src/main/java/org/oxycblt/auxio/library/LibraryFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/library/LibraryFragment.kt
@@ -2,40 +2,22 @@ package org.oxycblt.auxio.library
 
 import android.os.Bundle
 import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.activity.OnBackPressedCallback
-import androidx.databinding.DataBindingUtil
-import androidx.fragment.app.Fragment
-import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
 import org.oxycblt.auxio.R
-import org.oxycblt.auxio.databinding.FragmentLibraryBinding
 
-class LibraryFragment : Fragment() {
+class LibraryFragment : NavHostFragment() {
 
-    private var navController: NavController? = null
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        val binding = DataBindingUtil.inflate<FragmentLibraryBinding>(
-            inflater, R.layout.fragment_library, container, false
-        )
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
 
         requireActivity().onBackPressedDispatcher.addCallback(
-            viewLifecycleOwner, callback
+            this, callback
         )
 
-        val navHost = childFragmentManager.findFragmentById(R.id.nav_host) as? NavHostFragment
-        navController = navHost?.navController
+        navController.setGraph(R.navigation.nav_library)
 
         Log.d(this::class.simpleName, "Fragment created.")
-
-        return binding.root
     }
 
     override fun onResume() {
@@ -55,7 +37,7 @@ class LibraryFragment : Fragment() {
         override fun handleOnBackPressed() {
 
             // If at the root of the navigation, perform onBackPressed from the main activity.
-            if (navController?.currentDestination?.id == navController?.graph?.startDestination) {
+            if (navController.currentDestination?.id == navController.graph.startDestination) {
                 // Disable the callback as it will get caught in an infinite loop otherwise.
                 isEnabled = false
 
@@ -63,7 +45,7 @@ class LibraryFragment : Fragment() {
 
                 isEnabled = true
             } else {
-                navController?.navigateUp()
+                navController.navigateUp()
             }
         }
     }
diff --git a/app/src/main/java/org/oxycblt/auxio/LoadingFragment.kt b/app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt
similarity index 98%
rename from app/src/main/java/org/oxycblt/auxio/LoadingFragment.kt
rename to app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt
index a9425929c..3a90ef483 100644
--- a/app/src/main/java/org/oxycblt/auxio/LoadingFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt
@@ -1,4 +1,4 @@
-package org.oxycblt.auxio
+package org.oxycblt.auxio.loading
 
 import android.Manifest
 import android.content.pm.PackageManager
@@ -13,6 +13,7 @@ import androidx.core.content.ContextCompat
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.FragmentLoadingBinding
 import org.oxycblt.auxio.music.MusicViewModel
 import org.oxycblt.auxio.music.processing.MusicLoaderResponse
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b7a2822e9..44da82c55 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -12,7 +12,8 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:animateLayoutChanges="true">
 
         <androidx.viewpager2.widget.ViewPager2
             android:id="@+id/view_pager"
@@ -26,7 +27,7 @@
 
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/loading_fragment"
-            android:name="org.oxycblt.auxio.LoadingFragment"
+            android:name="org.oxycblt.auxio.loading.LoadingFragment"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             app:layout_constraintBottom_toTopOf="@+id/tabs"
diff --git a/app/src/main/res/layout/fragment_artist_detail.xml b/app/src/main/res/layout/fragment_artist_detail.xml
index 0d4eb1441..bda5b980c 100644
--- a/app/src/main/res/layout/fragment_artist_detail.xml
+++ b/app/src/main/res/layout/fragment_artist_detail.xml
@@ -11,7 +11,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:animateLayoutChanges="true">
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
deleted file mode 100644
index 0981c4ef1..000000000
--- a/app/src/main/res/layout/fragment_library.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout 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">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/actionBarSize"
-            android:background="?android:attr/windowBackground"
-            android:elevation="@dimen/elevation_normal"
-            app:titleTextAppearance="@style/TextAppearance.Toolbar.Bold"
-            app:title="@string/title_library_fragment"
-            tools:titleTextColor="@color/blue" />
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/nav_host"
-            android:name="androidx.navigation.fragment.NavHostFragment"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            app:defaultNavHost="false"
-            app:navGraph="@navigation/nav_library" />
-    </LinearLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_library_list.xml b/app/src/main/res/layout/fragment_library_list.xml
index 0f897bd67..8c75e7eea 100644
--- a/app/src/main/res/layout/fragment_library_list.xml
+++ b/app/src/main/res/layout/fragment_library_list.xml
@@ -3,16 +3,29 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <FrameLayout
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:animateLayoutChanges="true">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/actionBarSize"
+            android:background="?android:attr/windowBackground"
+            android:elevation="@dimen/elevation_normal"
+            app:titleTextAppearance="@style/TextAppearance.Toolbar.Bold"
+            app:title="@string/title_library_fragment"
+            tools:titleTextColor="@color/blue" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/library_recycler"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            tools:listitem="@layout/item_album" />
+            tools:listitem="@layout/item_artist" />
 
-    </FrameLayout>
+    </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_loading.xml b/app/src/main/res/layout/fragment_loading.xml
index 83c3430d8..584c771ce 100644
--- a/app/src/main/res/layout/fragment_loading.xml
+++ b/app/src/main/res/layout/fragment_loading.xml
@@ -3,8 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <!-- TODO: Add Animation -->
-
     <data>
 
         <variable
@@ -14,7 +12,8 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:animateLayoutChanges="true">
 
         <ProgressBar
             android:id="@+id/loading_bar"
diff --git a/app/src/main/res/layout/fragment_songs.xml b/app/src/main/res/layout/fragment_songs.xml
index ba40eaacb..85d5caa91 100644
--- a/app/src/main/res/layout/fragment_songs.xml
+++ b/app/src/main/res/layout/fragment_songs.xml
@@ -6,7 +6,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:animateLayoutChanges="true">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
diff --git a/app/src/main/res/layout/song_item.xml b/app/src/main/res/layout/song_item.xml
deleted file mode 100644
index c4eb1bdc2..000000000
--- a/app/src/main/res/layout/song_item.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-
-        <variable
-            name="song"
-            type="org.oxycblt.auxio.music.models.Song" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/ripple"
-        android:clickable="true"
-        android:focusable="true"
-        android:padding="@dimen/padding_medium">
-
-        <ImageView
-            android:id="@+id/cover"
-            android:layout_width="@dimen/cover_size_compact"
-            android:layout_height="@dimen/cover_size_compact"
-            app:coverArt="@{song}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:src="@tools:sample/backgrounds/scenic"
-            tools:ignore="ContentDescription" />
-
-        <TextView
-            android:id="@+id/song_name"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/margin_medium"
-            android:layout_marginEnd="@dimen/margin_medium"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:text="@{song.name}"
-            android:textAppearance="?android:attr/textAppearanceListItem"
-            android:textColor="?android:attr/textColorPrimary"
-            app:layout_constraintBottom_toTopOf="@+id/song_info"
-            app:layout_constraintEnd_toStartOf="@+id/duration"
-            app:layout_constraintStart_toEndOf="@+id/cover"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_chainStyle="packed"
-            tools:text="Song Name" />
-
-        <TextView
-            android:id="@+id/song_info"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/margin_medium"
-            android:layout_marginEnd="@dimen/margin_medium"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-            android:textColor="?android:attr/textColorSecondary"
-            android:text="@{@string/format_song_info(song.album.artist.name, song.album.name)}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/duration"
-            app:layout_constraintStart_toEndOf="@+id/cover"
-            app:layout_constraintTop_toBottomOf="@+id/song_name"
-            tools:text="Artist / Album" />
-
-        <TextView
-            android:id="@+id/duration"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@{song.formattedDuration}"
-            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-            android:textColor="?android:attr/textColorTertiary"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="16:16" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file