Skip to content

Commit 31e9c2d

Browse files
committed
redesigning the app settings
1 parent 7b76b72 commit 31e9c2d

File tree

2 files changed

+221
-291
lines changed

2 files changed

+221
-291
lines changed

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

Lines changed: 11 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ import android.content.Intent
44
import android.os.Bundle
55
import android.view.Menu
66
import com.simplemobiletools.commons.dialogs.RadioGroupDialog
7-
import com.simplemobiletools.commons.extensions.*
7+
import com.simplemobiletools.commons.extensions.beVisibleIf
8+
import com.simplemobiletools.commons.extensions.getProperPrimaryColor
9+
import com.simplemobiletools.commons.extensions.updateTextColors
810
import com.simplemobiletools.commons.helpers.*
911
import com.simplemobiletools.commons.models.RadioItem
1012
import com.simplemobiletools.notes.pro.R
@@ -18,9 +20,14 @@ import java.util.*
1820
import kotlin.system.exitProcess
1921

2022
class SettingsActivity : SimpleActivity() {
23+
2124
override fun onCreate(savedInstanceState: Bundle?) {
25+
isMaterialActivity = true
2226
super.onCreate(savedInstanceState)
2327
setContentView(R.layout.activity_settings)
28+
29+
updateMaterialActivityViews(settings_coordinator, settings_holder)
30+
setupMaterialScrollListener(settings_nested_scrollview, settings_toolbar)
2431
}
2532

2633
override fun onResume() {
@@ -46,24 +53,14 @@ class SettingsActivity : SimpleActivity() {
4653
updateTextColors(settings_nested_scrollview)
4754

4855
arrayOf(
49-
settings_color_customization_label,
56+
settings_color_customization_section_label,
5057
settings_general_settings_label,
5158
settings_text_label,
5259
settings_startup_label,
5360
settings_saving_label
5461
).forEach {
5562
it.setTextColor(getProperPrimaryColor())
5663
}
57-
58-
arrayOf(
59-
settings_color_customization_holder,
60-
settings_general_settings_holder,
61-
settings_text_holder,
62-
settings_startup_holder,
63-
settings_saving_holder
64-
).forEach {
65-
it.background.applyColorFilter(getProperBackgroundColor().getContrastColor())
66-
}
6764
}
6865

6966
override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -72,7 +69,7 @@ class SettingsActivity : SimpleActivity() {
7269
}
7370

7471
private fun setupCustomizeColors() {
75-
settings_customize_colors_holder.setOnClickListener {
72+
settings_color_customization_holder.setOnClickListener {
7673
startCustomizationActivity()
7774
}
7875
}
@@ -90,11 +87,6 @@ class SettingsActivity : SimpleActivity() {
9087
private fun setupLanguage() {
9188
settings_language.text = Locale.getDefault().displayLanguage
9289
settings_language_holder.beVisibleIf(isTiramisuPlus())
93-
94-
if (settings_use_english_holder.isGone() && settings_language_holder.isGone()) {
95-
settings_font_size_holder.background = resources.getDrawable(R.drawable.ripple_all_corners, theme)
96-
}
97-
9890
settings_language_holder.setOnClickListener {
9991
launchChangeAppLanguageIntent()
10092
}
@@ -144,10 +136,6 @@ class SettingsActivity : SimpleActivity() {
144136
private fun setupShowNotePicker() {
145137
NotesHelper(this).getNotes {
146138
settings_show_note_picker_holder.beVisibleIf(it.size > 1)
147-
148-
if (settings_show_note_picker_holder.isGone()) {
149-
settings_show_keyboard_holder.background = resources.getDrawable(R.drawable.ripple_bottom_corners, theme)
150-
}
151139
}
152140

153141
settings_show_note_picker.isChecked = config.showNotePicker
@@ -236,7 +224,7 @@ class SettingsActivity : SimpleActivity() {
236224
private fun setupCustomizeWidgetColors() {
237225
var widgetToCustomize: Widget? = null
238226

239-
settings_customize_widget_colors_holder.setOnClickListener {
227+
settings_widget_color_customization_holder.setOnClickListener {
240228
Intent(this, WidgetConfigureActivity::class.java).apply {
241229
putExtra(IS_CUSTOMIZING_COLORS, true)
242230

@@ -257,11 +245,6 @@ class SettingsActivity : SimpleActivity() {
257245
val widgets = widgetsDB.getWidgets().filter { it.widgetId != 0 }
258246
if (widgets.size == 1) {
259247
widgetToCustomize = widgets.first()
260-
} else if (widgets.size > 1) {
261-
runOnUiThread {
262-
settings_customize_widget_colors_holder.beGone()
263-
settings_customize_colors_holder.background = resources.getDrawable(R.drawable.ripple_all_corners, theme)
264-
}
265248
}
266249
}
267250
}

0 commit comments

Comments
 (0)