Fix some settings, fix m3 switches

This commit is contained in:
Koitharu
2022-03-20 17:36:29 +02:00
parent 626d84eea3
commit da797741f9
5 changed files with 19 additions and 7 deletions

View File

@@ -59,14 +59,14 @@ class MainSettingsFragment : BasePreferenceFragment(R.string.settings),
findPreference<Preference>(AppSettings.KEY_DYNAMIC_THEME)?.isVisible =
AppSettings.isDynamicColorAvailable
findPreference<ListPreference>(AppSettings.KEY_DATE_FORMAT)?.run {
entryValues = arrayOf("", "MM/dd/yy", "dd/MM/yy", "yyyy-MM-dd", "dd MMM yyyy", "MMM dd, yyyy")
entryValues = resources.getStringArray(R.array.date_formats)
val now = Date().time
entries = entryValues.map { value ->
val formattedDate = settings.getDateFormat(value.toString()).format(now)
if (value == "") {
"${context.getString(R.string.system_default)} ($formattedDate)"
} else {
"$value ($formattedDate)"
formattedDate
}
}.toTypedArray()
setDefaultValueCompat("")