apply md3 to all frags

fixes #65

Signed-off-by: androidacy-user <opensource@androidacy.com>
pull/89/head
androidacy-user 3 years ago
parent 3f38a8db0f
commit b3faf0daed

@ -54,8 +54,7 @@ class AppearanceFragment : PreferenceFragmentCompat() {
throw RuntimeException(getString(R.string.error_encrypted_shared_preferences))
}
setPreferencesFromResource(R.xml.theme_preferences, rootKey)
RepoFragment.applyMaterial3(preferenceScreen)
SettingsActivity.applyMaterial3(preferenceScreen)
val themePreference = findPreference<ListPreference>("pref_theme")
// If transparent theme(s) are set, disable monet
if (themePreference!!.value == "transparent_light") {

@ -45,6 +45,7 @@ class CreditsFragment : PreferenceFragmentCompat() {
}
setPreferencesFromResource(R.xml.credits_preferences, rootKey)
SettingsActivity.applyMaterial3(preferenceScreen)

@ -53,6 +53,7 @@ class DebugFragment : PreferenceFragmentCompat() {
}
setPreferencesFromResource(R.xml.debugging_preferences, rootKey)
SettingsActivity.applyMaterial3(preferenceScreen)
if (!MainApplication.isDeveloper) {
findPreference<Preference>("pref_disable_low_quality_module_filter")!!.isVisible = false

@ -45,6 +45,7 @@ class InfoFragment : PreferenceFragmentCompat() {
}
setPreferencesFromResource(R.xml.app_info_preferences, rootKey)
SettingsActivity.applyMaterial3(preferenceScreen)
val clipboard =
requireContext().getSystemService(FoxActivity.CLIPBOARD_SERVICE) as ClipboardManager

@ -50,6 +50,7 @@ class PrivacyFragment : PreferenceFragmentCompat() {
throw RuntimeException(getString(R.string.error_encrypted_shared_preferences))
}
setPreferencesFromResource(R.xml.privacy_preferences, rootKey)
SettingsActivity.applyMaterial3(preferenceScreen)
// Crash reporting
val crashReportingPreference =
findPreference<TwoStatePreference>("pref_crash_reporting")

@ -848,28 +848,10 @@ class RepoFragment : PreferenceFragmentCompat() {
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
preferenceManager.sharedPreferencesName = "mmm"
setPreferencesFromResource(R.xml.repo_preferences, rootKey)
applyMaterial3(preferenceScreen)
SettingsActivity.applyMaterial3(preferenceScreen)
setRepoData(RepoManager.MAGISK_ALT_REPO)
setRepoData(RepoManager.ANDROIDACY_MAGISK_REPO_ENDPOINT)
updateCustomRepoList(true)
onCreatePreferencesAndroidacy()
}
companion object {
/**
* *says proudly*: I stole it
*
*
* namely, from [neo wellbeing](https://github.com/NeoApplications/Neo-Wellbeing/blob/9fca4136263780c022f9ec6433c0b43d159166db/app/src/main/java/org/eu/droid_ng/wellbeing/prefs/SettingsActivity.java#L101)
*/
fun applyMaterial3(p: Preference) {
if (p is PreferenceGroup) {
for (i in 0 until p.preferenceCount) {
applyMaterial3(p.getPreference(i))
}
}
(p as? SwitchPreferenceCompat)?.widgetLayoutResource =
R.layout.preference_material_switch
}
}
}

@ -52,6 +52,7 @@ class SecurityFragment : PreferenceFragmentCompat() {
}
setPreferencesFromResource(R.xml.security_preferences, rootKey)
SettingsActivity.applyMaterial3(preferenceScreen)
findPreference<Preference>("pref_dns_over_https")!!.onPreferenceChangeListener =
Preference.OnPreferenceChangeListener { _: Preference?, v: Any? ->

@ -17,6 +17,8 @@ import android.widget.Toast
import androidx.fragment.app.FragmentTransaction
import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat
import androidx.preference.PreferenceGroup
import androidx.preference.SwitchPreferenceCompat
import androidx.security.crypto.EncryptedSharedPreferences
import androidx.security.crypto.MasterKey
import com.fox2code.foxcompat.app.FoxActivity
@ -160,7 +162,7 @@ class SettingsActivity : FoxActivity(), LanguageActivity,
throw RuntimeException(getString(R.string.error_encrypted_shared_preferences))
}
setPreferencesFromResource(R.xml.root_preferences, rootKey)
RepoFragment.applyMaterial3(preferenceScreen)
applyMaterial3(preferenceScreen)
// track all non empty values
dataStore.sharedPreferences
// disabled until EncryptedSharedPreferences fixes getAll()
@ -276,6 +278,17 @@ class SettingsActivity : FoxActivity(), LanguageActivity,
PERFORMANCE_CLASS_HIGH
}
}
fun applyMaterial3(p: Preference) {
if (p is PreferenceGroup) {
for (i in 0 until p.preferenceCount) {
applyMaterial3(p.getPreference(i))
}
}
(p as? SwitchPreferenceCompat)?.widgetLayoutResource =
R.layout.preference_material_switch
}
}
override fun onPreferenceStartFragment(

@ -60,7 +60,7 @@ class UpdateFragment : PreferenceFragmentCompat() {
throw RuntimeException(getString(R.string.error_encrypted_shared_preferences))
}
setPreferencesFromResource(R.xml.update_preferences, rootKey)
RepoFragment.applyMaterial3(preferenceScreen)
SettingsActivity.applyMaterial3(preferenceScreen)
// track all non empty values
val sharedPreferences = dataStore.sharedPreferences
val debugNotification = findPreference<Preference>("pref_background_update_check_debug")

Loading…
Cancel
Save