diff --git a/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt b/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt index 90aac5c36..1af17e660 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt @@ -384,7 +384,7 @@ constructor( Naming.simple() } val locations = musicSettings.musicLocations - val ignoreHidden = musicSettings.ignoreHidden + val ignoreHidden = !musicSettings.withHidden val currentRevision = musicSettings.revision val newRevision = currentRevision?.takeIf { withCache } ?: UUID.randomUUID() diff --git a/app/src/main/java/org/oxycblt/auxio/music/MusicSettings.kt b/app/src/main/java/org/oxycblt/auxio/music/MusicSettings.kt index d94d6ec4c..8ae954e5a 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/MusicSettings.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/MusicSettings.kt @@ -41,7 +41,7 @@ interface MusicSettings : Settings { /** Whether to exclude non-music audio files from the music library. */ val excludeNonMusic: Boolean /** Whether to ignore hidden files and directories during music loading. */ - val ignoreHidden: Boolean + val withHidden: Boolean /** Whether to be actively watching for changes in the music library. */ val shouldBeObserving: Boolean /** A [String] of characters representing the desired characters to denote multi-value tags. */ @@ -92,8 +92,8 @@ class MusicSettingsImpl @Inject constructor(@ApplicationContext private val cont override val excludeNonMusic: Boolean get() = sharedPreferences.getBoolean(getString(R.string.set_key_exclude_non_music), true) - override val ignoreHidden: Boolean - get() = sharedPreferences.getBoolean(getString(R.string.set_key_ignore_hidden), true) + override val withHidden: Boolean + get() = sharedPreferences.getBoolean(getString(R.string.set_key_with_hidden), true) override val shouldBeObserving: Boolean get() = sharedPreferences.getBoolean(getString(R.string.set_key_observing), false) @@ -122,7 +122,7 @@ class MusicSettingsImpl @Inject constructor(@ApplicationContext private val cont } getString(R.string.set_key_separators), getString(R.string.set_key_auto_sort_names), - getString(R.string.set_key_ignore_hidden), + getString(R.string.set_key_with_hidden), getString(R.string.set_key_exclude_non_music) -> { L.d("Dispatching indexing setting change for $key") listener.onIndexingSettingChanged() diff --git a/app/src/main/java/org/oxycblt/auxio/settings/categories/MusicPreferenceFragment.kt b/app/src/main/java/org/oxycblt/auxio/settings/categories/MusicPreferenceFragment.kt index 9707afae0..752dead1a 100644 --- a/app/src/main/java/org/oxycblt/auxio/settings/categories/MusicPreferenceFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/settings/categories/MusicPreferenceFragment.kt @@ -67,7 +67,7 @@ class MusicPreferenceFragment : BasePreferenceFragment(R.xml.preferences_music) true } } - if (preference.key == getString(R.string.set_key_ignore_hidden)) { + if (preference.key == getString(R.string.set_key_with_hidden)) { L.d("Configuring ignore hidden files setting") preference.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, _ -> diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index e5b67d5b9..e714bc71f 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -334,6 +334,6 @@ Os seus gêneros aparecerão aqui. Economizar espaço Nova pasta - Ignorar arquivos e pastas que estão ocultos (por exemplo, .cache) - Ignorar arquivos ocultos + Ignorar arquivos e pastas que estão ocultos (por exemplo, .cache) + Ignorar arquivos ocultos diff --git a/app/src/main/res/values/settings.xml b/app/src/main/res/values/settings.xml index 99438b0d6..eec560b35 100644 --- a/app/src/main/res/values/settings.xml +++ b/app/src/main/res/values/settings.xml @@ -18,7 +18,7 @@ auxio_square_covers auxio_include_dirs auxio_exclude_non_music - auxio_ignore_hidden + auxio_with_hidden auxio_music_locations2 auxio_separators auxio_auto_sort_names diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 64bbcfd36..c055b0dd0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -267,8 +267,8 @@ Reload the music library whenever it changes (requires persistent notification) Exclude non-music Ignore audio files that are not music, such as podcasts - Ignore hidden files - Skip files and folders that are hidden (ex. .cache) + Include hidden files + Include files and folders that are hidden (ex. .cache) Multi-value separators Configure characters that denote multiple tag values Comma (,) diff --git a/app/src/main/res/xml/preferences_music.xml b/app/src/main/res/xml/preferences_music.xml index d164aed5c..b3b5106f5 100644 --- a/app/src/main/res/xml/preferences_music.xml +++ b/app/src/main/res/xml/preferences_music.xml @@ -16,10 +16,10 @@ app:title="@string/set_exclude_non_music" /> + app:defaultValue="false" + app:key="@string/set_key_with_hidden" + app:summary="@string/set_with_hidden_desc" + app:title="@string/set_with_hidden" />