From 47d796c4986c3bd19b458dc278132e64ac879c8a Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 4 May 2020 19:17:14 +0200 Subject: [PATCH] increasing some margins at the settings sections --- app/src/main/res/layout/activity_settings.xml | 165 +++++++++--------- 1 file changed, 82 insertions(+), 83 deletions(-) diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 328573932..93478b89c 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -1,6 +1,5 @@ - + android:text="@string/customize_colors" /> @@ -50,7 +49,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:paddingStart="@dimen/medium_margin" - android:text="@string/manage_event_types"/> + android:text="@string/manage_event_types" /> @@ -72,7 +71,7 @@ android:background="@null" android:clickable="false" android:paddingStart="@dimen/medium_margin" - android:text="@string/use_english_language"/> + android:text="@string/use_english_language" /> @@ -94,7 +93,7 @@ android:background="@null" android:clickable="false" android:paddingStart="@dimen/medium_margin" - android:text="@string/use_24_hour_time_format"/> + android:text="@string/use_24_hour_time_format" /> @@ -116,7 +115,7 @@ android:background="@null" android:clickable="false" android:paddingStart="@dimen/medium_margin" - android:text="@string/sunday_first"/> + android:text="@string/sunday_first" /> @@ -125,10 +124,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/bigger_margin" - android:layout_marginTop="@dimen/activity_margin" + android:layout_marginTop="@dimen/section_margin" android:text="@string/event_reminders" android:textAllCaps="true" - android:textSize="@dimen/smaller_text_size"/> + android:textSize="@dimen/smaller_text_size" /> + android:text="@string/vibrate" /> @@ -170,7 +169,7 @@ android:background="@null" android:clickable="false" android:paddingStart="@dimen/medium_margin" - android:text="@string/loop_reminders"/> + android:text="@string/loop_reminders" /> @@ -193,7 +192,7 @@ android:layout_toStartOf="@+id/settings_reminder_sound" android:paddingStart="@dimen/medium_margin" android:paddingEnd="@dimen/medium_margin" - android:text="@string/reminder_sound"/> + android:text="@string/reminder_sound" /> + android:clickable="false" /> @@ -224,7 +223,7 @@ android:layout_toStartOf="@+id/settings_reminder_audio_stream" android:paddingStart="@dimen/medium_margin" android:paddingEnd="@dimen/medium_margin" - android:text="@string/reminder_stream"/> + android:text="@string/reminder_stream" /> + android:clickable="false" /> @@ -255,7 +254,7 @@ android:background="@null" android:clickable="false" android:paddingStart="@dimen/medium_margin" - android:text="@string/use_same_snooze"/> + android:text="@string/use_same_snooze" /> @@ -278,7 +277,7 @@ android:layout_toStartOf="@+id/settings_snooze_time" android:paddingStart="@dimen/medium_margin" android:paddingEnd="@dimen/medium_margin" - android:text="@string/snooze_time"/> + android:text="@string/snooze_time" /> + android:clickable="false" /> @@ -296,10 +295,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/bigger_margin" - android:layout_marginTop="@dimen/activity_margin" + android:layout_marginTop="@dimen/section_margin" android:text="@string/caldav" android:textAllCaps="true" - android:textSize="@dimen/smaller_text_size"/> + android:textSize="@dimen/smaller_text_size" /> + android:text="@string/caldav_sync" /> @@ -341,7 +340,7 @@ android:background="@null" android:clickable="false" android:paddingStart="@dimen/medium_margin" - android:text="@string/enable_pull_to_refresh"/> + android:text="@string/enable_pull_to_refresh" /> @@ -363,7 +362,7 @@ android:layout_centerVertical="true" android:paddingStart="@dimen/medium_margin" android:paddingEnd="@dimen/medium_margin" - android:text="@string/manage_synced_calendars"/> + android:text="@string/manage_synced_calendars" /> @@ -372,19 +371,19 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/bigger_margin" - android:layout_marginTop="@dimen/activity_margin" + android:layout_marginTop="@dimen/section_margin" android:text="@string/new_events" android:textAllCaps="true" - android:textSize="@dimen/smaller_text_size"/> + android:textSize="@dimen/smaller_text_size" /> + android:paddingStart="@dimen/medium_margin" + android:paddingEnd="@dimen/medium_margin" + android:text="@string/default_start_time" /> + tools:text="@string/next_full_hour" /> @@ -414,9 +413,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/selectableItemBackground" - android:paddingLeft="@dimen/normal_margin" + android:paddingStart="@dimen/normal_margin" android:paddingTop="@dimen/bigger_margin" - android:paddingRight="@dimen/normal_margin" + android:paddingEnd="@dimen/normal_margin" android:paddingBottom="@dimen/bigger_margin"> + android:paddingStart="@dimen/medium_margin" + android:paddingEnd="@dimen/medium_margin" + android:text="@string/default_duration" /> + tools:text="0 minutes" /> @@ -446,9 +445,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/selectableItemBackground" - android:paddingLeft="@dimen/normal_margin" + android:paddingStart="@dimen/normal_margin" android:paddingTop="@dimen/bigger_margin" - android:paddingRight="@dimen/normal_margin" + android:paddingEnd="@dimen/normal_margin" android:paddingBottom="@dimen/bigger_margin"> + android:paddingStart="@dimen/medium_margin" + android:paddingEnd="@dimen/medium_margin" + android:text="@string/default_event_type" /> + tools:text="@string/last_used_one" /> @@ -491,7 +490,7 @@ android:background="@null" android:clickable="false" android:paddingStart="@dimen/medium_margin" - android:text="@string/use_last_event_reminders"/> + android:text="@string/use_last_event_reminders" /> @@ -514,7 +513,7 @@ android:layout_toStartOf="@+id/settings_default_reminder_1" android:paddingStart="@dimen/medium_margin" android:paddingEnd="@dimen/medium_margin" - android:text="@string/default_reminder_1"/> + android:text="@string/default_reminder_1" /> + android:clickable="false" /> @@ -546,7 +545,7 @@ android:layout_toStartOf="@+id/settings_default_reminder_2" android:paddingStart="@dimen/medium_margin" android:paddingEnd="@dimen/medium_margin" - android:text="@string/default_reminder_2"/> + android:text="@string/default_reminder_2" /> + android:clickable="false" /> @@ -578,7 +577,7 @@ android:layout_toStartOf="@+id/settings_default_reminder_3" android:paddingStart="@dimen/medium_margin" android:paddingEnd="@dimen/medium_margin" - android:text="@string/default_reminder_3"/> + android:text="@string/default_reminder_3" /> + android:clickable="false" /> @@ -596,10 +595,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/bigger_margin" - android:layout_marginTop="@dimen/activity_margin" + android:layout_marginTop="@dimen/section_margin" android:text="@string/weekly_view" android:textAllCaps="true" - android:textSize="@dimen/smaller_text_size"/> + android:textSize="@dimen/smaller_text_size" /> + android:text="@string/start_day_at" /> + android:clickable="false" /> @@ -638,10 +637,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/bigger_margin" - android:layout_marginTop="@dimen/activity_margin" + android:layout_marginTop="@dimen/section_margin" android:text="@string/monthly_view" android:textAllCaps="true" - android:textSize="@dimen/smaller_text_size"/> + android:textSize="@dimen/smaller_text_size" /> + android:text="@string/week_numbers" /> @@ -682,7 +681,7 @@ android:background="@null" android:clickable="false" android:paddingStart="@dimen/medium_margin" - android:text="@string/show_a_grid"/> + android:text="@string/show_a_grid" /> @@ -691,10 +690,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/bigger_margin" - android:layout_marginTop="@dimen/activity_margin" + android:layout_marginTop="@dimen/section_margin" android:text="@string/event_lists" android:textAllCaps="true" - android:textSize="@dimen/smaller_text_size"/> + android:textSize="@dimen/smaller_text_size" /> + android:text="@string/replace_description_with_location" /> @@ -736,7 +735,7 @@ android:layout_toStartOf="@+id/settings_display_past_events" android:paddingStart="@dimen/medium_margin" android:paddingEnd="@dimen/medium_margin" - android:text="@string/display_past_events"/> + android:text="@string/display_past_events" /> + android:clickable="false" /> @@ -754,10 +753,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/bigger_margin" - android:layout_marginTop="@dimen/activity_margin" + android:layout_marginTop="@dimen/section_margin" android:text="@string/widgets" android:textAllCaps="true" - android:textSize="@dimen/smaller_text_size"/> + android:textSize="@dimen/smaller_text_size" /> + android:text="@string/font_size" /> + android:clickable="false" /> @@ -808,7 +807,7 @@ android:layout_toStartOf="@+id/settings_list_widget_view_to_open" android:paddingStart="@dimen/medium_margin" android:paddingEnd="@dimen/medium_margin" - android:text="@string/view_to_open_from_widget"/> + android:text="@string/view_to_open_from_widget" /> + android:clickable="false" /> @@ -837,7 +836,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:paddingStart="@dimen/medium_margin" - android:text="@string/customize_widget_colors"/> + android:text="@string/customize_widget_colors" /> @@ -846,10 +845,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/bigger_margin" - android:layout_marginTop="@dimen/activity_margin" + android:layout_marginTop="@dimen/section_margin" android:text="@string/events" android:textAllCaps="true" - android:textSize="@dimen/smaller_text_size"/> + android:textSize="@dimen/smaller_text_size" /> + android:text="@string/dim_past_events" /> @@ -890,7 +889,7 @@ android:background="@null" android:clickable="false" android:paddingStart="@dimen/medium_margin" - android:text="@string/allow_changing_time_zones"/> + android:text="@string/allow_changing_time_zones" /> @@ -911,7 +910,7 @@ android:layout_centerVertical="true" android:paddingStart="@dimen/medium_margin" android:paddingEnd="@dimen/medium_margin" - android:text="@string/delete_all_events"/> + android:text="@string/delete_all_events" /> @@ -920,10 +919,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/bigger_margin" - android:layout_marginTop="@dimen/activity_margin" + android:layout_marginTop="@dimen/section_margin" android:text="@string/migrating" android:textAllCaps="true" - android:textSize="@dimen/smaller_text_size"/> + android:textSize="@dimen/smaller_text_size" /> + android:text="@string/export_settings" /> @@ -952,9 +951,9 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/medium_margin" android:background="?attr/selectableItemBackground" - android:paddingLeft="@dimen/normal_margin" + android:paddingStart="@dimen/normal_margin" android:paddingTop="@dimen/activity_margin" - android:paddingRight="@dimen/normal_margin" + android:paddingEnd="@dimen/normal_margin" android:paddingBottom="@dimen/activity_margin"> + android:text="@string/import_settings" />