music: invert hidden files setting
This commit is contained in:
parent
f0ea0a3e2e
commit
20a06ba2fb
7 changed files with 15 additions and 15 deletions
|
@ -384,7 +384,7 @@ constructor(
|
||||||
Naming.simple()
|
Naming.simple()
|
||||||
}
|
}
|
||||||
val locations = musicSettings.musicLocations
|
val locations = musicSettings.musicLocations
|
||||||
val ignoreHidden = musicSettings.ignoreHidden
|
val ignoreHidden = !musicSettings.withHidden
|
||||||
|
|
||||||
val currentRevision = musicSettings.revision
|
val currentRevision = musicSettings.revision
|
||||||
val newRevision = currentRevision?.takeIf { withCache } ?: UUID.randomUUID()
|
val newRevision = currentRevision?.takeIf { withCache } ?: UUID.randomUUID()
|
||||||
|
|
|
@ -41,7 +41,7 @@ interface MusicSettings : Settings<MusicSettings.Listener> {
|
||||||
/** Whether to exclude non-music audio files from the music library. */
|
/** Whether to exclude non-music audio files from the music library. */
|
||||||
val excludeNonMusic: Boolean
|
val excludeNonMusic: Boolean
|
||||||
/** Whether to ignore hidden files and directories during music loading. */
|
/** 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. */
|
/** Whether to be actively watching for changes in the music library. */
|
||||||
val shouldBeObserving: Boolean
|
val shouldBeObserving: Boolean
|
||||||
/** A [String] of characters representing the desired characters to denote multi-value tags. */
|
/** 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
|
override val excludeNonMusic: Boolean
|
||||||
get() = sharedPreferences.getBoolean(getString(R.string.set_key_exclude_non_music), true)
|
get() = sharedPreferences.getBoolean(getString(R.string.set_key_exclude_non_music), true)
|
||||||
|
|
||||||
override val ignoreHidden: Boolean
|
override val withHidden: Boolean
|
||||||
get() = sharedPreferences.getBoolean(getString(R.string.set_key_ignore_hidden), true)
|
get() = sharedPreferences.getBoolean(getString(R.string.set_key_with_hidden), true)
|
||||||
|
|
||||||
override val shouldBeObserving: Boolean
|
override val shouldBeObserving: Boolean
|
||||||
get() = sharedPreferences.getBoolean(getString(R.string.set_key_observing), false)
|
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_separators),
|
||||||
getString(R.string.set_key_auto_sort_names),
|
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) -> {
|
getString(R.string.set_key_exclude_non_music) -> {
|
||||||
L.d("Dispatching indexing setting change for $key")
|
L.d("Dispatching indexing setting change for $key")
|
||||||
listener.onIndexingSettingChanged()
|
listener.onIndexingSettingChanged()
|
||||||
|
|
|
@ -67,7 +67,7 @@ class MusicPreferenceFragment : BasePreferenceFragment(R.xml.preferences_music)
|
||||||
true
|
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")
|
L.d("Configuring ignore hidden files setting")
|
||||||
preference.onPreferenceChangeListener =
|
preference.onPreferenceChangeListener =
|
||||||
Preference.OnPreferenceChangeListener { _, _ ->
|
Preference.OnPreferenceChangeListener { _, _ ->
|
||||||
|
|
|
@ -334,6 +334,6 @@
|
||||||
<string name="lng_empty_genres">Os seus gêneros aparecerão aqui.</string>
|
<string name="lng_empty_genres">Os seus gêneros aparecerão aqui.</string>
|
||||||
<string name="set_cover_mode_save_space">Economizar espaço</string>
|
<string name="set_cover_mode_save_space">Economizar espaço</string>
|
||||||
<string name="set_locations_new">Nova pasta</string>
|
<string name="set_locations_new">Nova pasta</string>
|
||||||
<string name="set_ignore_hidden_desc">Ignorar arquivos e pastas que estão ocultos (por exemplo, .cache)</string>
|
<string name="set_with_hidden_desc">Ignorar arquivos e pastas que estão ocultos (por exemplo, .cache)</string>
|
||||||
<string name="set_ignore_hidden">Ignorar arquivos ocultos</string>
|
<string name="set_with_hidden">Ignorar arquivos ocultos</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
<string name="set_key_square_covers" translatable="false">auxio_square_covers</string>
|
<string name="set_key_square_covers" translatable="false">auxio_square_covers</string>
|
||||||
<string name="set_key_music_dirs_include" translatable="false">auxio_include_dirs</string>
|
<string name="set_key_music_dirs_include" translatable="false">auxio_include_dirs</string>
|
||||||
<string name="set_key_exclude_non_music" translatable="false">auxio_exclude_non_music</string>
|
<string name="set_key_exclude_non_music" translatable="false">auxio_exclude_non_music</string>
|
||||||
<string name="set_key_ignore_hidden" translatable="false">auxio_ignore_hidden</string>
|
<string name="set_key_with_hidden" translatable="false">auxio_with_hidden</string>
|
||||||
<string name="set_key_music_locations" translatable="false">auxio_music_locations2</string>
|
<string name="set_key_music_locations" translatable="false">auxio_music_locations2</string>
|
||||||
<string name="set_key_separators" translatable="false">auxio_separators</string>
|
<string name="set_key_separators" translatable="false">auxio_separators</string>
|
||||||
<string name="set_key_auto_sort_names" translatable="false">auxio_auto_sort_names</string>
|
<string name="set_key_auto_sort_names" translatable="false">auxio_auto_sort_names</string>
|
||||||
|
|
|
@ -267,8 +267,8 @@
|
||||||
<string name="set_observing_desc">Reload the music library whenever it changes (requires persistent notification)</string>
|
<string name="set_observing_desc">Reload the music library whenever it changes (requires persistent notification)</string>
|
||||||
<string name="set_exclude_non_music">Exclude non-music</string>
|
<string name="set_exclude_non_music">Exclude non-music</string>
|
||||||
<string name="set_exclude_non_music_desc">Ignore audio files that are not music, such as podcasts</string>
|
<string name="set_exclude_non_music_desc">Ignore audio files that are not music, such as podcasts</string>
|
||||||
<string name="set_ignore_hidden">Ignore hidden files</string>
|
<string name="set_with_hidden">Include hidden files</string>
|
||||||
<string name="set_ignore_hidden_desc">Skip files and folders that are hidden (ex. .cache)</string>
|
<string name="set_with_hidden_desc">Include files and folders that are hidden (ex. .cache)</string>
|
||||||
<string name="set_separators">Multi-value separators</string>
|
<string name="set_separators">Multi-value separators</string>
|
||||||
<string name="set_separators_desc">Configure characters that denote multiple tag values</string>
|
<string name="set_separators_desc">Configure characters that denote multiple tag values</string>
|
||||||
<string name="set_separators_comma">Comma (,)</string>
|
<string name="set_separators_comma">Comma (,)</string>
|
||||||
|
|
|
@ -16,10 +16,10 @@
|
||||||
app:title="@string/set_exclude_non_music" />
|
app:title="@string/set_exclude_non_music" />
|
||||||
|
|
||||||
<SwitchPreferenceCompat
|
<SwitchPreferenceCompat
|
||||||
app:defaultValue="true"
|
app:defaultValue="false"
|
||||||
app:key="@string/set_key_ignore_hidden"
|
app:key="@string/set_key_with_hidden"
|
||||||
app:summary="@string/set_ignore_hidden_desc"
|
app:summary="@string/set_with_hidden_desc"
|
||||||
app:title="@string/set_ignore_hidden" />
|
app:title="@string/set_with_hidden" />
|
||||||
|
|
||||||
<org.oxycblt.auxio.settings.ui.WrappedDialogPreference
|
<org.oxycblt.auxio.settings.ui.WrappedDialogPreference
|
||||||
app:key="@string/set_key_separators"
|
app:key="@string/set_key_separators"
|
||||||
|
|
Loading…
Reference in a new issue