From ebe90262cbbd93fd8857e838c2596fb6db1800f9 Mon Sep 17 00:00:00 2001
From: Omar <omar.saidmady@gmail.com>
Date: Tue, 8 Mar 2022 18:05:06 +0200
Subject: [PATCH] Renamed keep history to pause history

---
 .../main/java/code/name/monkey/retromusic/Constants.kt    | 2 +-
 .../retromusic/activities/base/AbsMusicServiceActivity.kt | 4 ++--
 .../retromusic/fragments/other/DetailListFragment.kt      | 4 ++--
 .../code/name/monkey/retromusic/util/PreferenceUtil.kt    | 6 +++---
 app/src/main/res/values/strings.xml                       | 6 +++---
 app/src/main/res/xml/pref_ui.xml                          | 8 ++++----
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/Constants.kt b/app/src/main/java/code/name/monkey/retromusic/Constants.kt
index a7a84ba34..93012f84e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/Constants.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/Constants.kt
@@ -164,4 +164,4 @@ const val WALLPAPER_ACCENT = "wallpaper_accent"
 const val SCREEN_ON_LYRICS = "screen_on_lyrics"
 const val CIRCLE_PLAY_BUTTON = "circle_play_button"
 const val SWIPE_ANYWHERE_NOW_PLAYING = "swipe_anywhere_now_playing"
-const val KEEP_HISTORY = "keep_history"
\ No newline at end of file
+const val PAUSE_HISTORY = "pause_history"
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt
index 3dc4c16b1..1e05c367f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt
@@ -124,8 +124,8 @@ abstract class AbsMusicServiceActivity : AbsBaseActivity(), IMusicServiceEventLi
             if (entity != null) {
                 repository.updateHistorySong(MusicPlayerRemote.currentSong)
             } else {
-                // Check whether keep history option is ON or OFF
-                if (PreferenceUtil.homeHistory) {
+                // Check whether pause history option is ON or OFF
+                if (!PreferenceUtil.pauseHistory) {
                     repository.addSongToHistory(MusicPlayerRemote.currentSong)
                 }
             }
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 0449f4e3b..0f5b70ae7 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,7 +164,7 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de
             adapter = songAdapter
             layoutManager = linearLayoutManager()
         }
-        if (PreferenceUtil.homeHistory) { // Observe only if keep history is enabled
+        if (!PreferenceUtil.pauseHistory) { // Observe only if keep history is not paused
             libraryViewModel.observableHistorySongs().observe(viewLifecycleOwner) {
                 songAdapter.swapDataSet(it)
                 binding.empty.isVisible = it.isEmpty()
@@ -255,7 +255,7 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de
 
     private fun historyDisabled() {
         binding.empty.isVisible = true
-        binding.emptyText.text = getString(R.string.history_disabled)
+        binding.emptyText.text = getString(R.string.history_paused)
         binding.emptyButton.isVisible = true
     }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt
index 0065bf9bc..cb46ec2da 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt
@@ -637,10 +637,10 @@ object PreferenceUtil {
             true
         )
 
-    val homeHistory: Boolean
+    val pauseHistory: Boolean
         get() = sharedPreferences.getBoolean(
-            KEEP_HISTORY,
-            true
+            PAUSE_HISTORY,
+            false
         )
 
     var audioFadeDuration
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 18994a999..6fd8476f1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -262,7 +262,7 @@
     <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_disabled">You have disabled history.</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>
@@ -358,7 +358,7 @@
     <string name="pref_summary_toggle_volume">If enough space is available, show volume controls in the now playing screen</string>
     <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
     <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
-    <string name="pref_summary_keep_history">Keeps a history of played songs</string>
+    <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
     <string name="pref_title_album_art_on_lockscreen">Show album cover</string>
     <string name="pref_title_album_artists_only">Navigate by Album Artist</string>
     <string name="pref_title_album_cover_style">Album cover theme</string>
@@ -405,7 +405,7 @@
     <string name="pref_title_toggle_volume">Volume controls</string>
     <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
     <string name="pref_title_whitelist">Whitelist music</string>
-    <string name="pref_title_keep_history">Keep history</string>
+    <string name="pref_title_pause_history">Pause history</string>
     <string name="pro">Pro</string>
     <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
     <string name="profile">Profile</string>
diff --git a/app/src/main/res/xml/pref_ui.xml b/app/src/main/res/xml/pref_ui.xml
index b638f6c99..9fea05eae 100644
--- a/app/src/main/res/xml/pref_ui.xml
+++ b/app/src/main/res/xml/pref_ui.xml
@@ -41,11 +41,11 @@
             android:title="@string/pref_title_suggestions" />
 
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-            android:defaultValue="true"
-            android:key="keep_history"
+            android:defaultValue="false"
+            android:key="pause_history"
             android:layout="@layout/list_item_view_switch"
-            android:summary="@string/pref_summary_keep_history"
-            android:title="@string/pref_title_keep_history" />
+            android:summary="@string/pref_summary_pause_history"
+            android:title="@string/pref_title_pause_history" />
 
     </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>