Skip to content

Commit 5d45a0a

Browse files
committed
redesigning the app settings
1 parent 171a4e4 commit 5d45a0a

File tree

2 files changed

+309
-322
lines changed

2 files changed

+309
-322
lines changed

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SettingsActivity.kt

Lines changed: 38 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,36 @@ class SettingsActivity : SimpleActivity() {
4242
setupDeleteConfirmation()
4343
setupEnableRootAccess()
4444
updateTextColors(settings_holder)
45-
setupSectionColors()
4645
invalidateOptionsMenu()
46+
47+
arrayOf(
48+
settings_color_customization_label,
49+
settings_general_settings_label,
50+
settings_visibility_label,
51+
settings_scrolling_label,
52+
settings_file_operations_label,
53+
settings_security_label
54+
).forEach {
55+
it.setTextColor(getAdjustedPrimaryColor())
56+
}
57+
58+
arrayOf(
59+
settings_color_customization_holder,
60+
settings_general_settings_holder,
61+
settings_visibility_holder,
62+
settings_scrolling_holder,
63+
settings_file_operations_holder,
64+
settings_security_holder
65+
).forEach {
66+
it.background.applyColorFilter(baseConfig.backgroundColor.getContrastColor())
67+
}
4768
}
4869

4970
override fun onCreateOptionsMenu(menu: Menu): Boolean {
5071
updateMenuItemColors(menu)
5172
return super.onCreateOptionsMenu(menu)
5273
}
5374

54-
private fun setupSectionColors() {
55-
val adjustedPrimaryColor = getAdjustedPrimaryColor()
56-
arrayListOf(visibility_label, scrolling_label, file_operations_label, security_label).forEach {
57-
it.setTextColor(adjustedPrimaryColor)
58-
}
59-
}
60-
6175
private fun setupCustomizeColors() {
6276
settings_customize_colors_holder.setOnClickListener {
6377
startCustomizationActivity()
@@ -67,6 +81,11 @@ class SettingsActivity : SimpleActivity() {
6781
private fun setupUseEnglish() {
6882
settings_use_english_holder.beVisibleIf(config.wasUseEnglishToggled || Locale.getDefault().language != "en")
6983
settings_use_english.isChecked = config.useEnglish
84+
85+
if (settings_use_english_holder.isGone()) {
86+
settings_manage_favorites_holder.background = resources.getDrawable(R.drawable.ripple_top_corners, theme)
87+
}
88+
7089
settings_use_english_holder.setOnClickListener {
7190
settings_use_english.toggle()
7291
config.useEnglish = settings_use_english.isChecked
@@ -99,7 +118,8 @@ class SettingsActivity : SimpleActivity() {
99118
RadioItem(FONT_SIZE_SMALL, getString(R.string.small)),
100119
RadioItem(FONT_SIZE_MEDIUM, getString(R.string.medium)),
101120
RadioItem(FONT_SIZE_LARGE, getString(R.string.large)),
102-
RadioItem(FONT_SIZE_EXTRA_LARGE, getString(R.string.extra_large)))
121+
RadioItem(FONT_SIZE_EXTRA_LARGE, getString(R.string.extra_large))
122+
)
103123

104124
RadioGroupDialog(this@SettingsActivity, items, config.fontSize) {
105125
config.fontSize = it as Int
@@ -227,6 +247,15 @@ class SettingsActivity : SimpleActivity() {
227247
private fun setupEnableRootAccess() {
228248
settings_enable_root_access_holder.beVisibleIf(config.isRootAvailable)
229249
settings_enable_root_access.isChecked = config.enableRootAccess
250+
251+
settings_file_deletion_password_protection_holder.background = resources.getDrawable(
252+
if (settings_enable_root_access_holder.isGone()) {
253+
R.drawable.ripple_bottom_corners
254+
} else {
255+
R.drawable.ripple_background
256+
}, theme
257+
)
258+
230259
settings_enable_root_access_holder.setOnClickListener {
231260
if (!config.enableRootAccess) {
232261
RootHelpers(this).askRootIfNeeded {

0 commit comments

Comments
 (0)