Skip to content

Commit b3faf0d

Browse files
apply md3 to all frags
fixes #65 Signed-off-by: androidacy-user <opensource@androidacy.com>
1 parent 3f38a8d commit b3faf0d

9 files changed

Lines changed: 22 additions & 23 deletions

File tree

app/src/main/kotlin/com/fox2code/mmm/settings/AppearanceFragment.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ class AppearanceFragment : PreferenceFragmentCompat() {
5454
throw RuntimeException(getString(R.string.error_encrypted_shared_preferences))
5555
}
5656
setPreferencesFromResource(R.xml.theme_preferences, rootKey)
57-
58-
RepoFragment.applyMaterial3(preferenceScreen)
57+
SettingsActivity.applyMaterial3(preferenceScreen)
5958
val themePreference = findPreference<ListPreference>("pref_theme")
6059
// If transparent theme(s) are set, disable monet
6160
if (themePreference!!.value == "transparent_light") {

app/src/main/kotlin/com/fox2code/mmm/settings/CreditsFragment.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class CreditsFragment : PreferenceFragmentCompat() {
4545
}
4646

4747
setPreferencesFromResource(R.xml.credits_preferences, rootKey)
48+
SettingsActivity.applyMaterial3(preferenceScreen)
4849

4950

5051

app/src/main/kotlin/com/fox2code/mmm/settings/DebugFragment.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ class DebugFragment : PreferenceFragmentCompat() {
5353
}
5454
setPreferencesFromResource(R.xml.debugging_preferences, rootKey)
5555

56+
SettingsActivity.applyMaterial3(preferenceScreen)
5657

5758
if (!MainApplication.isDeveloper) {
5859
findPreference<Preference>("pref_disable_low_quality_module_filter")!!.isVisible = false

app/src/main/kotlin/com/fox2code/mmm/settings/InfoFragment.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class InfoFragment : PreferenceFragmentCompat() {
4545
}
4646

4747
setPreferencesFromResource(R.xml.app_info_preferences, rootKey)
48+
SettingsActivity.applyMaterial3(preferenceScreen)
4849

4950
val clipboard =
5051
requireContext().getSystemService(FoxActivity.CLIPBOARD_SERVICE) as ClipboardManager

app/src/main/kotlin/com/fox2code/mmm/settings/PrivacyFragment.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ class PrivacyFragment : PreferenceFragmentCompat() {
5050
throw RuntimeException(getString(R.string.error_encrypted_shared_preferences))
5151
}
5252
setPreferencesFromResource(R.xml.privacy_preferences, rootKey)
53+
SettingsActivity.applyMaterial3(preferenceScreen)
5354
// Crash reporting
5455
val crashReportingPreference =
5556
findPreference<TwoStatePreference>("pref_crash_reporting")

app/src/main/kotlin/com/fox2code/mmm/settings/RepoFragment.kt

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -848,28 +848,10 @@ class RepoFragment : PreferenceFragmentCompat() {
848848
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
849849
preferenceManager.sharedPreferencesName = "mmm"
850850
setPreferencesFromResource(R.xml.repo_preferences, rootKey)
851-
applyMaterial3(preferenceScreen)
851+
SettingsActivity.applyMaterial3(preferenceScreen)
852852
setRepoData(RepoManager.MAGISK_ALT_REPO)
853853
setRepoData(RepoManager.ANDROIDACY_MAGISK_REPO_ENDPOINT)
854854
updateCustomRepoList(true)
855855
onCreatePreferencesAndroidacy()
856856
}
857-
858-
companion object {
859-
/**
860-
* *says proudly*: I stole it
861-
*
862-
*
863-
* 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)
864-
*/
865-
fun applyMaterial3(p: Preference) {
866-
if (p is PreferenceGroup) {
867-
for (i in 0 until p.preferenceCount) {
868-
applyMaterial3(p.getPreference(i))
869-
}
870-
}
871-
(p as? SwitchPreferenceCompat)?.widgetLayoutResource =
872-
R.layout.preference_material_switch
873-
}
874-
}
875857
}

app/src/main/kotlin/com/fox2code/mmm/settings/SecurityFragment.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ class SecurityFragment : PreferenceFragmentCompat() {
5252
}
5353

5454
setPreferencesFromResource(R.xml.security_preferences, rootKey)
55+
SettingsActivity.applyMaterial3(preferenceScreen)
5556

5657
findPreference<Preference>("pref_dns_over_https")!!.onPreferenceChangeListener =
5758
Preference.OnPreferenceChangeListener { _: Preference?, v: Any? ->

app/src/main/kotlin/com/fox2code/mmm/settings/SettingsActivity.kt

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ import android.widget.Toast
1717
import androidx.fragment.app.FragmentTransaction
1818
import androidx.preference.Preference
1919
import androidx.preference.PreferenceFragmentCompat
20+
import androidx.preference.PreferenceGroup
21+
import androidx.preference.SwitchPreferenceCompat
2022
import androidx.security.crypto.EncryptedSharedPreferences
2123
import androidx.security.crypto.MasterKey
2224
import com.fox2code.foxcompat.app.FoxActivity
@@ -160,7 +162,7 @@ class SettingsActivity : FoxActivity(), LanguageActivity,
160162
throw RuntimeException(getString(R.string.error_encrypted_shared_preferences))
161163
}
162164
setPreferencesFromResource(R.xml.root_preferences, rootKey)
163-
RepoFragment.applyMaterial3(preferenceScreen)
165+
applyMaterial3(preferenceScreen)
164166
// track all non empty values
165167
dataStore.sharedPreferences
166168
// disabled until EncryptedSharedPreferences fixes getAll()
@@ -276,6 +278,17 @@ class SettingsActivity : FoxActivity(), LanguageActivity,
276278
PERFORMANCE_CLASS_HIGH
277279
}
278280
}
281+
282+
283+
fun applyMaterial3(p: Preference) {
284+
if (p is PreferenceGroup) {
285+
for (i in 0 until p.preferenceCount) {
286+
applyMaterial3(p.getPreference(i))
287+
}
288+
}
289+
(p as? SwitchPreferenceCompat)?.widgetLayoutResource =
290+
R.layout.preference_material_switch
291+
}
279292
}
280293

281294
override fun onPreferenceStartFragment(

app/src/main/kotlin/com/fox2code/mmm/settings/UpdateFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class UpdateFragment : PreferenceFragmentCompat() {
6060
throw RuntimeException(getString(R.string.error_encrypted_shared_preferences))
6161
}
6262
setPreferencesFromResource(R.xml.update_preferences, rootKey)
63-
RepoFragment.applyMaterial3(preferenceScreen)
63+
SettingsActivity.applyMaterial3(preferenceScreen)
6464
// track all non empty values
6565
val sharedPreferences = dataStore.sharedPreferences
6666
val debugNotification = findPreference<Preference>("pref_background_update_check_debug")

0 commit comments

Comments
 (0)