Skip to content

Commit dfb0a5b

Browse files
committed
setting up the Settings screen
1 parent 68e840d commit dfb0a5b

File tree

2 files changed

+23
-31
lines changed

2 files changed

+23
-31
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,18 @@ class SettingsActivity : SimpleActivity() {
1515
super.onCreate(savedInstanceState)
1616
setContentView(R.layout.activity_settings)
1717

18+
setupCustomizeColors()
1819
setupFontSize()
1920
setupWidgetNote()
2021
setupGravity()
2122
}
2223

24+
private fun setupCustomizeColors() {
25+
settings_customize_colors_holder.setOnClickListener {
26+
startCustomizationActivity()
27+
}
28+
}
29+
2330
private fun setupFontSize() {
2431
settings_font_size.setSelection(config.fontSize)
2532
settings_font_size.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {

app/src/main/res/layout/activity_settings.xml

Lines changed: 16 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,21 @@
1212
android:orientation="vertical">
1313

1414
<RelativeLayout
15-
android:id="@+id/settings_dark_theme_holder"
15+
android:id="@+id/settings_customize_colors_holder"
1616
android:layout_width="match_parent"
1717
android:layout_height="wrap_content"
1818
android:layout_marginTop="@dimen/medium_margin"
1919
android:background="?attr/selectableItemBackground"
2020
android:padding="@dimen/activity_margin">
2121

22-
<TextView
23-
android:id="@+id/settings_dark_theme_label"
22+
<com.simplemobiletools.commons.views.MyTextView
23+
android:id="@+id/settings_customize_colors_label"
2424
android:layout_width="wrap_content"
2525
android:layout_height="wrap_content"
2626
android:layout_centerVertical="true"
2727
android:paddingLeft="@dimen/medium_margin"
2828
android:paddingStart="@dimen/medium_margin"
29-
android:text="@string/dark_theme"/>
30-
31-
<android.support.v7.widget.SwitchCompat
32-
android:id="@+id/settings_dark_theme"
33-
android:layout_width="wrap_content"
34-
android:layout_height="wrap_content"
35-
android:layout_alignParentEnd="true"
36-
android:layout_alignParentRight="true"
37-
android:background="@null"
38-
android:clickable="false"/>
29+
android:text="@string/customize_colors"/>
3930

4031
</RelativeLayout>
4132

@@ -44,12 +35,10 @@
4435
android:layout_width="match_parent"
4536
android:layout_height="wrap_content"
4637
android:layout_marginTop="@dimen/medium_margin"
47-
android:paddingBottom="@dimen/activity_margin"
48-
android:paddingLeft="@dimen/activity_margin"
49-
android:paddingRight="@dimen/medium_margin"
50-
android:paddingTop="@dimen/activity_margin">
38+
android:background="?attr/selectableItemBackground"
39+
android:padding="@dimen/activity_margin">
5140

52-
<TextView
41+
<com.simplemobiletools.commons.views.MyTextView
5342
android:id="@+id/settings_font_size_label"
5443
android:layout_width="wrap_content"
5544
android:layout_height="wrap_content"
@@ -58,7 +47,7 @@
5847
android:paddingStart="@dimen/medium_margin"
5948
android:text="@string/note_font_size"/>
6049

61-
<android.support.v7.widget.AppCompatSpinner
50+
<com.simplemobiletools.commons.views.MyAppCompatSpinner
6251
android:id="@+id/settings_font_size"
6352
android:layout_width="wrap_content"
6453
android:layout_height="wrap_content"
@@ -73,12 +62,10 @@
7362
android:layout_width="match_parent"
7463
android:layout_height="wrap_content"
7564
android:layout_marginTop="@dimen/medium_margin"
76-
android:paddingBottom="@dimen/activity_margin"
77-
android:paddingLeft="@dimen/activity_margin"
78-
android:paddingRight="@dimen/medium_margin"
79-
android:paddingTop="@dimen/activity_margin">
65+
android:background="?attr/selectableItemBackground"
66+
android:padding="@dimen/activity_margin">
8067

81-
<TextView
68+
<com.simplemobiletools.commons.views.MyTextView
8269
android:id="@+id/settings_gravity_label"
8370
android:layout_width="wrap_content"
8471
android:layout_height="wrap_content"
@@ -87,7 +74,7 @@
8774
android:paddingStart="@dimen/medium_margin"
8875
android:text="@string/gravity"/>
8976

90-
<android.support.v7.widget.AppCompatSpinner
77+
<com.simplemobiletools.commons.views.MyAppCompatSpinner
9178
android:id="@+id/settings_gravity"
9279
android:layout_width="wrap_content"
9380
android:layout_height="wrap_content"
@@ -102,12 +89,10 @@
10289
android:layout_width="match_parent"
10390
android:layout_height="wrap_content"
10491
android:layout_marginTop="@dimen/medium_margin"
105-
android:paddingBottom="@dimen/activity_margin"
106-
android:paddingLeft="@dimen/activity_margin"
107-
android:paddingRight="@dimen/medium_margin"
108-
android:paddingTop="@dimen/activity_margin">
92+
android:background="?attr/selectableItemBackground"
93+
android:padding="@dimen/activity_margin">
10994

110-
<TextView
95+
<com.simplemobiletools.commons.views.MyTextView
11196
android:id="@+id/settings_widget_note_label"
11297
android:layout_width="wrap_content"
11398
android:layout_height="wrap_content"
@@ -116,7 +101,7 @@
116101
android:paddingStart="@dimen/medium_margin"
117102
android:text="@string/widget_note"/>
118103

119-
<android.support.v7.widget.AppCompatSpinner
104+
<com.simplemobiletools.commons.views.MyAppCompatSpinner
120105
android:id="@+id/settings_widget_note"
121106
android:layout_width="wrap_content"
122107
android:layout_height="wrap_content"

0 commit comments

Comments
 (0)