From a577f4d7eca1c5845788a7b836e5146e4f4f74d3 Mon Sep 17 00:00:00 2001 From: Josh J Date: Fri, 25 Jan 2019 00:10:01 -0500 Subject: [PATCH] Phase One for issue #751 Refactored code for XML layout files involved for adding RTL support --- .../res/layout-land-v17/fragment_year.xml | 332 ++++++++++++++++++ .../main/res/layout-land/fragment_year.xml | 16 +- app/src/main/res/layout/activity_event.xml | 28 +- app/src/main/res/layout/activity_main.xml | 8 +- app/src/main/res/layout/activity_settings.xml | 168 ++++----- .../res/layout/calendar_item_calendar.xml | 4 +- .../res/layout/day_monthly_event_view.xml | 4 +- .../res/layout/day_monthly_number_view.xml | 8 +- .../dialog_custom_event_repeat_interval.xml | 4 +- .../main/res/layout/dialog_delete_event.xml | 4 +- .../layout/dialog_edit_repeating_event.xml | 4 +- app/src/main/res/layout/dialog_event_type.xml | 4 +- .../main/res/layout/dialog_export_events.xml | 12 +- .../main/res/layout/dialog_import_events.xml | 14 +- .../layout/dialog_select_event_type_color.xml | 8 +- .../res/layout/dialog_select_radio_group.xml | 4 +- .../layout/dialog_vertical_linear_layout.xml | 4 +- .../main/res/layout/event_item_day_view.xml | 20 +- .../res/layout/event_item_day_view_simple.xml | 14 +- app/src/main/res/layout/event_list_item.xml | 22 +- .../res/layout/event_list_item_simple.xml | 14 +- .../res/layout/event_list_item_widget.xml | 18 +- .../layout/event_list_item_widget_simple.xml | 10 +- .../main/res/layout/event_list_section.xml | 2 +- app/src/main/res/layout/event_list_widget.xml | 2 +- .../res/layout/filter_event_type_view.xml | 6 +- .../main/res/layout/fragment_event_list.xml | 4 +- .../main/res/layout/fragment_month_widget.xml | 26 +- .../main/res/layout/fragment_week_holder.xml | 4 +- app/src/main/res/layout/fragment_year.xml | 16 +- app/src/main/res/layout/item_event_type.xml | 6 +- .../res/layout/radio_button_with_color.xml | 4 +- app/src/main/res/layout/top_navigation.xml | 14 +- app/src/main/res/layout/week_event_marker.xml | 4 +- .../res/layout/weekly_view_hour_textview.xml | 4 +- .../main/res/layout/widget_config_list.xml | 14 +- .../main/res/layout/widget_config_monthly.xml | 12 +- app/src/main/res/layout/widget_event_list.xml | 18 +- 38 files changed, 596 insertions(+), 264 deletions(-) create mode 100644 app/src/main/res/layout-land-v17/fragment_year.xml diff --git a/app/src/main/res/layout-land-v17/fragment_year.xml b/app/src/main/res/layout-land-v17/fragment_year.xml new file mode 100644 index 000000000..292248855 --- /dev/null +++ b/app/src/main/res/layout-land-v17/fragment_year.xml @@ -0,0 +1,332 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout-land/fragment_year.xml b/app/src/main/res/layout-land/fragment_year.xml index 87694bbd3..d622d72f5 100644 --- a/app/src/main/res/layout-land/fragment_year.xml +++ b/app/src/main/res/layout-land/fragment_year.xml @@ -40,8 +40,8 @@ android:id="@+id/month_2_holder" android:layout_width="0dp" android:layout_height="match_parent" - android:layout_marginLeft="@dimen/yearly_padding_half" - android:layout_marginRight="@dimen/yearly_padding_half" + android:layout_marginStart="@dimen/yearly_padding_half" + android:layout_marginEnd="@dimen/yearly_padding_half" android:layout_weight="1"> @@ -399,10 +399,10 @@ android:layout_below="@+id/event_caldav_calendar_name" android:layout_marginStart="@dimen/small_margin" android:layout_marginLeft="@dimen/small_margin" - android:layout_toLeftOf="@+id/event_caldav_calendar_color" + android:layout_toStartOf="@+id/event_caldav_calendar_color" android:ellipsize="end" android:maxLines="1" - android:paddingRight="@dimen/medium_margin" + android:paddingEnd="@dimen/medium_margin" android:paddingBottom="@dimen/medium_margin" android:textSize="@dimen/meta_text_size" tools:text="hello@simplemobiletools.com"/> @@ -459,8 +459,8 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/small_margin" android:layout_marginLeft="@dimen/small_margin" - android:layout_marginRight="@dimen/medium_margin" - android:layout_toLeftOf="@+id/event_type_color" + android:layout_marginEnd="@dimen/medium_margin" + android:layout_toStartOf="@+id/event_type_color" android:paddingTop="@dimen/normal_margin" android:paddingBottom="@dimen/normal_margin" android:textSize="@dimen/day_text_size"/> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index e31f79318..a2b177cd6 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -44,8 +44,8 @@ android:layout_centerHorizontal="true" android:layout_marginTop="@dimen/activity_margin" android:gravity="center" - android:paddingLeft="@dimen/activity_margin" - android:paddingRight="@dimen/activity_margin" + android:paddingStart="@dimen/activity_margin" + android:paddingEnd="@dimen/activity_margin" android:text="@string/no_items_found" android:textSize="@dimen/bigger_text_size"/> @@ -57,8 +57,8 @@ android:layout_centerHorizontal="true" android:gravity="center" android:paddingBottom="@dimen/medium_margin" - android:paddingLeft="@dimen/activity_margin" - android:paddingRight="@dimen/activity_margin" + android:paddingStart="@dimen/activity_margin" + android:paddingEnd="@dimen/activity_margin" android:paddingTop="@dimen/medium_margin" android:text="@string/type_2_characters" android:textSize="@dimen/bigger_text_size"/> diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 4fc431e1e..ec0744b3f 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -17,9 +17,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"> @@ -523,8 +523,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:paddingLeft="@dimen/medium_margin" - android:paddingRight="@dimen/medium_margin" + android:paddingStart="@dimen/medium_margin" + android:paddingEnd="@dimen/medium_margin" android:text="@string/manage_synced_calendars"/> @@ -553,9 +553,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/bigger_margin" - android:paddingRight="@dimen/normal_margin" + android:paddingEnd="@dimen/normal_margin" android:paddingBottom="@dimen/bigger_margin"> diff --git a/app/src/main/res/layout/calendar_item_calendar.xml b/app/src/main/res/layout/calendar_item_calendar.xml index 4aefba01c..e6feacf8a 100644 --- a/app/src/main/res/layout/calendar_item_calendar.xml +++ b/app/src/main/res/layout/calendar_item_calendar.xml @@ -14,8 +14,8 @@ android:background="@null" android:clickable="false" android:paddingBottom="@dimen/activity_margin" - android:paddingLeft="@dimen/big_margin" - android:paddingRight="@dimen/activity_margin" + android:paddingStart="@dimen/big_margin" + android:paddingEnd="@dimen/activity_margin" android:paddingTop="@dimen/activity_margin" tools:text="Calendar name"/> diff --git a/app/src/main/res/layout/day_monthly_event_view.xml b/app/src/main/res/layout/day_monthly_event_view.xml index 1f703c368..bada70437 100644 --- a/app/src/main/res/layout/day_monthly_event_view.xml +++ b/app/src/main/res/layout/day_monthly_event_view.xml @@ -10,8 +10,8 @@ android:gravity="start" android:hyphenationFrequency="none" android:maxLines="1" - android:paddingLeft="@dimen/tiny_margin" - android:paddingRight="@dimen/tiny_margin" + android:paddingStart="@dimen/tiny_margin" + android:paddingEnd="@dimen/tiny_margin" android:textSize="@dimen/day_monthly_text_size" tools:targetApi="m" tools:text="1"/> diff --git a/app/src/main/res/layout/day_monthly_number_view.xml b/app/src/main/res/layout/day_monthly_number_view.xml index 57954f1ad..1ba84466e 100644 --- a/app/src/main/res/layout/day_monthly_number_view.xml +++ b/app/src/main/res/layout/day_monthly_number_view.xml @@ -5,12 +5,12 @@ android:id="@+id/day_monthly_number_id" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/tiny_margin" - android:layout_marginRight="@dimen/tiny_margin" + android:layout_marginStart="@dimen/tiny_margin" + android:layout_marginEnd="@dimen/tiny_margin" android:ellipsize="none" android:gravity="center_horizontal" android:maxLines="1" - android:paddingLeft="@dimen/tiny_margin" - android:paddingRight="@dimen/tiny_margin" + android:paddingStart="@dimen/tiny_margin" + android:paddingEnd="@dimen/tiny_margin" android:textSize="@dimen/normal_text_size" tools:text="1"/> diff --git a/app/src/main/res/layout/dialog_custom_event_repeat_interval.xml b/app/src/main/res/layout/dialog_custom_event_repeat_interval.xml index f4320996a..941b1d1e1 100644 --- a/app/src/main/res/layout/dialog_custom_event_repeat_interval.xml +++ b/app/src/main/res/layout/dialog_custom_event_repeat_interval.xml @@ -10,8 +10,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingLeft="@dimen/activity_margin" - android:paddingRight="@dimen/activity_margin" + android:paddingStart="@dimen/activity_margin" + android:paddingEnd="@dimen/activity_margin" android:paddingTop="@dimen/activity_margin"> + android:paddingEnd="@dimen/activity_margin"> + android:paddingEnd="@dimen/activity_margin"> @@ -21,7 +21,7 @@ android:id="@+id/import_event_type_holder" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/activity_margin" + android:layout_marginStart="@dimen/activity_margin" android:background="?attr/selectableItemBackground" android:padding="@dimen/small_margin"> @@ -30,9 +30,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_toLeftOf="@+id/import_event_type_color" - android:paddingLeft="@dimen/medium_margin" - android:paddingRight="@dimen/medium_margin" + android:layout_toStartOf="@+id/import_event_type_color" + android:paddingStart="@dimen/medium_margin" + android:paddingEnd="@dimen/medium_margin" tools:text="@string/regular_event"/> diff --git a/app/src/main/res/layout/dialog_select_event_type_color.xml b/app/src/main/res/layout/dialog_select_event_type_color.xml index 7d1d662fa..f994eb843 100644 --- a/app/src/main/res/layout/dialog_select_event_type_color.xml +++ b/app/src/main/res/layout/dialog_select_event_type_color.xml @@ -15,9 +15,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/selectableItemBackground" - android:paddingLeft="@dimen/big_margin" + android:paddingStart="@dimen/big_margin" android:paddingTop="@dimen/activity_margin" - android:paddingRight="@dimen/activity_margin" + android:paddingEnd="@dimen/activity_margin" android:paddingBottom="@dimen/activity_margin" android:text="@string/select_a_different_caldav_color" android:textSize="@dimen/normal_text_size"/> @@ -35,9 +35,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@+id/dialog_select_event_type_other_divider" - android:paddingLeft="@dimen/activity_margin" + android:paddingStart="@dimen/activity_margin" android:paddingTop="@dimen/normal_margin" - android:paddingRight="@dimen/activity_margin" + android:paddingEnd="@dimen/activity_margin" android:paddingBottom="@dimen/normal_margin"/> diff --git a/app/src/main/res/layout/dialog_select_radio_group.xml b/app/src/main/res/layout/dialog_select_radio_group.xml index 0da0e43d9..67d4642f8 100644 --- a/app/src/main/res/layout/dialog_select_radio_group.xml +++ b/app/src/main/res/layout/dialog_select_radio_group.xml @@ -10,8 +10,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingBottom="@dimen/normal_margin" - android:paddingLeft="@dimen/activity_margin" - android:paddingRight="@dimen/activity_margin" + android:paddingStart="@dimen/activity_margin" + android:paddingEnd="@dimen/activity_margin" android:paddingTop="@dimen/normal_margin"/> diff --git a/app/src/main/res/layout/dialog_vertical_linear_layout.xml b/app/src/main/res/layout/dialog_vertical_linear_layout.xml index 7fc649528..3e674324f 100644 --- a/app/src/main/res/layout/dialog_vertical_linear_layout.xml +++ b/app/src/main/res/layout/dialog_vertical_linear_layout.xml @@ -5,6 +5,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:paddingLeft="@dimen/activity_margin" - android:paddingRight="@dimen/activity_margin" + android:paddingStart="@dimen/activity_margin" + android:paddingEnd="@dimen/activity_margin" android:paddingTop="@dimen/activity_margin"/> diff --git a/app/src/main/res/layout/event_item_day_view.xml b/app/src/main/res/layout/event_item_day_view.xml index a33b7c948..b145bb26e 100644 --- a/app/src/main/res/layout/event_item_day_view.xml +++ b/app/src/main/res/layout/event_item_day_view.xml @@ -9,7 +9,7 @@ android:clickable="true" android:focusable="true" android:foreground="@drawable/selector" - android:paddingLeft="@dimen/activity_margin"> + android:paddingStart="@dimen/activity_margin"> @@ -33,7 +33,7 @@ android:id="@+id/event_item_start" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_toRightOf="@+id/event_item_color_bar" + android:layout_toEndOf="@+id/event_item_color_bar" android:textSize="@dimen/day_text_size" tools:text="13:00"/> @@ -42,7 +42,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@+id/event_item_start" - android:layout_toRightOf="@+id/event_item_color_bar" + android:layout_toEndOf="@+id/event_item_color_bar" android:text="15:00" android:textSize="@dimen/day_text_size"/> @@ -50,11 +50,11 @@ android:id="@+id/event_item_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/activity_margin" - android:layout_toRightOf="@+id/event_item_start" + android:layout_marginStart="@dimen/activity_margin" + android:layout_toEndOf="@+id/event_item_start" android:ellipsize="end" android:maxLines="1" - android:paddingRight="@dimen/activity_margin" + android:paddingEnd="@dimen/activity_margin" android:textSize="@dimen/day_text_size" tools:text="Event title"/> @@ -63,11 +63,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@+id/event_item_title" - android:layout_marginLeft="@dimen/activity_margin" - android:layout_toRightOf="@+id/event_item_end" + android:layout_marginStart="@dimen/activity_margin" + android:layout_toEndOf="@+id/event_item_end" android:ellipsize="end" android:maxLines="1" - android:paddingRight="@dimen/activity_margin" + android:paddingEnd="@dimen/activity_margin" android:textSize="@dimen/day_text_size" tools:text="Event description"/> diff --git a/app/src/main/res/layout/event_item_day_view_simple.xml b/app/src/main/res/layout/event_item_day_view_simple.xml index a97b0b7e3..c7f2b8bfe 100644 --- a/app/src/main/res/layout/event_item_day_view_simple.xml +++ b/app/src/main/res/layout/event_item_day_view_simple.xml @@ -9,14 +9,14 @@ android:clickable="true" android:focusable="true" android:foreground="@drawable/selector" - android:paddingLeft="@dimen/activity_margin"> + android:paddingStart="@dimen/activity_margin"> @@ -34,7 +34,7 @@ android:id="@+id/event_item_start" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_toRightOf="@+id/event_item_color_bar" + android:layout_toEndOf="@+id/event_item_color_bar" android:textSize="@dimen/day_text_size" tools:text="13:00"/> @@ -42,11 +42,11 @@ android:id="@+id/event_item_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/activity_margin" - android:layout_toRightOf="@+id/event_item_start" + android:layout_marginStart="@dimen/activity_margin" + android:layout_toEndOf="@+id/event_item_start" android:ellipsize="end" android:maxLines="1" - android:paddingRight="@dimen/activity_margin" + android:paddingEnd="@dimen/activity_margin" android:textSize="@dimen/day_text_size" tools:text="Event title"/> diff --git a/app/src/main/res/layout/event_list_item.xml b/app/src/main/res/layout/event_list_item.xml index 61b2902c5..6db8bd62c 100644 --- a/app/src/main/res/layout/event_list_item.xml +++ b/app/src/main/res/layout/event_list_item.xml @@ -9,14 +9,14 @@ android:clickable="true" android:focusable="true" android:foreground="@drawable/selector" - android:paddingLeft="@dimen/activity_margin"> + android:paddingStart="@dimen/activity_margin"> @@ -34,7 +34,7 @@ android:id="@+id/event_item_start" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_toRightOf="@+id/event_item_color_bar" + android:layout_toEndOf="@+id/event_item_color_bar" android:textSize="@dimen/day_text_size" tools:text="13:00"/> @@ -43,7 +43,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@+id/event_item_start" - android:layout_toRightOf="@+id/event_item_color_bar" + android:layout_toEndOf="@+id/event_item_color_bar" android:includeFontPadding="false" android:text="15:00" android:textSize="@dimen/day_text_size"/> @@ -52,11 +52,11 @@ android:id="@+id/event_item_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/activity_margin" - android:layout_toRightOf="@+id/event_item_start" + android:layout_marginStart="@dimen/activity_margin" + android:layout_toEndOf="@+id/event_item_start" android:ellipsize="end" android:maxLines="1" - android:paddingRight="@dimen/activity_margin" + android:paddingEnd="@dimen/activity_margin" android:textSize="@dimen/day_text_size" tools:text="Event title"/> @@ -65,12 +65,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@+id/event_item_title" - android:layout_marginLeft="@dimen/activity_margin" - android:layout_toRightOf="@+id/event_item_end" + android:layout_marginStart="@dimen/activity_margin" + android:layout_toEndOf="@+id/event_item_end" android:ellipsize="end" android:includeFontPadding="false" android:maxLines="1" - android:paddingRight="@dimen/activity_margin" + android:paddingEnd="@dimen/activity_margin" android:textSize="@dimen/day_text_size" tools:text="Event description"/> diff --git a/app/src/main/res/layout/event_list_item_simple.xml b/app/src/main/res/layout/event_list_item_simple.xml index e20b4eeb8..000456189 100644 --- a/app/src/main/res/layout/event_list_item_simple.xml +++ b/app/src/main/res/layout/event_list_item_simple.xml @@ -9,14 +9,14 @@ android:clickable="true" android:focusable="true" android:foreground="@drawable/selector" - android:paddingLeft="@dimen/activity_margin"> + android:paddingStart="@dimen/activity_margin"> @@ -34,7 +34,7 @@ android:id="@+id/event_item_start" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_toRightOf="@+id/event_item_color_bar" + android:layout_toEndOf="@+id/event_item_color_bar" android:textSize="@dimen/day_text_size" tools:text="13:00"/> @@ -42,11 +42,11 @@ android:id="@+id/event_item_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/activity_margin" - android:layout_toRightOf="@+id/event_item_start" + android:layout_marginStart="@dimen/activity_margin" + android:layout_toEndOf="@+id/event_item_start" android:ellipsize="end" android:maxLines="1" - android:paddingRight="@dimen/activity_margin" + android:paddingEnd="@dimen/activity_margin" android:textSize="@dimen/day_text_size" tools:text="Event title"/> diff --git a/app/src/main/res/layout/event_list_item_widget.xml b/app/src/main/res/layout/event_list_item_widget.xml index 013662606..715998fcf 100644 --- a/app/src/main/res/layout/event_list_item_widget.xml +++ b/app/src/main/res/layout/event_list_item_widget.xml @@ -13,7 +13,7 @@ android:layout_height="match_parent" android:layout_alignBottom="@+id/event_item_end" android:layout_alignTop="@+id/event_item_start" - android:layout_marginRight="@dimen/small_margin" + android:layout_marginEnd="@dimen/small_margin" android:background="@drawable/event_list_color_bar" android:paddingBottom="@dimen/tiny_margin" android:paddingTop="@dimen/tiny_margin"/> @@ -22,7 +22,7 @@ android:id="@+id/event_item_start" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_toRightOf="@+id/event_item_color_bar" + android:layout_toEndOf="@+id/event_item_color_bar" android:text="13:00" android:textSize="@dimen/day_text_size"/> @@ -31,7 +31,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@+id/event_item_start" - android:layout_toRightOf="@+id/event_item_color_bar" + android:layout_toEndOf="@+id/event_item_color_bar" android:includeFontPadding="false" android:text="15:00" android:textSize="@dimen/day_text_size"/> @@ -40,11 +40,11 @@ android:id="@+id/event_item_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/normal_margin" - android:layout_toRightOf="@+id/event_item_start" + android:layout_marginStart="@dimen/normal_margin" + android:layout_toEndOf="@+id/event_item_start" android:ellipsize="end" android:maxLines="1" - android:paddingRight="@dimen/small_margin" + android:paddingEnd="@dimen/small_margin" android:textSize="@dimen/day_text_size" tools:text="Event title"/> @@ -53,12 +53,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@+id/event_item_title" - android:layout_marginLeft="@dimen/normal_margin" - android:layout_toRightOf="@+id/event_item_end" + android:layout_marginStart="@dimen/normal_margin" + android:layout_toEndOf="@+id/event_item_end" android:ellipsize="end" android:includeFontPadding="false" android:maxLines="1" - android:paddingRight="@dimen/small_margin" + android:paddingEnd="@dimen/small_margin" android:textSize="@dimen/day_text_size" tools:text="Event description"/> diff --git a/app/src/main/res/layout/event_list_item_widget_simple.xml b/app/src/main/res/layout/event_list_item_widget_simple.xml index 1dd7dc437..70fd81699 100644 --- a/app/src/main/res/layout/event_list_item_widget_simple.xml +++ b/app/src/main/res/layout/event_list_item_widget_simple.xml @@ -13,7 +13,7 @@ android:layout_height="match_parent" android:layout_alignBottom="@+id/event_item_start" android:layout_alignTop="@+id/event_item_start" - android:layout_marginRight="@dimen/small_margin" + android:layout_marginEnd="@dimen/small_margin" android:background="@drawable/event_list_color_bar" android:paddingBottom="@dimen/tiny_margin" android:paddingTop="@dimen/tiny_margin"/> @@ -22,7 +22,7 @@ android:id="@+id/event_item_start" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_toRightOf="@+id/event_item_color_bar" + android:layout_toEndOf="@+id/event_item_color_bar" android:textSize="@dimen/day_text_size" tools:text="13:00"/> @@ -30,11 +30,11 @@ android:id="@+id/event_item_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/normal_margin" - android:layout_toRightOf="@+id/event_item_start" + android:layout_marginStart="@dimen/normal_margin" + android:layout_toEndOf="@+id/event_item_start" android:ellipsize="end" android:maxLines="1" - android:paddingRight="@dimen/small_margin" + android:paddingEnd="@dimen/small_margin" android:textSize="@dimen/day_text_size" tools:text="Event title"/> diff --git a/app/src/main/res/layout/event_list_section.xml b/app/src/main/res/layout/event_list_section.xml index 34106cde1..460fa2667 100644 --- a/app/src/main/res/layout/event_list_section.xml +++ b/app/src/main/res/layout/event_list_section.xml @@ -8,7 +8,7 @@ android:drawablePadding="1dp" android:drawableTop="@drawable/divider_width" android:focusable="false" - android:paddingLeft="@dimen/activity_margin" + android:paddingStart="@dimen/activity_margin" android:paddingTop="@dimen/medium_margin" android:textSize="@dimen/normal_text_size" android:textStyle="bold"/> diff --git a/app/src/main/res/layout/event_list_widget.xml b/app/src/main/res/layout/event_list_widget.xml index 0fb1221e9..71387a632 100644 --- a/app/src/main/res/layout/event_list_widget.xml +++ b/app/src/main/res/layout/event_list_widget.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:clipToPadding="false" - android:paddingLeft="@dimen/activity_margin" + android:paddingStart="@dimen/activity_margin" android:paddingTop="@dimen/medium_margin"/> diff --git a/app/src/main/res/layout/filter_event_type_view.xml b/app/src/main/res/layout/filter_event_type_view.xml index c4c1a1c34..fa1f5de8e 100644 --- a/app/src/main/res/layout/filter_event_type_view.xml +++ b/app/src/main/res/layout/filter_event_type_view.xml @@ -11,10 +11,10 @@ android:id="@+id/filter_event_type_checkbox" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginRight="@dimen/medium_margin" - android:layout_toLeftOf="@+id/filter_event_type_color" + android:layout_marginEnd="@dimen/medium_margin" + android:layout_toStartOf="@+id/filter_event_type_color" android:clickable="false" - android:paddingLeft="@dimen/small_margin"/> + android:paddingStart="@dimen/small_margin"/> diff --git a/app/src/main/res/layout/fragment_month_widget.xml b/app/src/main/res/layout/fragment_month_widget.xml index 4ce8b69bc..cad7ee0f0 100644 --- a/app/src/main/res/layout/fragment_month_widget.xml +++ b/app/src/main/res/layout/fragment_month_widget.xml @@ -14,8 +14,8 @@ android:layout_height="match_parent" android:layout_alignTop="@+id/top_value" android:layout_alignBottom="@+id/top_value" - android:paddingLeft="@dimen/medium_margin" - android:paddingRight="@dimen/medium_margin" + android:paddingStart="@dimen/medium_margin" + android:paddingEnd="@dimen/medium_margin" android:src="@drawable/ic_pointer_left"/> @@ -43,7 +43,7 @@ android:id="@+id/week_view_view_pager" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_toRightOf="@+id/week_view_hours_scrollview"/> + android:layout_toEndOf="@+id/week_view_hours_scrollview"/> diff --git a/app/src/main/res/layout/fragment_year.xml b/app/src/main/res/layout/fragment_year.xml index 7601ed9ae..f5e9dc3ec 100644 --- a/app/src/main/res/layout/fragment_year.xml +++ b/app/src/main/res/layout/fragment_year.xml @@ -39,8 +39,8 @@ android:id="@+id/month_2_holder" android:layout_width="0dp" android:layout_height="match_parent" - android:layout_marginLeft="@dimen/yearly_padding_half" - android:layout_marginRight="@dimen/yearly_padding_half" + android:layout_marginStart="@dimen/yearly_padding_half" + android:layout_marginEnd="@dimen/yearly_padding_half" android:layout_weight="1"> diff --git a/app/src/main/res/layout/top_navigation.xml b/app/src/main/res/layout/top_navigation.xml index a3ada46ad..9452487dc 100644 --- a/app/src/main/res/layout/top_navigation.xml +++ b/app/src/main/res/layout/top_navigation.xml @@ -10,8 +10,8 @@ android:layout_height="match_parent" android:layout_alignBottom="@+id/top_value" android:layout_alignTop="@+id/top_value" - android:paddingLeft="@dimen/activity_margin" - android:paddingRight="@dimen/activity_margin" + android:paddingStart="@dimen/activity_margin" + android:paddingEnd="@dimen/activity_margin" android:src="@drawable/ic_pointer_left"/> diff --git a/app/src/main/res/layout/week_event_marker.xml b/app/src/main/res/layout/week_event_marker.xml index 7763a4c27..4e20dc2c0 100644 --- a/app/src/main/res/layout/week_event_marker.xml +++ b/app/src/main/res/layout/week_event_marker.xml @@ -5,7 +5,7 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="3" - android:paddingLeft="@dimen/tiny_margin" - android:paddingRight="@dimen/tiny_margin" + android:paddingStart="@dimen/tiny_margin" + android:paddingEnd="@dimen/tiny_margin" android:textColor="@android:color/white" android:textSize="@dimen/small_text_size"/> diff --git a/app/src/main/res/layout/weekly_view_hour_textview.xml b/app/src/main/res/layout/weekly_view_hour_textview.xml index eee8a9950..1678b5124 100644 --- a/app/src/main/res/layout/weekly_view_hour_textview.xml +++ b/app/src/main/res/layout/weekly_view_hour_textview.xml @@ -5,6 +5,6 @@ android:layout_height="wrap_content" android:gravity="bottom|center_horizontal" android:minHeight="@dimen/weekly_view_row_height" - android:paddingLeft="@dimen/small_margin" - android:paddingRight="@dimen/small_margin" + android:paddingStart="@dimen/small_margin" + android:paddingEnd="@dimen/small_margin" android:textSize="@dimen/normal_text_size"/> diff --git a/app/src/main/res/layout/widget_config_list.xml b/app/src/main/res/layout/widget_config_list.xml index 0f9d6ca60..1097a2760 100644 --- a/app/src/main/res/layout/widget_config_list.xml +++ b/app/src/main/res/layout/widget_config_list.xml @@ -16,7 +16,7 @@ android:layout_marginBottom="@dimen/activity_margin" android:clipToPadding="false" android:divider="@null" - android:paddingLeft="@dimen/activity_margin" + android:paddingStart="@dimen/activity_margin" android:paddingTop="@dimen/medium_margin" app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager"/> @@ -32,7 +32,7 @@ android:layout_height="match_parent" android:layout_alignBottom="@+id/config_bg_color" android:layout_alignTop="@+id/config_bg_color" - android:layout_toRightOf="@+id/config_bg_color" + android:layout_toEndOf="@+id/config_bg_color" android:background="@android:color/white"> + android:paddingStart="@dimen/activity_margin" + android:paddingEnd="@dimen/activity_margin"/> diff --git a/app/src/main/res/layout/widget_config_monthly.xml b/app/src/main/res/layout/widget_config_monthly.xml index c4acbf44a..63972705b 100644 --- a/app/src/main/res/layout/widget_config_monthly.xml +++ b/app/src/main/res/layout/widget_config_monthly.xml @@ -27,7 +27,7 @@ android:layout_height="match_parent" android:layout_alignBottom="@+id/config_bg_color" android:layout_alignTop="@+id/config_bg_color" - android:layout_toRightOf="@+id/config_bg_color" + android:layout_toEndOf="@+id/config_bg_color" android:background="@android:color/white"> + android:paddingStart="@dimen/activity_margin" + android:paddingEnd="@dimen/activity_margin"/> diff --git a/app/src/main/res/layout/widget_event_list.xml b/app/src/main/res/layout/widget_event_list.xml index d1efe9816..da22059ab 100644 --- a/app/src/main/res/layout/widget_event_list.xml +++ b/app/src/main/res/layout/widget_event_list.xml @@ -11,12 +11,12 @@ android:layout_height="wrap_content" android:layout_alignBottom="@+id/widget_event_new_event" android:layout_alignTop="@+id/widget_event_new_event" - android:layout_toLeftOf="@+id/widget_event_new_event" + android:layout_toStartOf="@+id/widget_event_new_event" android:ellipsize="end" android:gravity="center_vertical" android:maxLines="1" - android:paddingLeft="@dimen/medium_margin" - android:paddingRight="@dimen/medium_margin" + android:paddingStart="@dimen/medium_margin" + android:paddingEnd="@dimen/medium_margin" android:textSize="@dimen/normal_text_size"/> @@ -41,7 +41,7 @@ android:clipToPadding="false" android:divider="@null" android:paddingBottom="@dimen/small_margin" - android:paddingLeft="@dimen/medium_margin"/> + android:paddingStart="@dimen/medium_margin"/>