From f6c2558722a7a765436a446b4aab8ec80dd213dd Mon Sep 17 00:00:00 2001 From: CarlosEsco Date: Wed, 22 Apr 2020 13:31:02 -0400 Subject: [PATCH] run standard xml format on reader files --- .../layout-land/reader_color_filter_sheet.xml | 3 +- app/src/main/res/layout/reader_activity.xml | 17 ++-- .../main/res/layout/reader_chapter_item.xml | 4 +- .../main/res/layout/reader_chapters_sheet.xml | 2 +- .../main/res/layout/reader_color_filter.xml | 93 +++++++++---------- app/src/main/res/layout/reader_page_sheet.xml | 45 +++++---- .../main/res/layout/reader_settings_sheet.xml | 12 +-- 7 files changed, 87 insertions(+), 89 deletions(-) diff --git a/app/src/main/res/layout-land/reader_color_filter_sheet.xml b/app/src/main/res/layout-land/reader_color_filter_sheet.xml index 4dc4bd9b0d..6df89dc7c6 100644 --- a/app/src/main/res/layout-land/reader_color_filter_sheet.xml +++ b/app/src/main/res/layout-land/reader_color_filter_sheet.xml @@ -1,6 +1,5 @@ - + - + - + diff --git a/app/src/main/res/layout/reader_chapter_item.xml b/app/src/main/res/layout/reader_chapter_item.xml index c57927aa9a..e838909501 100644 --- a/app/src/main/res/layout/reader_chapter_item.xml +++ b/app/src/main/res/layout/reader_chapter_item.xml @@ -4,9 +4,9 @@ android:id="@+id/reader_chapter_layout" android:layout_width="match_parent" android:layout_height="60dp" + android:background="@drawable/list_item_selector" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - android:background="@drawable/list_item_selector" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> @@ -59,6 +59,6 @@ android:layout_height="30dp" android:layout_gravity="center" android:src="@drawable/ic_bookmark_border_24dp" - android:tint="?android:attr/textColorHint"/> + android:tint="?android:attr/textColorHint" /> \ No newline at end of file diff --git a/app/src/main/res/layout/reader_chapters_sheet.xml b/app/src/main/res/layout/reader_chapters_sheet.xml index 128e90ecd1..f9c026643b 100644 --- a/app/src/main/res/layout/reader_chapters_sheet.xml +++ b/app/src/main/res/layout/reader_chapters_sheet.xml @@ -66,8 +66,8 @@ android:layout_width="100dp" android:layout_height="match_parent" android:gravity="center" - android:textSize="15sp" android:textColor="?actionBarTintColor" + android:textSize="15sp" tools:text="100 / 105" /> diff --git a/app/src/main/res/layout/reader_color_filter.xml b/app/src/main/res/layout/reader_color_filter.xml index cc6cd0b754..fa9248a9a0 100644 --- a/app/src/main/res/layout/reader_color_filter.xml +++ b/app/src/main/res/layout/reader_color_filter.xml @@ -1,10 +1,9 @@ - + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> @@ -30,13 +29,13 @@ android:id="@+id/seekbar_color_filter_red" android:layout_width="0dp" android:layout_height="wrap_content" - android:max="255" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" + android:max="255" android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text" - app:layout_constraintTop_toBottomOf="@id/switch_color_filter" + app:layout_constraintEnd_toStartOf="@id/txt_color_filter_red_value" app:layout_constraintStart_toEndOf="@id/txt_color_filter_red_symbol" - app:layout_constraintEnd_toStartOf="@id/txt_color_filter_red_value" /> + app:layout_constraintTop_toBottomOf="@id/switch_color_filter" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_red" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_red" /> @@ -64,13 +63,13 @@ android:id="@+id/seekbar_color_filter_green" android:layout_width="0dp" android:layout_height="wrap_content" - android:max="255" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" + android:max="255" android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text" - app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_red" + app:layout_constraintEnd_toStartOf="@id/txt_color_filter_green_value" app:layout_constraintStart_toEndOf="@id/txt_color_filter_green_symbol" - app:layout_constraintEnd_toStartOf="@id/txt_color_filter_green_value" /> + app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_red" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_green" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_green" /> @@ -98,13 +97,13 @@ android:id="@+id/seekbar_color_filter_blue" android:layout_width="0dp" android:layout_height="wrap_content" - android:max="255" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" + android:max="255" android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text" - app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_green" + app:layout_constraintEnd_toStartOf="@id/txt_color_filter_blue_value" app:layout_constraintStart_toEndOf="@id/txt_color_filter_blue_symbol" - app:layout_constraintEnd_toStartOf="@id/txt_color_filter_blue_value" /> + app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_green" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_blue" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_blue" /> @@ -132,13 +131,13 @@ android:id="@+id/seekbar_color_filter_alpha" android:layout_width="0dp" android:layout_height="wrap_content" - android:max="255" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" + android:max="255" android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text" - app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_blue" + app:layout_constraintEnd_toStartOf="@id/txt_color_filter_alpha_value" app:layout_constraintStart_toEndOf="@id/txt_color_filter_alpha_symbol" - app:layout_constraintEnd_toStartOf="@id/txt_color_filter_alpha_value" /> + app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_blue" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_alpha" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="@id/seekbar_color_filter_alpha" /> @@ -167,9 +166,9 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/color_filter_blend_mode" - app:layout_constraintStart_toStartOf="parent" + app:layout_constraintBaseline_toBaselineOf="@id/color_filter_mode" app:layout_constraintEnd_toStartOf="@id/color_filter_mode" - app:layout_constraintBaseline_toBaselineOf="@id/color_filter_mode"/> + app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintTop_toBottomOf="@id/seekbar_color_filter_alpha" /> @@ -189,7 +188,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="@string/use_custom_brightness" - app:layout_constraintTop_toBottomOf="@id/color_filter_mode_text"/> + app:layout_constraintTop_toBottomOf="@id/color_filter_mode_text" /> @@ -200,10 +199,10 @@ android:layout_marginStart="8dp" android:layout_marginEnd="8dp" android:padding="@dimen/material_component_text_fields_floating_label_padding_between_label_and_input_text" - app:layout_constraintTop_toBottomOf="@id/custom_brightness" - app:layout_constraintStart_toEndOf="@id/txt_brightness_seekbar_icon" - app:layout_constraintEnd_toStartOf="@id/txt_brightness_seekbar_value" app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@id/txt_brightness_seekbar_value" + app:layout_constraintStart_toEndOf="@id/txt_brightness_seekbar_icon" + app:layout_constraintTop_toBottomOf="@id/custom_brightness" app:max_seek="100" app:min_seek="-75" /> @@ -213,19 +212,19 @@ android:layout_height="wrap_content" android:textAppearance="@style/TextAppearance.Regular.SubHeading.Secondary" android:tint="?android:attr/textColorSecondary" - app:srcCompat="@drawable/ic_brightness_5_black_24dp" - app:layout_constraintTop_toTopOf="@id/brightness_seekbar" app:layout_constraintBottom_toBottomOf="@id/brightness_seekbar" - app:layout_constraintStart_toStartOf="parent"/> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@id/brightness_seekbar" + app:srcCompat="@drawable/ic_brightness_5_black_24dp" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="@id/brightness_seekbar" /> - + android:foreground="?attr/selectableItemBackground" + android:gravity="center" + android:paddingStart="16dp" + android:paddingEnd="16dp"> + android:tint="@color/md_white_1000_54" + app:srcCompat="@drawable/ic_image_black_24dp" /> + android:text="@string/set_as_cover" /> @@ -37,23 +36,23 @@ android:id="@+id/share_layout" android:layout_width="match_parent" android:layout_height="56dp" - android:paddingStart="16dp" - android:paddingEnd="16dp" - android:gravity="center" android:clickable="true" android:focusable="true" - android:foreground="?attr/selectableItemBackground"> + android:foreground="?attr/selectableItemBackground" + android:gravity="center" + android:paddingStart="16dp" + android:paddingEnd="16dp"> + app:srcCompat="@drawable/ic_share_grey_24dp" /> + android:text="@string/share" /> @@ -61,24 +60,24 @@ android:id="@+id/save_layout" android:layout_width="match_parent" android:layout_height="56dp" - android:paddingStart="16dp" - android:paddingEnd="16dp" - android:gravity="center" android:clickable="true" android:focusable="true" - android:foreground="?attr/selectableItemBackground"> + android:foreground="?attr/selectableItemBackground" + android:gravity="center" + android:paddingStart="16dp" + android:paddingEnd="16dp"> + android:tint="@color/md_white_1000_54" + app:srcCompat="@drawable/ic_file_download_black_24dp" /> + android:text="@string/save" /> diff --git a/app/src/main/res/layout/reader_settings_sheet.xml b/app/src/main/res/layout/reader_settings_sheet.xml index 00e85d8d8e..39865f0441 100644 --- a/app/src/main/res/layout/reader_settings_sheet.xml +++ b/app/src/main/res/layout/reader_settings_sheet.xml @@ -247,9 +247,9 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/pref_webtoon_side_padding" + app:layout_constraintBaseline_toBaselineOf="@id/webtoon_side_padding" app:layout_constraintEnd_toStartOf="@id/bottom_line" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintBaseline_toBaselineOf="@id/webtoon_side_padding"/> + app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintStart_toEndOf="@id/bottom_line" + app:layout_constraintTop_toBottomOf="@id/crop_borders_webtoon" />