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">
+ android:text="@android:string/cancel"
+ android:textColor="?attr/colorAccent" />
+ android:text="@string/set"
+ android:textColor="?attr/colorPrimary" />
diff --git a/app/src/main/res/layout/activity_toolbar.xml b/app/src/main/res/layout/activity_toolbar.xml
index e1500e16b..1891bcf7a 100644
--- a/app/src/main/res/layout/activity_toolbar.xml
+++ b/app/src/main/res/layout/activity_toolbar.xml
@@ -1,5 +1,4 @@
-
-
-
+
+
diff --git a/app/src/main/res/layout/activity_u_config.xml b/app/src/main/res/layout/activity_u_config.xml
index 841181f7f..f3f45dbff 100644
--- a/app/src/main/res/layout/activity_u_config.xml
+++ b/app/src/main/res/layout/activity_u_config.xml
@@ -1,5 +1,4 @@
-
-
-
-
-
+ android:layout_height="match_parent"
+ android:animateLayoutChanges="true"
+ android:orientation="vertical">
-
+
+
+
diff --git a/app/src/main/res/layout/alert_dialog_progress_material.xml b/app/src/main/res/layout/alert_dialog_progress_material.xml
index 2ebc36616..c0ac90549 100644
--- a/app/src/main/res/layout/alert_dialog_progress_material.xml
+++ b/app/src/main/res/layout/alert_dialog_progress_material.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:textColor="@android:color/white"
+ android:textSize="@dimen/text_little_small"
+ android:textStyle="bold" />
diff --git a/app/src/main/res/layout/dialog_add_filter.xml b/app/src/main/res/layout/dialog_add_filter.xml
index 391d36016..c11f98870 100644
--- a/app/src/main/res/layout/dialog_add_filter.xml
+++ b/app/src/main/res/layout/dialog_add_filter.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:entries="@array/filter_entries" />
+ android:singleLine="true" />
diff --git a/app/src/main/res/layout/dialog_archive_list.xml b/app/src/main/res/layout/dialog_archive_list.xml
index 4f9f8ad95..cfc328402 100644
--- a/app/src/main/res/layout/dialog_archive_list.xml
+++ b/app/src/main/res/layout/dialog_archive_list.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:layout_gravity="center" />
+ android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+ android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/dialog_checkbox_builder.xml b/app/src/main/res/layout/dialog_checkbox_builder.xml
index ca5ab1f9c..6deedda71 100644
--- a/app/src/main/res/layout/dialog_checkbox_builder.xml
+++ b/app/src/main/res/layout/dialog_checkbox_builder.xml
@@ -1,5 +1,4 @@
-
-
-
@@ -34,7 +32,7 @@
android:layout_height="wrap_content"
android:paddingLeft="?attr/dialogPreferredPadding"
android:paddingTop="@dimen/abc_dialog_padding_top_material"
- android:paddingRight="?attr/dialogPreferredPadding"/>
+ android:paddingRight="?attr/dialogPreferredPadding" />
@@ -44,6 +42,6 @@
android:layout_height="wrap_content"
android:layout_marginLeft="?attr/dialogPreferredPadding"
android:layout_marginTop="@dimen/abc_dialog_padding_top_material"
- android:layout_marginRight="?attr/dialogPreferredPadding"/>
+ android:layout_marginRight="?attr/dialogPreferredPadding" />
diff --git a/app/src/main/res/layout/dialog_donate.xml b/app/src/main/res/layout/dialog_donate.xml
index c2e02b9ea..942c4eccd 100644
--- a/app/src/main/res/layout/dialog_donate.xml
+++ b/app/src/main/res/layout/dialog_donate.xml
@@ -1,5 +1,4 @@
-
-
-
-
-
-
-
-
-
+ android:orientation="vertical"
+ android:padding="@dimen/keyline_margin">
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/keyline_margin" />
+
+
+
+
+ android:id="@+id/alipay_copy"
+ style="@style/Widget.AppCompat.Button.Borderless.Colored"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:text="@string/settings_about_donate_copy" />
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/dialog_edittext_builder.xml b/app/src/main/res/layout/dialog_edittext_builder.xml
index 4376ff1ac..ec3074846 100644
--- a/app/src/main/res/layout/dialog_edittext_builder.xml
+++ b/app/src/main/res/layout/dialog_edittext_builder.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:singleLine="true" />
diff --git a/app/src/main/res/layout/dialog_gallery_menu.xml b/app/src/main/res/layout/dialog_gallery_menu.xml
index 6435d5736..b882f2ceb 100644
--- a/app/src/main/res/layout/dialog_gallery_menu.xml
+++ b/app/src/main/res/layout/dialog_gallery_menu.xml
@@ -1,5 +1,4 @@
-
-
-
-
+ android:textColor="?android:attr/textColorPrimary" />
+ android:layout_weight="2"
+ android:entries="@array/screen_rotation_entries" />
@@ -61,18 +58,18 @@
+ android:textColor="?android:attr/textColorPrimary" />
+ android:layout_weight="2"
+ android:entries="@array/reading_direction_entries" />
@@ -84,18 +81,18 @@
+ android:textColor="?android:attr/textColorPrimary" />
+ android:layout_weight="2"
+ android:entries="@array/page_scaling_entries" />
@@ -107,18 +104,18 @@
+ android:textColor="?android:attr/textColorPrimary" />
+ android:layout_weight="2"
+ android:entries="@array/start_position_entries" />
@@ -127,62 +124,62 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_read_keep_screen_on"
- android:textColor="?android:attr/textColorPrimary"/>
+ android:textColor="?android:attr/textColorPrimary" />
+ android:textColor="?android:attr/textColorPrimary" />
+ android:textColor="?android:attr/textColorPrimary" />
+ android:textColor="?android:attr/textColorPrimary" />
+ android:id="@+id/show_page_interval"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/settings_read_show_page_interval"
+ android:textColor="?android:attr/textColorPrimary" />
+ android:textColor="?android:attr/textColorPrimary" />
+ android:textColor="?android:attr/textColorPrimary" />
+ android:textColor="?android:attr/textColorPrimary" />
+ android:max="200" />
diff --git a/app/src/main/res/layout/dialog_go_to.xml b/app/src/main/res/layout/dialog_go_to.xml
index 756410e52..f135375fb 100644
--- a/app/src/main/res/layout/dialog_go_to.xml
+++ b/app/src/main/res/layout/dialog_go_to.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:paddingTop="16dp"
+ android:paddingRight="16dp">
+ android:gravity="center_horizontal" />
+ android:layout_gravity="center_horizontal"
+ android:layout_weight="1" />
+ android:gravity="center_horizontal" />
diff --git a/app/src/main/res/layout/dialog_hosts.xml b/app/src/main/res/layout/dialog_hosts.xml
index 93e125d9e..e67076ea0 100644
--- a/app/src/main/res/layout/dialog_hosts.xml
+++ b/app/src/main/res/layout/dialog_hosts.xml
@@ -1,5 +1,4 @@
-
-
-
-
-
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:paddingLeft="?attr/dialogPreferredPadding"
+ android:paddingTop="@dimen/abc_dialog_padding_top_material"
+ android:paddingRight="?attr/dialogPreferredPadding">
-
+
-
+
-
+
-
+
-
+
+
+
diff --git a/app/src/main/res/layout/dialog_item_select_with_icon.xml b/app/src/main/res/layout/dialog_item_select_with_icon.xml
index 46f23f217..b2bef3510 100644
--- a/app/src/main/res/layout/dialog_item_select_with_icon.xml
+++ b/app/src/main/res/layout/dialog_item_select_with_icon.xml
@@ -1,5 +1,4 @@
-
-
-
-
-
+ android:orientation="vertical"
+ android:padding="@dimen/keyline_margin">
-
+
+
+
diff --git a/app/src/main/res/layout/dialog_list_checkbox_builder.xml b/app/src/main/res/layout/dialog_list_checkbox_builder.xml
index 3f2897d2f..0346dc5f8 100644
--- a/app/src/main/res/layout/dialog_list_checkbox_builder.xml
+++ b/app/src/main/res/layout/dialog_list_checkbox_builder.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
-
+ android:scrollbars="vertical" />
+ android:layout_marginBottom="@dimen/abc_dialog_padding_top_material" />
diff --git a/app/src/main/res/layout/dialog_rate.xml b/app/src/main/res/layout/dialog_rate.xml
index 8971831cf..0446df02d 100644
--- a/app/src/main/res/layout/dialog_rate.xml
+++ b/app/src/main/res/layout/dialog_rate.xml
@@ -1,5 +1,4 @@
-
-
-
-
+
+ android:textColor="?android:attr/textColorPrimary"
+ android:textSize="@dimen/text_little_small" />
+ android:theme="@style/RatingBarTheme" />
diff --git a/app/src/main/res/layout/dialog_recycler_view.xml b/app/src/main/res/layout/dialog_recycler_view.xml
index d841fa7cc..42b227cf9 100644
--- a/app/src/main/res/layout/dialog_recycler_view.xml
+++ b/app/src/main/res/layout/dialog_recycler_view.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:paddingBottom="@dimen/abc_dialog_padding_top_material" />
diff --git a/app/src/main/res/layout/dialog_torrent_list.xml b/app/src/main/res/layout/dialog_torrent_list.xml
index 4f9f8ad95..cfc328402 100644
--- a/app/src/main/res/layout/dialog_torrent_list.xml
+++ b/app/src/main/res/layout/dialog_torrent_list.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:layout_gravity="center" />
+ android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+ android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/gallery_detail_actions.xml b/app/src/main/res/layout/gallery_detail_actions.xml
index 741380609..f91818fd2 100644
--- a/app/src/main/res/layout/gallery_detail_actions.xml
+++ b/app/src/main/res/layout/gallery_detail_actions.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:textColor="?android:attr/textColorPrimary" />
+ android:textColor="?android:attr/textColorPrimary" />
@@ -70,54 +68,54 @@
android:id="@+id/rate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:drawablePadding="8dp"
android:gravity="center_horizontal"
android:text="@string/rate"
- android:drawablePadding="8dp"
- android:textColor="?android:attr/textColorPrimary"/>
+ android:textColor="?android:attr/textColorPrimary" />
+ android:textColor="?android:attr/textColorPrimary" />
+ android:gravity="center_horizontal"
+ android:textColor="?android:attr/textColorPrimary" />
+ android:gravity="center_horizontal"
+ android:text="@string/archive"
+ android:textColor="?android:attr/textColorPrimary" />
+ android:textColor="?android:attr/textColorPrimary" />
+ android:textColor="?android:attr/textColorPrimary" />
@@ -126,16 +124,16 @@
android:id="@+id/rating"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
android:layout_gravity="center_horizontal"
+ android:layout_marginTop="8dp"
android:isIndicator="true"
- android:theme="@style/RatingBarTheme"/>
+ android:theme="@style/RatingBarTheme" />
+ android:textColor="?android:attr/textColorPrimary" />
diff --git a/app/src/main/res/layout/gallery_detail_comments.xml b/app/src/main/res/layout/gallery_detail_comments.xml
index 958799e38..f7cb697eb 100644
--- a/app/src/main/res/layout/gallery_detail_comments.xml
+++ b/app/src/main/res/layout/gallery_detail_comments.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:textColor="?attr/textColorThemeAccent" />
diff --git a/app/src/main/res/layout/gallery_detail_content.xml b/app/src/main/res/layout/gallery_detail_content.xml
index 07839b7cc..a39e73e4b 100644
--- a/app/src/main/res/layout/gallery_detail_content.xml
+++ b/app/src/main/res/layout/gallery_detail_content.xml
@@ -1,5 +1,4 @@
-
-
-
-
+
+ android:dividerPadding="@dimen/keyline_margin"
+ android:orientation="vertical"
+ android:showDividers="middle">
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/app/src/main/res/layout/gallery_detail_header.xml b/app/src/main/res/layout/gallery_detail_header.xml
index d1fc6c1f8..2f5eaba60 100644
--- a/app/src/main/res/layout/gallery_detail_header.xml
+++ b/app/src/main/res/layout/gallery_detail_header.xml
@@ -1,5 +1,4 @@
-
-
-
@@ -31,16 +29,16 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
- android:background="?attr/galleryDetailHeaderBackgroundColor"/>
+ android:background="?attr/galleryDetailHeaderBackgroundColor" />
+ android:background="@drawable/shadow_bottom" />
+ android:layout_height="24dp" />
@@ -57,78 +55,76 @@
android:id="@+id/thumb"
android:layout_width="@dimen/gallery_detail_thumb_width"
android:layout_height="@dimen/gallery_detail_thumb_height"
- android:layout_marginTop="@dimen/keyline_margin"
android:layout_marginLeft="@dimen/keyline_margin"
- android:layout_marginBottom="@dimen/keyline_margin"/>
+ android:layout_marginTop="@dimen/keyline_margin"
+ android:layout_marginBottom="@dimen/keyline_margin" />
+ android:textColor="@android:color/white"
+ android:textSize="@dimen/text_little_large" />
+ android:textColor="?attr/galleryDetailHeaderTitleColor"
+ android:textSize="@dimen/text_little_small" />
+ android:textStyle="bold" />
-
+ app:srcCompat="@drawable/v_dots_vertical_secondary_dark_x24" />
-
+ app:cardBackgroundColor="?attr/galleryDetailButtonBackgroundColor">
+ android:textColor="?attr/textColorThemePrimary" />
+ android:layout_marginBottom="8dp"
+ android:background="?attr/dividerColor" />
+ android:text="@string/read"
+ android:textColor="?attr/textColorThemeAccent" />
diff --git a/app/src/main/res/layout/gallery_detail_info.xml b/app/src/main/res/layout/gallery_detail_info.xml
index 9b77faa45..073386c6a 100644
--- a/app/src/main/res/layout/gallery_detail_info.xml
+++ b/app/src/main/res/layout/gallery_detail_info.xml
@@ -1,5 +1,4 @@
-
-
-
+
+ android:textColor="?android:attr/textColorPrimary" />
+ android:textColor="?android:attr/textColorPrimary" />
+ android:textColor="?android:attr/textColorPrimary" />
-
+
+ android:textColor="?android:attr/textColorPrimary" />
+ android:textColor="?android:attr/textColorPrimary" />
@@ -88,6 +86,6 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="16dp"
android:text="@string/more_information"
- android:textColor="?attr/textColorThemeAccent"/>
+ android:textColor="?attr/textColorThemeAccent" />
diff --git a/app/src/main/res/layout/gallery_detail_previews.xml b/app/src/main/res/layout/gallery_detail_previews.xml
index 1f01daac2..fd1739373 100644
--- a/app/src/main/res/layout/gallery_detail_previews.xml
+++ b/app/src/main/res/layout/gallery_detail_previews.xml
@@ -1,5 +1,4 @@
-
-
-
-
+ app:itemMargin="8dp" />
+ android:textColor="?attr/textColorThemeAccent" />
diff --git a/app/src/main/res/layout/gallery_detail_progress.xml b/app/src/main/res/layout/gallery_detail_progress.xml
index 90cc52b18..e2271ba0a 100644
--- a/app/src/main/res/layout/gallery_detail_progress.xml
+++ b/app/src/main/res/layout/gallery_detail_progress.xml
@@ -1,5 +1,4 @@
-
-
-
@@ -26,6 +24,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:layout_margin="@dimen/keyline_margin"/>
+ android:layout_margin="@dimen/keyline_margin" />
diff --git a/app/src/main/res/layout/gallery_detail_tags.xml b/app/src/main/res/layout/gallery_detail_tags.xml
index dae995ef6..8d625be43 100644
--- a/app/src/main/res/layout/gallery_detail_tags.xml
+++ b/app/src/main/res/layout/gallery_detail_tags.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:text="@string/no_tags"
+ android:textColor="?attr/textColorThemeAccent" />
diff --git a/app/src/main/res/layout/gallery_tag_group.xml b/app/src/main/res/layout/gallery_tag_group.xml
index 919ffa647..e98cd001d 100644
--- a/app/src/main/res/layout/gallery_tag_group.xml
+++ b/app/src/main/res/layout/gallery_tag_group.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:paddingRight="@dimen/keyline_margin" />
diff --git a/app/src/main/res/layout/item_cute_spinner_item.xml b/app/src/main/res/layout/item_cute_spinner_item.xml
index 99b34f10d..aa9366cbc 100644
--- a/app/src/main/res/layout/item_cute_spinner_item.xml
+++ b/app/src/main/res/layout/item_cute_spinner_item.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:ellipsize="marquee"
+ android:singleLine="true" />
diff --git a/app/src/main/res/layout/item_dir_explorer.xml b/app/src/main/res/layout/item_dir_explorer.xml
index 5acc2591b..4b6ad90ee 100644
--- a/app/src/main/res/layout/item_dir_explorer.xml
+++ b/app/src/main/res/layout/item_dir_explorer.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:padding="8dp" />
diff --git a/app/src/main/res/layout/item_download.xml b/app/src/main/res/layout/item_download.xml
index 4f3ac87d8..056d78b04 100644
--- a/app/src/main/res/layout/item_download.xml
+++ b/app/src/main/res/layout/item_download.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:layout_margin="2dp">
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ android:id="@+id/thumb"
+ android:layout_width="@dimen/gallery_list_thumb_width"
+ android:layout_height="@dimen/gallery_list_thumb_height"
+ app:maxAspect="1.333"
+ app:minAspect="0.333"
+ app:retryType="longClick" />
+ android:id="@+id/title"
+ style="@style/CardTitle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_marginLeft="8dp"
+ android:layout_marginTop="4dp"
+ android:layout_marginRight="8dp"
+ android:layout_toRightOf="@id/thumb" />
+ android:id="@+id/uploader"
+ style="@style/CardMessage"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/title"
+ android:layout_alignLeft="@id/title"
+ android:layout_marginTop="2dp" />
+ android:id="@+id/rating"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/uploader"
+ android:layout_alignLeft="@id/title"
+ android:layout_marginTop="2dp" />
+ android:id="@+id/category"
+ style="@style/CardMessage"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignLeft="@id/title"
+ android:layout_alignBottom="@id/thumb"
+ android:layout_marginBottom="8dp"
+ android:paddingLeft="8dp"
+ android:paddingTop="2dp"
+ android:paddingRight="8dp"
+ android:paddingBottom="2dp"
+ android:textAllCaps="true"
+ android:textColor="@android:color/white" />
+ android:id="@+id/actions"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@+id/thumb"
+ android:layout_alignParentRight="true"
+ android:paddingRight="8dp">
+ android:id="@+id/start"
+ android:layout_width="40dp"
+ android:layout_height="40dp"
+ android:padding="8dp"
+ app:srcCompat="@drawable/v_play_x24" />
+ android:id="@+id/stop"
+ android:layout_width="40dp"
+ android:layout_height="40dp"
+ android:padding="8dp"
+ app:srcCompat="@drawable/v_pause_x24" />
+ android:id="@+id/state"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_above="@id/actions"
+ android:layout_alignParentRight="true"
+ android:layout_marginBottom="4dp"
+ android:paddingRight="16dp"
+ android:textColor="?attr/textColorThemeAccent" />
+ android:id="@+id/progress_bar"
+ style="?android:attr/progressBarStyleHorizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_above="@id/actions"
+ android:layout_alignLeft="@id/title"
+ android:layout_marginRight="8dp"
+ android:indeterminate="false" />
+ android:id="@+id/percent"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_above="@id/progress_bar"
+ android:layout_alignLeft="@id/title"
+ android:textSize="@dimen/text_super_small" />
+ android:id="@+id/speed"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_above="@id/progress_bar"
+ android:layout_alignParentRight="true"
+ android:layout_marginRight="8dp"
+ android:textSize="@dimen/text_super_small" />
diff --git a/app/src/main/res/layout/item_download_label.xml b/app/src/main/res/layout/item_download_label.xml
index 8991d4e66..dc449552e 100644
--- a/app/src/main/res/layout/item_download_label.xml
+++ b/app/src/main/res/layout/item_download_label.xml
@@ -1,5 +1,4 @@
-
-
-
@@ -25,49 +23,47 @@
android:id="@+id/swipe_handler"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
- android:background="?attr/contentColorPrimary">
+ android:background="?attr/contentColorPrimary"
+ android:orientation="vertical">
-
+ app:srcCompat="@drawable/v_delete_x24" />
+ android:textColor="?android:attr/textColorPrimary"
+ android:textSize="@dimen/text_little_small" />
-
+ app:srcCompat="@drawable/v_reorder_x24" />
+ android:background="?attr/dividerColor" />
diff --git a/app/src/main/res/layout/item_drawer_favorites.xml b/app/src/main/res/layout/item_drawer_favorites.xml
index 96681525c..82ef49f73 100644
--- a/app/src/main/res/layout/item_drawer_favorites.xml
+++ b/app/src/main/res/layout/item_drawer_favorites.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:orientation="horizontal">
+ android:paddingLeft="?attr/listPreferredItemPaddingLeft"
+ android:textAppearance="?attr/textAppearanceListItemSmall"
+ android:textColor="?android:attr/textColorPrimary" />
+ android:paddingRight="?attr/listPreferredItemPaddingRight"
+ android:textAppearance="?attr/textAppearanceListItemSmall"
+ android:textColor="?android:attr/textColorPrimary" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_excluded_languages.xml b/app/src/main/res/layout/item_excluded_languages.xml
index 918c11d96..f1d51bfcd 100644
--- a/app/src/main/res/layout/item_excluded_languages.xml
+++ b/app/src/main/res/layout/item_excluded_languages.xml
@@ -1,5 +1,4 @@
-
-
-
@@ -25,21 +23,21 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:textColor="?android:attr/textColorPrimary"/>
+ android:textColor="?android:attr/textColorPrimary" />
+ android:layout_weight="1" />
+ android:layout_weight="1" />
+ android:layout_weight="1" />
diff --git a/app/src/main/res/layout/item_filter.xml b/app/src/main/res/layout/item_filter.xml
index e8d727933..485298785 100644
--- a/app/src/main/res/layout/item_filter.xml
+++ b/app/src/main/res/layout/item_filter.xml
@@ -1,5 +1,4 @@
-
-
-
@@ -24,41 +22,40 @@
+ android:background="?attr/contentColorPrimary"
+ android:orientation="vertical">
-
+ app:srcCompat="@drawable/v_copy_x24" />
+ android:textColor="?android:attr/textColorPrimary"
+ android:textSize="@dimen/text_little_small" />
+ android:background="?attr/dividerColor" />
diff --git a/app/src/main/res/layout/item_filter_header.xml b/app/src/main/res/layout/item_filter_header.xml
index 888f921ea..fc0018fec 100644
--- a/app/src/main/res/layout/item_filter_header.xml
+++ b/app/src/main/res/layout/item_filter_header.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:textColor="?android:attr/textColorPrimary" />
diff --git a/app/src/main/res/layout/item_gallery_comment.xml b/app/src/main/res/layout/item_gallery_comment.xml
index 288b65583..8a48140ba 100644
--- a/app/src/main/res/layout/item_gallery_comment.xml
+++ b/app/src/main/res/layout/item_gallery_comment.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:paddingRight="@dimen/keyline_margin"
+ android:paddingBottom="8dp">
+ android:layout_height="wrap_content" />
+ android:layout_alignParentRight="true" />
+ android:textColor="?android:attr/textColorPrimary" />
diff --git a/app/src/main/res/layout/item_gallery_comment_more.xml b/app/src/main/res/layout/item_gallery_comment_more.xml
index e2ff81779..9bd6c5fc1 100644
--- a/app/src/main/res/layout/item_gallery_comment_more.xml
+++ b/app/src/main/res/layout/item_gallery_comment_more.xml
@@ -1,5 +1,4 @@
-
-
-
@@ -26,6 +24,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:text="@string/click_more_comments"/>
+ android:text="@string/click_more_comments" />
diff --git a/app/src/main/res/layout/item_gallery_comment_progress.xml b/app/src/main/res/layout/item_gallery_comment_progress.xml
index 6fe4c4893..43c62908b 100644
--- a/app/src/main/res/layout/item_gallery_comment_progress.xml
+++ b/app/src/main/res/layout/item_gallery_comment_progress.xml
@@ -1,5 +1,4 @@
-
-
-
@@ -26,6 +24,6 @@
style="@style/ProgressView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"/>
+ android:layout_gravity="center" />
diff --git a/app/src/main/res/layout/item_gallery_grid.xml b/app/src/main/res/layout/item_gallery_grid.xml
index 84d5cc122..cc946a8c5 100644
--- a/app/src/main/res/layout/item_gallery_grid.xml
+++ b/app/src/main/res/layout/item_gallery_grid.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:layout_margin="2dp">
-
+ android:scaleType="centerCrop"
+ app:retryType="none" />
+ android:layout_gravity="top|right" />
-
+ tools:ignore="SpUsage" />
diff --git a/app/src/main/res/layout/item_gallery_info_data.xml b/app/src/main/res/layout/item_gallery_info_data.xml
index b1a20a013..36e2aba32 100644
--- a/app/src/main/res/layout/item_gallery_info_data.xml
+++ b/app/src/main/res/layout/item_gallery_info_data.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:padding="8dp"
+ android:textColor="?android:attr/textColorPrimary" />
+ android:padding="8dp"
+ android:textColor="?android:attr/textColorPrimary" />
diff --git a/app/src/main/res/layout/item_gallery_info_header.xml b/app/src/main/res/layout/item_gallery_info_header.xml
index f30497c82..c24f1377e 100644
--- a/app/src/main/res/layout/item_gallery_info_header.xml
+++ b/app/src/main/res/layout/item_gallery_info_header.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:padding="8dp"
+ android:textColor="?android:attr/textColorSecondary" />
+ android:padding="8dp"
+ android:textColor="?android:attr/textColorSecondary" />
diff --git a/app/src/main/res/layout/item_gallery_list.xml b/app/src/main/res/layout/item_gallery_list.xml
index 0a9f2d8a3..51d7d4d57 100644
--- a/app/src/main/res/layout/item_gallery_list.xml
+++ b/app/src/main/res/layout/item_gallery_list.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:layout_margin="2dp">
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ android:id="@+id/thumb"
+ android:layout_width="@dimen/gallery_list_thumb_width"
+ android:layout_height="@dimen/gallery_list_thumb_height"
+ app:maxAspect="1.333"
+ app:minAspect="0.333"
+ app:retryType="click" />
+ android:id="@+id/title"
+ style="@style/CardTitle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_marginLeft="8dp"
+ android:layout_marginTop="4dp"
+ android:layout_marginRight="8dp"
+ android:layout_toRightOf="@id/thumb" />
+ android:id="@+id/uploader"
+ style="@style/CardMessage"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/title"
+ android:layout_alignLeft="@id/title"
+ android:layout_marginTop="2dp" />
+ android:id="@+id/category"
+ style="@style/CardMessage"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignLeft="@id/title"
+ android:layout_alignBottom="@id/thumb"
+ android:layout_marginBottom="8dp"
+ android:paddingLeft="8dp"
+ android:paddingTop="2dp"
+ android:paddingRight="8dp"
+ android:paddingBottom="2dp"
+ android:textAllCaps="true"
+ android:textColor="@android:color/white" />
+ android:id="@+id/rating"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_above="@id/category"
+ android:layout_alignLeft="@id/title"
+ android:layout_marginBottom="4dp" />
+ android:id="@+id/posted"
+ style="@style/CardMessage"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@id/thumb"
+ android:layout_alignParentRight="true"
+ android:layout_marginRight="6dp"
+ android:layout_marginBottom="4dp" />
-
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ android:showDividers="middle">
+ app:srcCompat="@drawable/v_download_x16" />
+ app:srcCompat="@drawable/v_heart_x16" />
+ android:layout_height="wrap_content" />
+ android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/item_gallery_list_thumb_height.xml b/app/src/main/res/layout/item_gallery_list_thumb_height.xml
index c81e3215c..e9b20da10 100644
--- a/app/src/main/res/layout/item_gallery_list_thumb_height.xml
+++ b/app/src/main/res/layout/item_gallery_list_thumb_height.xml
@@ -1,5 +1,4 @@
-
-
-
-
-
+ android:orientation="vertical">
-
+
-
+
-
+
+
+
diff --git a/app/src/main/res/layout/item_gallery_preview.xml b/app/src/main/res/layout/item_gallery_preview.xml
index 9055836b1..76823450c 100644
--- a/app/src/main/res/layout/item_gallery_preview.xml
+++ b/app/src/main/res/layout/item_gallery_preview.xml
@@ -1,5 +1,4 @@
-
-
-
-
+ auto:retryType="longClick" />
+ android:gravity="center" />
diff --git a/app/src/main/res/layout/item_gallery_tag.xml b/app/src/main/res/layout/item_gallery_tag.xml
index dda62e779..70c56f537 100644
--- a/app/src/main/res/layout/item_gallery_tag.xml
+++ b/app/src/main/res/layout/item_gallery_tag.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:textColor="@android:color/white" />
diff --git a/app/src/main/res/layout/item_history.xml b/app/src/main/res/layout/item_history.xml
index 20c4715e3..136dc7299 100644
--- a/app/src/main/res/layout/item_history.xml
+++ b/app/src/main/res/layout/item_history.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:id="@+id/card"
+ layout="@layout/item_gallery_list" />
diff --git a/app/src/main/res/layout/item_hosts.xml b/app/src/main/res/layout/item_hosts.xml
index f48e93707..5e3019b80 100644
--- a/app/src/main/res/layout/item_hosts.xml
+++ b/app/src/main/res/layout/item_hosts.xml
@@ -1,5 +1,4 @@
-
-
-
-
-
+ android:orientation="vertical"
+ android:paddingLeft="@dimen/keyline_margin"
+ android:paddingTop="8dp"
+ android:paddingRight="@dimen/keyline_margin"
+ android:paddingBottom="8dp">
-
+
+
+
diff --git a/app/src/main/res/layout/item_preference_header.xml b/app/src/main/res/layout/item_preference_header.xml
index f2ddb7da0..effb7000b 100644
--- a/app/src/main/res/layout/item_preference_header.xml
+++ b/app/src/main/res/layout/item_preference_header.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:orientation="horizontal">
+ android:contentDescription="@null"
+ android:scaleType="centerInside" />
+ android:singleLine="true"
+ android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+ android:textColor="?android:attr/textColorPrimary" />
+ android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/item_quick_search.xml b/app/src/main/res/layout/item_quick_search.xml
index 8991d4e66..dc449552e 100644
--- a/app/src/main/res/layout/item_quick_search.xml
+++ b/app/src/main/res/layout/item_quick_search.xml
@@ -1,5 +1,4 @@
-
-
-
@@ -25,49 +23,47 @@
android:id="@+id/swipe_handler"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
- android:background="?attr/contentColorPrimary">
+ android:background="?attr/contentColorPrimary"
+ android:orientation="vertical">
-
+ app:srcCompat="@drawable/v_delete_x24" />
+ android:textColor="?android:attr/textColorPrimary"
+ android:textSize="@dimen/text_little_small" />
-
+ app:srcCompat="@drawable/v_reorder_x24" />
+ android:background="?attr/dividerColor" />
diff --git a/app/src/main/res/layout/item_select_dialog.xml b/app/src/main/res/layout/item_select_dialog.xml
index ffec2614a..b891cbabe 100644
--- a/app/src/main/res/layout/item_select_dialog.xml
+++ b/app/src/main/res/layout/item_select_dialog.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:textAppearance="?attr/textAppearanceListItemSmall"
+ android:textColor="?attr/textColorAlertDialogListItem" />
diff --git a/app/src/main/res/layout/item_simple_list.xml b/app/src/main/res/layout/item_simple_list.xml
index 53795f57a..c7b060f31 100644
--- a/app/src/main/res/layout/item_simple_list.xml
+++ b/app/src/main/res/layout/item_simple_list.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:textAppearance="?attr/textAppearanceListItemSmall" />
diff --git a/app/src/main/res/layout/item_simple_list_2.xml b/app/src/main/res/layout/item_simple_list_2.xml
index 61b7ceb16..b90a28559 100644
--- a/app/src/main/res/layout/item_simple_list_2.xml
+++ b/app/src/main/res/layout/item_simple_list_2.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:paddingRight="?attr/listPreferredItemPaddingRight"
+ android:paddingBottom="8dp">
+ android:textSize="@dimen/text_little_small" />
+ android:textSize="@dimen/text_small" />
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index a0cbf99aa..ab190ac90 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:layout_height="160dp"
+ android:orientation="vertical">
+ android:src="@drawable/sadpanda_low_poly" />
+ android:layout_marginBottom="48dp" />
+ android:textColor="@android:color/white"
+ android:textSize="@dimen/text_small" />
diff --git a/app/src/main/res/layout/preference_dialog_default_categories.xml b/app/src/main/res/layout/preference_dialog_default_categories.xml
index b82d462be..f000a94ae 100644
--- a/app/src/main/res/layout/preference_dialog_default_categories.xml
+++ b/app/src/main/res/layout/preference_dialog_default_categories.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:paddingRight="?attr/dialogPreferredPadding" />
diff --git a/app/src/main/res/layout/preference_dialog_excluded_tag_namespaces.xml b/app/src/main/res/layout/preference_dialog_excluded_tag_namespaces.xml
index af1191434..c625822d9 100644
--- a/app/src/main/res/layout/preference_dialog_excluded_tag_namespaces.xml
+++ b/app/src/main/res/layout/preference_dialog_excluded_tag_namespaces.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:layout_height="wrap_content">
+ tools:ignore="HardcodedText" />
+ tools:ignore="HardcodedText" />
+ android:layout_height="wrap_content">
+ tools:ignore="HardcodedText" />
+ tools:ignore="HardcodedText" />
+ android:layout_height="wrap_content">
+ tools:ignore="HardcodedText" />
+ tools:ignore="HardcodedText" />
+ android:layout_height="wrap_content">
+ tools:ignore="HardcodedText" />
+ tools:ignore="HardcodedText" />
diff --git a/app/src/main/res/layout/preference_dialog_proxy.xml b/app/src/main/res/layout/preference_dialog_proxy.xml
index e28c34618..834004f0c 100644
--- a/app/src/main/res/layout/preference_dialog_proxy.xml
+++ b/app/src/main/res/layout/preference_dialog_proxy.xml
@@ -1,5 +1,4 @@
-
-
-
@@ -28,9 +26,9 @@
android:id="@+id/type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:entries="@array/proxy_types"
android:paddingTop="8dp"
- android:paddingBottom="8dp"
- android:entries="@array/proxy_types"/>
+ android:paddingBottom="8dp" />
+ android:inputType="text" />
@@ -56,7 +54,7 @@
android:id="@+id/port"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:inputType="numberDecimal"/>
+ android:inputType="numberDecimal" />
diff --git a/app/src/main/res/layout/preference_dialog_task.xml b/app/src/main/res/layout/preference_dialog_task.xml
index a59347ccb..94bc7a23a 100644
--- a/app/src/main/res/layout/preference_dialog_task.xml
+++ b/app/src/main/res/layout/preference_dialog_task.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:paddingRight="?attr/dialogPreferredPadding"
+ android:paddingBottom="@dimen/abc_dialog_padding_top_material">
+ android:layout_gravity="center_vertical" />
+ android:text="@string/please_wait" />
diff --git a/app/src/main/res/layout/preference_widget_fixed_switch.xml b/app/src/main/res/layout/preference_widget_fixed_switch.xml
index f84ff37ff..b87044193 100644
--- a/app/src/main/res/layout/preference_widget_fixed_switch.xml
+++ b/app/src/main/res/layout/preference_widget_fixed_switch.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:focusable="false"
+ android:padding="16dp" />
diff --git a/app/src/main/res/layout/progress_dialog_material.xml b/app/src/main/res/layout/progress_dialog_material.xml
index 443d88acf..34b79f1bc 100644
--- a/app/src/main/res/layout/progress_dialog_material.xml
+++ b/app/src/main/res/layout/progress_dialog_material.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:orientation="vertical"
+ android:padding="@dimen/keyline_margin">
+ app:srcCompat="@drawable/v_chart_accent_x48" />
-
+ android:paddingBottom="@dimen/keyline_margin">
+ android:textSize="@dimen/text_little_small" />
@@ -59,15 +56,15 @@
+ android:paddingRight="12dp"
+ android:paddingBottom="4dp">
+ android:textStyle="bold" />
+ android:textStyle="bold" />
diff --git a/app/src/main/res/layout/scene_cookie_sign_in.xml b/app/src/main/res/layout/scene_cookie_sign_in.xml
index 1f3c31f2b..2a95008da 100644
--- a/app/src/main/res/layout/scene_cookie_sign_in.xml
+++ b/app/src/main/res/layout/scene_cookie_sign_in.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:orientation="vertical"
+ android:padding="@dimen/keyline_margin">
-
+ app:srcCompat="@drawable/v_cookie_brown_x48" />
-
+ android:paddingBottom="@dimen/keyline_margin">
+ android:textSize="@dimen/text_little_small" />
+ android:hint="ipb_member_id"
+ android:minWidth="@dimen/single_max_width">
+ tools:ignore="HardcodedText" />
@@ -85,8 +81,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
- android:minWidth="@dimen/single_max_width"
- android:hint="ipb_pass_hash">
+ android:hint="ipb_pass_hash"
+ android:minWidth="@dimen/single_max_width">
+ tools:ignore="HardcodedText" />
@@ -105,8 +101,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
- android:minWidth="@dimen/single_max_width"
- android:hint="igneous">
+ android:hint="igneous"
+ android:minWidth="@dimen/single_max_width">
+ android:paddingRight="12dp"
+ android:paddingBottom="4dp">
+ android:layout_weight="1" />
+ android:textStyle="bold" />
diff --git a/app/src/main/res/layout/scene_download.xml b/app/src/main/res/layout/scene_download.xml
index 9a0b8d460..85cf107d5 100644
--- a/app/src/main/res/layout/scene_download.xml
+++ b/app/src/main/res/layout/scene_download.xml
@@ -1,5 +1,4 @@
-
-
-
@@ -28,7 +26,7 @@
+ android:layout_height="match_parent" />
+ android:paddingRight="4dp"
+ android:paddingBottom="8dp" />
+ android:gravity="center_horizontal"
+ android:text="@string/no_download_info" />
-
+ app:fabSize="mini"
+ app:srcCompat="@drawable/v_check_all_dark_x24" />
+ app:fabSize="mini"
+ app:srcCompat="@drawable/v_play_dark_x24" />
+ app:fabSize="mini"
+ app:srcCompat="@drawable/v_pause_dark_x24" />
+ app:fabSize="mini"
+ app:srcCompat="@drawable/v_delete_dark_x24" />
+ app:fabSize="mini"
+ app:srcCompat="@drawable/v_folder_move_dark_x24" />
+ app:srcCompat="@drawable/v_close_dark_x24"
+ app:tint="#fff" />
diff --git a/app/src/main/res/layout/scene_excluded_languages.xml b/app/src/main/res/layout/scene_excluded_languages.xml
index 5e9ce4471..7bc7e7843 100644
--- a/app/src/main/res/layout/scene_excluded_languages.xml
+++ b/app/src/main/res/layout/scene_excluded_languages.xml
@@ -1,5 +1,4 @@
-
-
-
@@ -26,8 +24,8 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingLeft="@dimen/keyline_margin"
- android:paddingRight="@dimen/keyline_margin"
- android:paddingTop="8dp">
+ android:paddingTop="8dp"
+ android:paddingRight="@dimen/keyline_margin">
+ android:text="@android:string/cancel" />
+ android:background="?attr/dividerColor" />
+ android:text="@android:string/ok" />
@@ -61,8 +59,8 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingLeft="@dimen/keyline_margin"
- android:paddingRight="@dimen/keyline_margin"
- android:paddingTop="8dp">
+ android:paddingTop="8dp"
+ android:paddingRight="@dimen/keyline_margin">
+ android:text="@string/select_all" />
+ android:background="?attr/dividerColor" />
+ android:text="@string/deselect_all" />
+ android:background="?attr/dividerColor" />
+ android:text="@string/invert_selection" />
-
+ android:text="@string/language" />
+ android:text="@string/original" />
+ android:text="@string/translated" />
+ android:text="@string/rewrite" />
@@ -148,7 +145,7 @@
android:layout_height="1dp"
android:layout_marginLeft="@dimen/keyline_margin"
android:layout_marginRight="@dimen/keyline_margin"
- android:background="?attr/dividerColor"/>
+ android:background="?attr/dividerColor" />
+ android:paddingBottom="8dp" />
diff --git a/app/src/main/res/layout/scene_favorites.xml b/app/src/main/res/layout/scene_favorites.xml
index 89727bfc4..26863331f 100644
--- a/app/src/main/res/layout/scene_favorites.xml
+++ b/app/src/main/res/layout/scene_favorites.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:layout_height="match_parent" />
+ android:layout_marginRight="@dimen/gallery_search_bar_margin_h" />
-
+ app:fabSize="mini"
+ app:srcCompat="@drawable/v_go_to_dark_x24" />
+ app:fabSize="mini"
+ app:srcCompat="@drawable/v_refresh_dark_x24" />
+ app:fabSize="mini"
+ app:srcCompat="@drawable/v_download_dark_x24" />
+ app:fabSize="mini"
+ app:srcCompat="@drawable/v_delete_dark_x24" />
+ app:fabSize="mini"
+ app:srcCompat="@drawable/v_folder_move_dark_x24" />
+ app:tint="#fff" />
diff --git a/app/src/main/res/layout/scene_gallery_comments.xml b/app/src/main/res/layout/scene_gallery_comments.xml
index 9116f26fb..5e870c73f 100644
--- a/app/src/main/res/layout/scene_gallery_comments.xml
+++ b/app/src/main/res/layout/scene_gallery_comments.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+ android:clipToPadding="false" />
+ android:gravity="center_horizontal"
+ android:text="@string/no_one_comments_gallery" />
+ android:background="@drawable/shadow_top" />
+ android:background="?attr/contentColorThemePrimary"
+ android:orientation="horizontal">
+ android:theme="@style/CommentEditText" />
+ android:padding="16dp" />
@@ -87,14 +85,14 @@
android:paddingRight="@dimen/corner_fab_margin"
android:paddingBottom="@dimen/corner_fab_margin">
-
+ app:srcCompat="@drawable/v_reply_dark_x24"
+ app:tint="#fff" />
diff --git a/app/src/main/res/layout/scene_gallery_detail.xml b/app/src/main/res/layout/scene_gallery_detail.xml
index 62204b076..5768e6354 100644
--- a/app/src/main/res/layout/scene_gallery_detail.xml
+++ b/app/src/main/res/layout/scene_gallery_detail.xml
@@ -1,5 +1,4 @@
-
-
-
@@ -25,11 +23,10 @@
android:id="@+id/scroll_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:scrollbars="none"
- android:overScrollMode="never">
+ android:overScrollMode="never"
+ android:scrollbars="none">
-
+
@@ -38,15 +35,15 @@
style="@style/ProgressView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"/>
+ android:layout_gravity="center" />
+ android:gravity="center_horizontal" />
diff --git a/app/src/main/res/layout/scene_gallery_info.xml b/app/src/main/res/layout/scene_gallery_info.xml
index 57779664a..4c49787cc 100644
--- a/app/src/main/res/layout/scene_gallery_info.xml
+++ b/app/src/main/res/layout/scene_gallery_info.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:paddingBottom="@dimen/keyline_margin" />
diff --git a/app/src/main/res/layout/scene_gallery_list.xml b/app/src/main/res/layout/scene_gallery_list.xml
index d982c6bb7..9bbf009e7 100644
--- a/app/src/main/res/layout/scene_gallery_list.xml
+++ b/app/src/main/res/layout/scene_gallery_list.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:layout_height="match_parent" />
+ android:layout_height="match_parent" />
+ android:layout_marginRight="@dimen/gallery_search_bar_margin_h" />
-
+ app:fabSize="mini"
+ app:srcCompat="@drawable/v_go_to_dark_x24" />
+ app:fabSize="mini"
+ app:srcCompat="@drawable/v_refresh_dark_x24" />
+ app:tint="#fff" />
-
+ android:visibility="invisible"
+ app:backgroundTint="?attr/widgetColorThemeAccent"
+ app:srcCompat="@drawable/v_magnify_dark_x24"
+ app:tint="#fff" />
diff --git a/app/src/main/res/layout/scene_gallery_previews.xml b/app/src/main/res/layout/scene_gallery_previews.xml
index d8a09920a..3285305a5 100644
--- a/app/src/main/res/layout/scene_gallery_previews.xml
+++ b/app/src/main/res/layout/scene_gallery_previews.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/scene_history.xml b/app/src/main/res/layout/scene_history.xml
index 2c744732a..a26874972 100644
--- a/app/src/main/res/layout/scene_history.xml
+++ b/app/src/main/res/layout/scene_history.xml
@@ -1,5 +1,4 @@
-
-
-
@@ -28,7 +26,7 @@
+ android:layout_height="match_parent" />
+ android:paddingRight="4dp"
+ android:paddingBottom="8dp" />
+ android:gravity="center_horizontal"
+ android:text="@string/no_history" />
diff --git a/app/src/main/res/layout/scene_label_list.xml b/app/src/main/res/layout/scene_label_list.xml
index 11f2c4607..1450f6537 100644
--- a/app/src/main/res/layout/scene_label_list.xml
+++ b/app/src/main/res/layout/scene_label_list.xml
@@ -1,5 +1,4 @@
-
-
-
@@ -24,17 +22,17 @@
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:padding="@dimen/keyline_margin"
android:clipChildren="false"
- android:clipToPadding="false"/>
+ android:clipToPadding="false"
+ android:padding="@dimen/keyline_margin" />
+ android:gravity="center_horizontal" />
diff --git a/app/src/main/res/layout/scene_login.xml b/app/src/main/res/layout/scene_login.xml
index 0343a1f44..9b2732db0 100644
--- a/app/src/main/res/layout/scene_login.xml
+++ b/app/src/main/res/layout/scene_login.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+ android:src="@mipmap/ic_launcher" />
+ android:hint="@string/username"
+ android:minWidth="@dimen/single_max_width">
+ android:singleLine="true" />
+ android:singleLine="true" />
+ android:layout_weight="1" />
+ android:paddingRight="12dp"
+ android:paddingBottom="4dp">
+ android:text="@string/sign_in"
+ android:textStyle="bold" />
+ android:text="@string/register"
+ android:textStyle="bold" />
+ android:textColor="?attr/textColorThemeAccent" />
+ android:textColor="?attr/textColorThemeAccent" />
+ android:textColor="?attr/textColorThemeAccent" />
@@ -159,7 +157,7 @@
style="@style/ProgressView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"/>
+ android:layout_gravity="center" />
diff --git a/app/src/main/res/layout/scene_progress.xml b/app/src/main/res/layout/scene_progress.xml
index ea7c6dbfd..ced7a8ce1 100644
--- a/app/src/main/res/layout/scene_progress.xml
+++ b/app/src/main/res/layout/scene_progress.xml
@@ -1,5 +1,4 @@
-
-
-
@@ -25,16 +23,16 @@
style="@style/ProgressView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"/>
+ android:layout_gravity="center" />
+ android:gravity="center_horizontal"
+ android:text="@string/no_one_comments_gallery" />
diff --git a/app/src/main/res/layout/scene_security.xml b/app/src/main/res/layout/scene_security.xml
index f18817944..980ba2dea 100755
--- a/app/src/main/res/layout/scene_security.xml
+++ b/app/src/main/res/layout/scene_security.xml
@@ -1,5 +1,4 @@
-
-
-
-
+ app:maxHeight="360dp"
+ app:maxWidth="320dp">
+ android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/scene_select_site.xml b/app/src/main/res/layout/scene_select_site.xml
index b89205a04..c617fdd8a 100644
--- a/app/src/main/res/layout/scene_select_site.xml
+++ b/app/src/main/res/layout/scene_select_site.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:orientation="vertical"
+ android:padding="@dimen/keyline_margin">
-
+ android:text="@string/select_scene"
+ android:textAppearance="@style/TextAppearance.AppCompat.Title" />
+ android:layout_weight="1" />
+ android:text="@string/site_e"
+ android:textSize="@dimen/text_medium" />
+ android:text="@string/site_ex"
+ android:textSize="@dimen/text_medium" />
+ android:text="@string/select_scene_explain" />
+ android:layout_weight="1" />
@@ -94,23 +91,24 @@
+ android:paddingRight="12dp"
+ android:paddingBottom="4dp">
+
+ android:text="@android:string/ok"
+ android:textStyle="bold" />
diff --git a/app/src/main/res/layout/scene_warning.xml b/app/src/main/res/layout/scene_warning.xml
index eea0f9ecb..37d454505 100644
--- a/app/src/main/res/layout/scene_warning.xml
+++ b/app/src/main/res/layout/scene_warning.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:orientation="vertical"
+ android:padding="@dimen/keyline_margin">
+ app:srcCompat="@drawable/v_alert_red_x48" />
+ android:paddingBottom="@dimen/keyline_margin">
+ android:textSize="@dimen/text_little_small" />
@@ -58,15 +56,15 @@
+ android:paddingRight="12dp"
+ android:paddingBottom="4dp">
+ android:text="@string/accept"
+ android:textStyle="bold" />
+ android:text="@string/reject"
+ android:textStyle="bold" />
diff --git a/app/src/main/res/layout/search_action.xml b/app/src/main/res/layout/search_action.xml
index 87fc9ea34..2999cab96 100644
--- a/app/src/main/res/layout/search_action.xml
+++ b/app/src/main/res/layout/search_action.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:orientation="horizontal">
+ android:textStyle="bold" />
+ android:layout_weight="1" />
diff --git a/app/src/main/res/layout/search_advance.xml b/app/src/main/res/layout/search_advance.xml
index cfe7a0a4c..1e58c7a0b 100644
--- a/app/src/main/res/layout/search_advance.xml
+++ b/app/src/main/res/layout/search_advance.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/search_category.xml b/app/src/main/res/layout/search_category.xml
index 633c0f78a..2cddc9d77 100644
--- a/app/src/main/res/layout/search_category.xml
+++ b/app/src/main/res/layout/search_category.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:layout_margin="2dp">
+ android:saveEnabled="false" />
+ android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/search_image.xml b/app/src/main/res/layout/search_image.xml
index acb01206b..8399570e7 100644
--- a/app/src/main/res/layout/search_image.xml
+++ b/app/src/main/res/layout/search_image.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/search_normal.xml b/app/src/main/res/layout/search_normal.xml
index 43fd8eb82..6517166fd 100644
--- a/app/src/main/res/layout/search_normal.xml
+++ b/app/src/main/res/layout/search_normal.xml
@@ -1,5 +1,4 @@
-
-
-
+ android:layout_marginBottom="@dimen/search_item_interval" />
+ android:text="@string/search_normal_search" />
+ android:text="@string/search_subscription_search" />
+ android:text="@string/search_specify_uploader" />
+ android:text="@string/search_specify_tag" />
@@ -71,21 +69,21 @@
android:id="@+id/normal_search_mode_help"
android:layout_width="36dp"
android:layout_height="36dp"
- android:padding="6dp"
android:background="?selectableItemBackgroundBorderless"
- app:srcCompat="@drawable/v_help_circle_x24"/>
+ android:padding="6dp"
+ app:srcCompat="@drawable/v_help_circle_x24" />
+ android:layout_weight="1" />
+ android:text="@string/search_enable_advance" />
diff --git a/app/src/main/res/layout/widget_advance_search_table.xml b/app/src/main/res/layout/widget_advance_search_table.xml
index 4c25662ad..da26d2f88 100644
--- a/app/src/main/res/layout/widget_advance_search_table.xml
+++ b/app/src/main/res/layout/widget_advance_search_table.xml
@@ -1,5 +1,4 @@
-
-
-
+
+ android:text="@string/search_sname" />
+ android:text="@string/search_stags" />
+ android:layout_marginRight="@dimen/advance_search_table_item_margin"
+ android:layout_weight="1"
+ android:text="@string/search_sdesc" />
+ android:layout_weight="1"
+ android:text="@string/search_storr" />
+ android:layout_marginRight="@dimen/advance_search_table_item_margin"
+ android:layout_weight="1"
+ android:text="@string/search_sto" />
+ android:layout_weight="1"
+ android:text="@string/search_sdt1" />
+ android:layout_marginRight="@dimen/advance_search_table_item_margin"
+ android:layout_weight="1"
+ android:text="@string/search_sdt2" />
+ android:layout_weight="1"
+ android:text="@string/search_sh" />
+ android:layout_marginRight="@dimen/advance_search_table_item_margin"
+ android:layout_weight="1"
+ android:text="@string/search_sr" />
+ android:layout_marginLeft="@dimen/advance_search_table_item_margin"
+ android:layout_weight="1"
+ android:entries="@array/search_min_rating" />
+ android:layout_marginRight="@dimen/advance_search_table_item_margin"
+ android:text="@string/search_sp" />
+ android:maxLines="1" />
+ android:textColor="?android:attr/textColorPrimary" />
+ android:maxLines="1" />
+ android:textColor="?android:attr/textColorPrimary" />
+ android:textColor="?android:attr/textColorPrimary" />
+ android:layout_marginRight="@dimen/advance_search_table_item_margin"
+ android:layout_weight="1"
+ android:text="@string/search_sfl" />
+ android:layout_weight="1"
+ android:text="@string/search_sfu" />
+ android:layout_marginLeft="@dimen/advance_search_table_item_margin"
+ android:layout_weight="1"
+ android:text="@string/search_sft" />
diff --git a/app/src/main/res/layout/widget_category_table.xml b/app/src/main/res/layout/widget_category_table.xml
index 5f3fc0c3f..8780ea314 100644
--- a/app/src/main/res/layout/widget_category_table.xml
+++ b/app/src/main/res/layout/widget_category_table.xml
@@ -1,5 +1,4 @@
-
-
-
+
+
+ android:text="@string/doujinshi"
+ android:textColor="@android:color/white" />
+ android:text="@string/manga"
+ android:textColor="@android:color/white" />
+
+ android:text="@string/artist_cg"
+ android:textColor="@android:color/white" />
+ android:text="@string/game_cg"
+ android:textColor="@android:color/white" />
+
+ android:text="@string/western"
+ android:textColor="@android:color/white" />
+ android:text="@string/non_h"
+ android:textColor="@android:color/white" />
+
+ android:text="@string/image_set"
+ android:textColor="@android:color/white" />
+ android:text="@string/cosplay"
+ android:textColor="@android:color/white" />
-
+
+
+ android:text="@string/misc"
+ android:textColor="@android:color/white" />
diff --git a/app/src/main/res/layout/widget_content_layout.xml b/app/src/main/res/layout/widget_content_layout.xml
index a8c97a2c6..ac55c3bbf 100644
--- a/app/src/main/res/layout/widget_content_layout.xml
+++ b/app/src/main/res/layout/widget_content_layout.xml
@@ -1,5 +1,4 @@
-
-
-
+
+ android:layout_gravity="center" />
+ android:gravity="center_horizontal" />
+ android:clipToPadding="false" />
@@ -58,9 +56,9 @@
android:layout_height="match_parent"
android:layout_gravity="right"
android:paddingLeft="20dp"
- android:paddingRight="4dp"
android:paddingTop="8dp"
- android:paddingBottom="8dp"/>
+ android:paddingRight="4dp"
+ android:paddingBottom="8dp" />
diff --git a/app/src/main/res/layout/widget_gallery_guide_1.xml b/app/src/main/res/layout/widget_gallery_guide_1.xml
index 0fe2659bf..2c1cf1879 100644
--- a/app/src/main/res/layout/widget_gallery_guide_1.xml
+++ b/app/src/main/res/layout/widget_gallery_guide_1.xml
@@ -1,5 +1,4 @@
-
-
-
+
+ android:text="@string/guide_gallery_left" />
+ android:text="@string/guide_gallery_right" />
+ android:text="@string/guide_gallery_menu" />
+ android:text="@string/guide_gallery_progress" />
diff --git a/app/src/main/res/layout/widget_gallery_guide_2.xml b/app/src/main/res/layout/widget_gallery_guide_2.xml
index 684b73943..8a0cebc2a 100644
--- a/app/src/main/res/layout/widget_gallery_guide_2.xml
+++ b/app/src/main/res/layout/widget_gallery_guide_2.xml
@@ -1,5 +1,4 @@
-
-
-
+
+ android:text="@string/guide_gallery_long_click" />
diff --git a/app/src/main/res/layout/widget_image_search.xml b/app/src/main/res/layout/widget_image_search.xml
index 992fb12db..bb2e42353 100644
--- a/app/src/main/res/layout/widget_image_search.xml
+++ b/app/src/main/res/layout/widget_image_search.xml
@@ -1,5 +1,4 @@
-
-
-
+
+ android:visibility="gone" />
+ android:text="@string/select_image" />
+
+ android:text="@string/search_uss" />
+ android:text="@string/search_osc" />
+
+ android:text="@string/search_se" />
+ android:layout_marginTop="@dimen/advance_search_table_item_margin"
+ android:layout_weight="1"
+ android:checked="false" />
diff --git a/app/src/main/res/layout/widget_search_bar.xml b/app/src/main/res/layout/widget_search_bar.xml
index afe05e879..5a4c84749 100644
--- a/app/src/main/res/layout/widget_search_bar.xml
+++ b/app/src/main/res/layout/widget_search_bar.xml
@@ -1,5 +1,4 @@
-
-
-
+
+ android:padding="12dp" />
+ android:textColor="?android:attr/textColorSecondary"
+ android:textSize="@dimen/text_little_large" />
+ android:padding="12dp" />
+ android:inputType="text"
+ android:maxLines="1"
+ android:singleLine="true"
+ android:textSize="@dimen/text_little_small"
+ android:visibility="gone" />
@@ -80,14 +78,14 @@
android:id="@+id/list_header"
android:layout_width="match_parent"
android:layout_height="1dp"
- android:background="?attr/dividerColor"/>
+ android:background="?attr/dividerColor" />
+ android:dividerHeight="1dp" />