From c3bf711c7da29871bfefa173465bff402cb6df16 Mon Sep 17 00:00:00 2001
From: Omar <omar.saidmady@gmail.com>
Date: Tue, 8 Mar 2022 20:44:12 +0200
Subject: [PATCH] Removed hiding history when history is disabled

---
 .../fragments/other/DetailListFragment.kt     | 25 +++----------------
 .../res/layout/fragment_playlist_detail.xml   | 11 +-------
 app/src/main/res/values/strings.xml           |  2 --
 3 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt
index 0f5b70ae7..2714954b4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt
@@ -164,24 +164,12 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de
             adapter = songAdapter
             layoutManager = linearLayoutManager()
         }
-        if (!PreferenceUtil.pauseHistory) { // Observe only if keep history is not paused
-            libraryViewModel.observableHistorySongs().observe(viewLifecycleOwner) {
-                songAdapter.swapDataSet(it)
-                binding.empty.isVisible = it.isEmpty()
-            }
-        }
-        else {
-            historyDisabled() // Update Ui
-            binding.emptyButton.setOnClickListener {
-                findNavController().navigate(
-                    R.id.settingsActivity,
-                    null,
-                    navOptions
-                )
-                findNavController().popBackStack()
 
-            }
+        libraryViewModel.observableHistorySongs().observe(viewLifecycleOwner) {
+            songAdapter.swapDataSet(it)
+            binding.empty.isVisible = it.isEmpty()
         }
+
     }
 
     private fun loadFavorite() {
@@ -253,11 +241,6 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de
         return if (RetroUtil.isLandscape()) 4 else 2
     }
 
-    private fun historyDisabled() {
-        binding.empty.isVisible = true
-        binding.emptyText.text = getString(R.string.history_paused)
-        binding.emptyButton.isVisible = true
-    }
 
     override fun onArtist(artistId: Long, view: View) {
         findNavController().navigate(
diff --git a/app/src/main/res/layout/fragment_playlist_detail.xml b/app/src/main/res/layout/fragment_playlist_detail.xml
index 1db0f7c8e..e5af7fdbb 100644
--- a/app/src/main/res/layout/fragment_playlist_detail.xml
+++ b/app/src/main/res/layout/fragment_playlist_detail.xml
@@ -62,21 +62,12 @@
             android:id="@+id/emptyText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
             android:layout_gravity="center"
             android:text="@string/no_songs"
             android:textAppearance="@style/TextViewHeadline5"
             android:textColor="?android:attr/textColorSecondary"
             tools:visibility="visible" />
 
-        <Button
-            android:id="@+id/emptyButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/settings_button"
-            android:background="@drawable/widget_button_background"
-            android:visibility="invisible"/>
     </LinearLayout>
 
     <com.google.android.material.progressindicator.CircularProgressIndicator
@@ -86,4 +77,4 @@
         android:layout_gravity="center"
         android:gravity="center"
         android:indeterminate="true" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6fd8476f1..a3c75861d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -262,8 +262,6 @@
     <string name="no_purchase_found">No purchase found.</string>
     <string name="no_results">No results</string>
     <string name="no_songs">You have no songs</string>
-    <string name="history_paused">You have paused history.</string>
-    <string name="settings_button">Settings</string>
     <string name="normal">Normal</string>
     <string name="normal_lyrics">Normal lyrics</string>
     <string name="not_listed_in_media_store">