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 @@
No purchase found.
No results
You have no songs
- You have disabled history.
+ You have paused history.
Settings
Normal
Normal lyrics
@@ -358,7 +358,7 @@
If enough space is available, show volume controls in the now playing screen
Extract accent color from wallpaper
Only show music from /Music Folder
- Keeps a history of played songs
+ When enabled, newly played songs won\'t show in history
Show album cover
Navigate by Album Artist
Album cover theme
@@ -405,7 +405,7 @@
Volume controls
Wallpaper accent color
Whitelist music
- Keep history
+ Pause history
Pro
Black theme, Now playing themes, Carousel effect and more..
Profile
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" />
+ android:summary="@string/pref_summary_pause_history"
+ android:title="@string/pref_title_pause_history" />