fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

split Settings into subsections

Browse Source
This commit is contained in:
tibbi
2018-01-27 20:19:39 +01:00
parent b75cf7ebd8
commit 5b0935bc92
2 changed files with 40 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
View File

@@ -59,6 +59,7 @@ class SettingsActivity : SimpleActivity() {
setupFontSize() setupFontSize()
updateTextColors(settings_holder) updateTextColors(settings_holder)
checkPrimaryColor() checkPrimaryColor()
setupSectionColors()
} }
override fun onPause() { override fun onPause() {
@@ -78,6 +79,13 @@ class SettingsActivity : SimpleActivity() {
} }
} }
private fun setupSectionColors() {
val adjustedPrimaryColor = getAdjustedPrimaryColor()
arrayListOf(reminders_label, caldav_label, weekly_view_label, monthly_view_label, simple_event_list_label, simple_font_size_label).forEach {
it.setTextColor(adjustedPrimaryColor)
}
}
private fun setupCustomizeColors() { private fun setupCustomizeColors() {
settings_customize_colors_holder.setOnClickListener { settings_customize_colors_holder.setOnClickListener {
startCustomizationActivity() startCustomizationActivity()

76
app/src/main/res/layout/activity_settings.xml
View File

@@ -109,27 +109,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <View
android:id="@+id/settings_replace_description_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
android:padding="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MySwitchCompat
android:id="@+id/settings_replace_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:clickable="false"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
android:text="@string/replace_description_with_location"/>
</RelativeLayout>
<ImageView
android:id="@+id/reminders_divider" android:id="@+id/reminders_divider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1px" android:layout_height="1px"
@@ -143,11 +123,9 @@
android:layout_marginLeft="@dimen/big_margin" android:layout_marginLeft="@dimen/big_margin"
android:layout_marginStart="@dimen/big_margin" android:layout_marginStart="@dimen/big_margin"
android:layout_marginTop="@dimen/activity_margin" android:layout_marginTop="@dimen/activity_margin"
android:alpha="0.6"
android:text="@string/event_reminders" android:text="@string/event_reminders"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/divider_grey" android:textSize="@dimen/smaller_text_size"/>
android:textSize="@dimen/small_text_size"/>
<RelativeLayout <RelativeLayout
android:id="@+id/settings_vibrate_holder" android:id="@+id/settings_vibrate_holder"
@@ -274,7 +252,7 @@
</RelativeLayout> </RelativeLayout>
<ImageView <View
android:id="@+id/caldav_divider" android:id="@+id/caldav_divider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1px" android:layout_height="1px"
@@ -288,11 +266,9 @@
android:layout_marginLeft="@dimen/big_margin" android:layout_marginLeft="@dimen/big_margin"
android:layout_marginStart="@dimen/big_margin" android:layout_marginStart="@dimen/big_margin"
android:layout_marginTop="@dimen/activity_margin" android:layout_marginTop="@dimen/activity_margin"
android:alpha="0.6"
android:text="@string/caldav" android:text="@string/caldav"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/divider_grey" android:textSize="@dimen/smaller_text_size"/>
android:textSize="@dimen/small_text_size"/>
<RelativeLayout <RelativeLayout
android:id="@+id/settings_caldav_sync_holder" android:id="@+id/settings_caldav_sync_holder"
@@ -336,7 +312,7 @@
</RelativeLayout> </RelativeLayout>
<ImageView <View
android:id="@+id/weekly_view_divider" android:id="@+id/weekly_view_divider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1px" android:layout_height="1px"
@@ -350,11 +326,9 @@
android:layout_marginLeft="@dimen/big_margin" android:layout_marginLeft="@dimen/big_margin"
android:layout_marginStart="@dimen/big_margin" android:layout_marginStart="@dimen/big_margin"
android:layout_marginTop="@dimen/activity_margin" android:layout_marginTop="@dimen/activity_margin"
android:alpha="0.6"
android:text="@string/weekly_view" android:text="@string/weekly_view"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/divider_grey" android:textSize="@dimen/smaller_text_size"/>
android:textSize="@dimen/small_text_size"/>
<RelativeLayout <RelativeLayout
android:id="@+id/settings_start_weekly_at_holder" android:id="@+id/settings_start_weekly_at_holder"
@@ -425,7 +399,7 @@
</RelativeLayout> </RelativeLayout>
<ImageView <View
android:id="@+id/monthly_view_divider" android:id="@+id/monthly_view_divider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1px" android:layout_height="1px"
@@ -439,11 +413,9 @@
android:layout_marginLeft="@dimen/big_margin" android:layout_marginLeft="@dimen/big_margin"
android:layout_marginStart="@dimen/big_margin" android:layout_marginStart="@dimen/big_margin"
android:layout_marginTop="@dimen/activity_margin" android:layout_marginTop="@dimen/activity_margin"
android:alpha="0.6"
android:text="@string/monthly_view" android:text="@string/monthly_view"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/divider_grey" android:textSize="@dimen/smaller_text_size"/>
android:textSize="@dimen/small_text_size"/>
<RelativeLayout <RelativeLayout
android:id="@+id/settings_week_numbers_holder" android:id="@+id/settings_week_numbers_holder"
@@ -465,7 +437,7 @@
</RelativeLayout> </RelativeLayout>
<ImageView <View
android:id="@+id/events_list_view_divider" android:id="@+id/events_list_view_divider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1px" android:layout_height="1px"
@@ -479,11 +451,29 @@
android:layout_marginLeft="@dimen/big_margin" android:layout_marginLeft="@dimen/big_margin"
android:layout_marginStart="@dimen/big_margin" android:layout_marginStart="@dimen/big_margin"
android:layout_marginTop="@dimen/activity_margin" android:layout_marginTop="@dimen/activity_margin"
android:alpha="0.6"
android:text="@string/event_lists" android:text="@string/event_lists"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/divider_grey" android:textSize="@dimen/smaller_text_size"/>
android:textSize="@dimen/small_text_size"/>
<RelativeLayout
android:id="@+id/settings_replace_description_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
android:padding="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MySwitchCompat
android:id="@+id/settings_replace_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:clickable="false"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
android:text="@string/replace_description_with_location"/>
</RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/settings_display_past_events_holder" android:id="@+id/settings_display_past_events_holder"
@@ -519,7 +509,7 @@
</RelativeLayout> </RelativeLayout>
<ImageView <View
android:id="@+id/widgets_divider" android:id="@+id/widgets_divider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1px" android:layout_height="1px"
@@ -533,11 +523,9 @@
android:layout_marginLeft="@dimen/big_margin" android:layout_marginLeft="@dimen/big_margin"
android:layout_marginStart="@dimen/big_margin" android:layout_marginStart="@dimen/big_margin"
android:layout_marginTop="@dimen/activity_margin" android:layout_marginTop="@dimen/activity_margin"
android:alpha="0.6"
android:text="@string/widgets" android:text="@string/widgets"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/divider_grey" android:textSize="@dimen/smaller_text_size"/>
android:textSize="@dimen/small_text_size"/>
<RelativeLayout <RelativeLayout
android:id="@+id/settings_font_size_holder" android:id="@+id/settings_font_size_holder"