From 02a5a0e204e6bb7497238261fe52e8aeba50cc3b Mon Sep 17 00:00:00 2001 From: NekoInverter <42698724+NekoInverter@users.noreply.github.com> Date: Mon, 23 Mar 2020 17:23:53 +0800 Subject: [PATCH] Fix fab color --- .../main/res/layout/activity_dir_picker.xml | 20 +- app/src/main/res/layout/activity_filter.xml | 14 +- app/src/main/res/layout/activity_gallery.xml | 31 ++- app/src/main/res/layout/activity_hosts.xml | 66 +++---- app/src/main/res/layout/activity_my_tags.xml | 36 ++-- .../main/res/layout/activity_set_security.xml | 45 ++--- app/src/main/res/layout/activity_toolbar.xml | 6 +- app/src/main/res/layout/activity_u_config.xml | 36 ++-- .../layout/alert_dialog_progress_material.xml | 14 +- app/src/main/res/layout/button_guide.xml | 14 +- app/src/main/res/layout/dialog_add_filter.xml | 10 +- .../main/res/layout/dialog_archive_list.xml | 12 +- .../res/layout/dialog_checkbox_builder.xml | 10 +- app/src/main/res/layout/dialog_donate.xml | 152 +++++++------- .../res/layout/dialog_edittext_builder.xml | 8 +- .../main/res/layout/dialog_gallery_menu.xml | 71 ++++--- app/src/main/res/layout/dialog_go_to.xml | 20 +- app/src/main/res/layout/dialog_hosts.xml | 62 +++--- .../layout/dialog_item_select_with_icon.xml | 13 +- app/src/main/res/layout/dialog_js_prompt.xml | 34 ++-- .../layout/dialog_list_checkbox_builder.xml | 23 +-- app/src/main/res/layout/dialog_rate.xml | 16 +- .../main/res/layout/dialog_recycler_view.xml | 10 +- .../main/res/layout/dialog_torrent_list.xml | 12 +- .../res/layout/gallery_detail_actions.xml | 50 +++-- .../res/layout/gallery_detail_comments.xml | 10 +- .../res/layout/gallery_detail_content.xml | 33 ++-- .../main/res/layout/gallery_detail_header.xml | 68 +++---- .../main/res/layout/gallery_detail_info.xml | 24 ++- .../res/layout/gallery_detail_previews.xml | 15 +- .../res/layout/gallery_detail_progress.xml | 8 +- .../main/res/layout/gallery_detail_tags.xml | 10 +- app/src/main/res/layout/gallery_tag_group.xml | 8 +- .../res/layout/item_cute_spinner_item.xml | 10 +- app/src/main/res/layout/item_dir_explorer.xml | 8 +- app/src/main/res/layout/item_download.xml | 186 +++++++++--------- .../main/res/layout/item_download_label.xml | 30 ++- .../main/res/layout/item_drawer_favorites.xml | 22 +-- .../res/layout/item_excluded_languages.xml | 14 +- app/src/main/res/layout/item_filter.xml | 25 ++- .../main/res/layout/item_filter_header.xml | 12 +- .../main/res/layout/item_gallery_comment.xml | 18 +- .../res/layout/item_gallery_comment_more.xml | 8 +- .../layout/item_gallery_comment_progress.xml | 8 +- app/src/main/res/layout/item_gallery_grid.xml | 26 ++- .../res/layout/item_gallery_info_data.xml | 14 +- .../res/layout/item_gallery_info_header.xml | 14 +- app/src/main/res/layout/item_gallery_list.xml | 129 ++++++------ .../layout/item_gallery_list_thumb_height.xml | 72 ++++--- .../main/res/layout/item_gallery_preview.xml | 15 +- app/src/main/res/layout/item_gallery_tag.xml | 10 +- app/src/main/res/layout/item_history.xml | 10 +- app/src/main/res/layout/item_hosts.xml | 40 ++-- .../res/layout/item_preference_header.xml | 22 +-- app/src/main/res/layout/item_quick_search.xml | 30 ++- .../main/res/layout/item_select_dialog.xml | 14 +- app/src/main/res/layout/item_simple_list.xml | 10 +- .../main/res/layout/item_simple_list_2.xml | 16 +- app/src/main/res/layout/nav_header_main.xml | 20 +- .../preference_dialog_default_categories.xml | 8 +- ...ference_dialog_excluded_tag_namespaces.xml | 30 ++- .../res/layout/preference_dialog_proxy.xml | 16 +- .../res/layout/preference_dialog_task.xml | 18 +- .../layout/preference_widget_fixed_switch.xml | 10 +- .../res/layout/progress_dialog_material.xml | 9 +- app/src/main/res/layout/scene_analytics.xml | 41 ++-- .../main/res/layout/scene_cookie_sign_in.xml | 56 +++--- app/src/main/res/layout/scene_download.xml | 51 ++--- .../res/layout/scene_excluded_languages.xml | 47 +++-- app/src/main/res/layout/scene_favorites.xml | 49 ++--- .../res/layout/scene_gallery_comments.xml | 46 +++-- .../main/res/layout/scene_gallery_detail.xml | 19 +- .../main/res/layout/scene_gallery_info.xml | 8 +- .../main/res/layout/scene_gallery_list.xml | 42 ++-- .../res/layout/scene_gallery_previews.xml | 8 +- app/src/main/res/layout/scene_history.xml | 18 +- app/src/main/res/layout/scene_label_list.xml | 14 +- app/src/main/res/layout/scene_login.xml | 52 +++-- app/src/main/res/layout/scene_progress.xml | 14 +- app/src/main/res/layout/scene_security.xml | 17 +- app/src/main/res/layout/scene_select_site.xml | 46 +++-- app/src/main/res/layout/scene_warning.xml | 38 ++-- app/src/main/res/layout/search_action.xml | 16 +- app/src/main/res/layout/search_advance.xml | 8 +- app/src/main/res/layout/search_category.xml | 14 +- app/src/main/res/layout/search_image.xml | 8 +- app/src/main/res/layout/search_normal.xml | 26 ++- .../layout/widget_advance_search_table.xml | 110 +++++------ .../main/res/layout/widget_category_table.xml | 101 +++++----- .../main/res/layout/widget_content_layout.xml | 18 +- .../res/layout/widget_gallery_guide_1.xml | 22 +-- .../res/layout/widget_gallery_guide_2.xml | 10 +- .../main/res/layout/widget_image_search.xml | 38 ++-- app/src/main/res/layout/widget_search_bar.xml | 30 ++- 94 files changed, 1306 insertions(+), 1496 deletions(-) diff --git a/app/src/main/res/layout/activity_dir_picker.xml b/app/src/main/res/layout/activity_dir_picker.xml index f6c243126..c0bf867e0 100644 --- a/app/src/main/res/layout/activity_dir_picker.xml +++ b/app/src/main/res/layout/activity_dir_picker.xml @@ -1,5 +1,4 @@ - - - + android:orientation="vertical" + android:padding="@dimen/keyline_margin"> + android:textSize="@dimen/text_little_small" /> + android:layout_weight="1" /> + android:textColor="?attr/colorAccent" /> + android:textColor="?attr/colorPrimary" /> diff --git a/app/src/main/res/layout/activity_filter.xml b/app/src/main/res/layout/activity_filter.xml index 6c24e2451..510f62c20 100644 --- a/app/src/main/res/layout/activity_filter.xml +++ b/app/src/main/res/layout/activity_filter.xml @@ -1,5 +1,4 @@ - - - @@ -24,16 +22,16 @@ android:id="@+id/recycler_view" android:layout_width="match_parent" android:layout_height="match_parent" - android:padding="@dimen/keyline_margin"/> + android:padding="@dimen/keyline_margin" /> + android:gravity="center_horizontal" + android:text="@string/no_filter" /> diff --git a/app/src/main/res/layout/activity_gallery.xml b/app/src/main/res/layout/activity_gallery.xml index bd179bc96..6030066c5 100644 --- a/app/src/main/res/layout/activity_gallery.xml +++ b/app/src/main/res/layout/activity_gallery.xml @@ -1,5 +1,4 @@ - - - @@ -24,7 +22,7 @@ + android:layout_height="match_parent" /> + android:textColor="?android:attr/textColorSecondary" /> + android:textColor="?android:attr/textColorSecondary" /> - + app:warningColor="@color/red_500" /> @@ -68,11 +65,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:orientation="horizontal" android:background="?attr/gallerySliderBackgroundColor" android:fitsSystemWindows="true" + android:orientation="horizontal" + android:paddingLeft="16dp" + android:paddingRight="16dp" android:visibility="invisible"> + android:gravity="center_horizontal" /> + android:layout_gravity="center_vertical" /> @@ -100,7 +97,7 @@ android:layout_width="32dp" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:gravity="center_horizontal"/> + android:gravity="center_horizontal" /> diff --git a/app/src/main/res/layout/activity_hosts.xml b/app/src/main/res/layout/activity_hosts.xml index ab6e0ec62..2f3bed602 100644 --- a/app/src/main/res/layout/activity_hosts.xml +++ b/app/src/main/res/layout/activity_hosts.xml @@ -1,5 +1,4 @@ - - - - - + android:orientation="vertical"> - + - + - + - + + + diff --git a/app/src/main/res/layout/activity_my_tags.xml b/app/src/main/res/layout/activity_my_tags.xml index 841181f7f..f3f45dbff 100644 --- a/app/src/main/res/layout/activity_my_tags.xml +++ b/app/src/main/res/layout/activity_my_tags.xml @@ -1,5 +1,4 @@ - - - - - + android:layout_height="match_parent" + android:animateLayoutChanges="true" + android:orientation="vertical"> - + + + diff --git a/app/src/main/res/layout/activity_set_security.xml b/app/src/main/res/layout/activity_set_security.xml index 8c8b6d79b..47cd459a6 100755 --- a/app/src/main/res/layout/activity_set_security.xml +++ b/app/src/main/res/layout/activity_set_security.xml @@ -1,5 +1,4 @@ - - - + android:layout_height="match_parent" + android:orientation="vertical"> + android:text="@string/set_pattern_protection_tip" + android:textAppearance="@style/TextAppearance.AppCompat.Medium" /> - + app:maxHeight="320dp" + app:maxWidth="320dp"> + android:layout_height="wrap_content" /> @@ -57,20 +54,20 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:layout_marginBottom="20dp" - android:visibility="gone" - android:text="@string/enable_fingerprint" /> + android:text="@string/enable_fingerprint" + android:visibility="gone" /> + android:paddingRight="12dp" + android:paddingBottom="4dp">