From f1cca207fcc3d2e8895da26c47085fd93f6ee787 Mon Sep 17 00:00:00 2001 From: arkon Date: Thu, 23 Jan 2020 20:51:37 -0500 Subject: [PATCH] Minor formatting --- .../ui/catalogue/filter/CheckboxItem.kt | 1 - .../ui/catalogue/filter/GroupItem.kt | 4 -- .../ui/catalogue/filter/SeparatorItem.kt | 1 - .../ui/catalogue/filter/SortGroup.kt | 1 - .../tachiyomi/ui/catalogue/filter/SortItem.kt | 1 - .../tachiyomi/ui/catalogue/filter/TextItem.kt | 1 - .../ui/catalogue/filter/TriStateItem.kt | 1 - app/src/main/res/menu/catalogue_main.xml | 16 ++++--- app/src/main/res/menu/catalogue_new_list.xml | 9 ++-- app/src/main/res/menu/category_selection.xml | 22 ++++----- app/src/main/res/menu/chapter_recent.xml | 12 ++--- .../res/menu/chapter_recent_selection.xml | 12 ++--- app/src/main/res/menu/chapter_selection.xml | 45 ++++++++++--------- app/src/main/res/menu/chapter_single.xml | 40 ++++++++++------- app/src/main/res/menu/chapters.xml | 14 +++--- app/src/main/res/menu/download_queue.xml | 35 ++++++++------- app/src/main/res/menu/library.xml | 16 +++---- app/src/main/res/menu/library_selection.xml | 36 ++++++++------- app/src/main/res/menu/menu_navigation.xml | 28 ++++++------ app/src/main/res/menu/migration.xml | 4 +- app/src/main/res/menu/reader.xml | 5 +-- 21 files changed, 159 insertions(+), 145 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/CheckboxItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/CheckboxItem.kt index c38c8cda62..cbd9e03416 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/CheckboxItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/CheckboxItem.kt @@ -41,7 +41,6 @@ open class CheckboxItem(val filter: Filter.CheckBox) : AbstractFlexibleItem) : FlexibleViewHolder(view, adapter) { - val check: CheckBox = itemView.findViewById(R.id.nav_view_item) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/GroupItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/GroupItem.kt index 841f06ee84..a8697a886b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/GroupItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/GroupItem.kt @@ -40,7 +40,6 @@ class GroupItem(val filter: Filter.Group<*>) : AbstractExpandableHeaderItem) : AbstractExpandableHeaderItem) : ExpandableViewHolder(view, adapter, true) { - val title: TextView = itemView.findViewById(R.id.title) val icon: ImageView = itemView.findViewById(R.id.expand_icon) override fun shouldNotifyParentOnClick(): Boolean { return true } - } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/SeparatorItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/SeparatorItem.kt index ce2d523b45..d3a3f05bb2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/SeparatorItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/SeparatorItem.kt @@ -22,7 +22,6 @@ class SeparatorItem(val filter: Filter.Separator) : AbstractHeaderItem>, holder: Holder, position: Int, payloads: List?) { - } override fun equals(other: Any?): Boolean { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/SortGroup.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/SortGroup.kt index bb253d7b46..05a1abf5e7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/SortGroup.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/SortGroup.kt @@ -37,7 +37,6 @@ class SortGroup(val filter: Filter.Sort) : AbstractExpandableHeaderItem) : FlexibleViewHolder(view, adapter) { - val text: CheckedTextView = itemView.findViewById(R.id.nav_view_item) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/TextItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/TextItem.kt index 077082ab51..6dfbf6c431 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/TextItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/TextItem.kt @@ -43,7 +43,6 @@ open class TextItem(val filter: Filter.Text) : AbstractFlexibleItem) : FlexibleViewHolder(view, adapter) { - val wrapper: TextInputLayout = itemView.findViewById(R.id.nav_view_item_wrapper) val edit: EditText = itemView.findViewById(R.id.nav_view_item) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/TriStateItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/TriStateItem.kt index bb5e32ace5..ace4d319df 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/TriStateItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/TriStateItem.kt @@ -64,7 +64,6 @@ open class TriStateItem(val filter: Filter.TriState) : AbstractFlexibleItem) : FlexibleViewHolder(view, adapter) { - val text: CheckedTextView = itemView.findViewById(TR.id.nav_view_item) init { diff --git a/app/src/main/res/menu/catalogue_main.xml b/app/src/main/res/menu/catalogue_main.xml index 3693b29ce9..1da0afa55e 100644 --- a/app/src/main/res/menu/catalogue_main.xml +++ b/app/src/main/res/menu/catalogue_main.xml @@ -1,16 +1,18 @@ + xmlns:tools="http://schemas.android.com/tools" + tools:context=".CatalogueListActivity"> + android:title="@string/action_search" + app:actionViewClass="androidx.appcompat.widget.SearchView" + app:showAsAction="collapseActionView|ifRoom" /> - + android:title="@string/pref_category_sources" + app:showAsAction="ifRoom" /> diff --git a/app/src/main/res/menu/catalogue_new_list.xml b/app/src/main/res/menu/catalogue_new_list.xml index c8fcdf5ccf..0db993fcf6 100644 --- a/app/src/main/res/menu/catalogue_new_list.xml +++ b/app/src/main/res/menu/catalogue_new_list.xml @@ -1,11 +1,12 @@ + xmlns:tools="http://schemas.android.com/tools" + tools:context=".CatalogueListActivity"> + android:title="@string/action_search" + app:actionViewClass="androidx.appcompat.widget.SearchView" + app:showAsAction="collapseActionView|ifRoom" /> diff --git a/app/src/main/res/menu/category_selection.xml b/app/src/main/res/menu/category_selection.xml index d8e07fc96c..2901b4dcba 100644 --- a/app/src/main/res/menu/category_selection.xml +++ b/app/src/main/res/menu/category_selection.xml @@ -1,16 +1,18 @@ + xmlns:app="http://schemas.android.com/apk/res-auto"> - + - + - \ No newline at end of file + diff --git a/app/src/main/res/menu/chapter_recent.xml b/app/src/main/res/menu/chapter_recent.xml index 881b73900f..7d88bc1738 100644 --- a/app/src/main/res/menu/chapter_recent.xml +++ b/app/src/main/res/menu/chapter_recent.xml @@ -1,28 +1,28 @@ + xmlns:app="http://schemas.android.com/apk/res-auto"> + app:showAsAction="ifRoom" /> + app:showAsAction="ifRoom" /> + app:showAsAction="ifRoom" /> + app:showAsAction="ifRoom" /> - \ No newline at end of file + diff --git a/app/src/main/res/menu/chapter_recent_selection.xml b/app/src/main/res/menu/chapter_recent_selection.xml index c5240e6270..6c4b09f166 100644 --- a/app/src/main/res/menu/chapter_recent_selection.xml +++ b/app/src/main/res/menu/chapter_recent_selection.xml @@ -1,30 +1,30 @@ + xmlns:app="http://schemas.android.com/apk/res-auto"> + app:showAsAction="ifRoom" /> + app:showAsAction="ifRoom" /> + app:showAsAction="ifRoom" /> + app:showAsAction="ifRoom" /> - \ No newline at end of file + diff --git a/app/src/main/res/menu/chapter_selection.xml b/app/src/main/res/menu/chapter_selection.xml index 270623ea5a..3ccfc69491 100644 --- a/app/src/main/res/menu/chapter_selection.xml +++ b/app/src/main/res/menu/chapter_selection.xml @@ -3,29 +3,34 @@ - + - + android:title="@string/action_delete" + app:showAsAction="ifRoom" /> - + - + - + - \ No newline at end of file + diff --git a/app/src/main/res/menu/chapter_single.xml b/app/src/main/res/menu/chapter_single.xml index eab89ed70e..0f1f14e1d7 100644 --- a/app/src/main/res/menu/chapter_single.xml +++ b/app/src/main/res/menu/chapter_single.xml @@ -2,30 +2,36 @@ - + + android:visible="false" /> - + - + - + - + - + - \ No newline at end of file + diff --git a/app/src/main/res/menu/chapters.xml b/app/src/main/res/menu/chapters.xml index 5cb625f090..994042d678 100644 --- a/app/src/main/res/menu/chapters.xml +++ b/app/src/main/res/menu/chapters.xml @@ -1,6 +1,6 @@ + xmlns:app="http://schemas.android.com/apk/res-auto"> + android:title="@string/action_filter_read" /> + android:title="@string/action_filter_unread" /> + android:title="@string/action_filter_downloaded" /> + android:title="@string/action_filter_bookmarked" /> + android:title="@string/action_filter_empty" /> @@ -34,7 +34,7 @@ android:id="@+id/action_sort" android:icon="@drawable/ic_sort_by_numeric_white_24dp" android:title="@string/action_sort" - app:showAsAction="ifRoom"/> + app:showAsAction="ifRoom" /> + xmlns:app="http://schemas.android.com/apk/res-auto"> - + - + - + - \ No newline at end of file + diff --git a/app/src/main/res/menu/library.xml b/app/src/main/res/menu/library.xml index ad53ae03a1..3e366bebf9 100644 --- a/app/src/main/res/menu/library.xml +++ b/app/src/main/res/menu/library.xml @@ -1,35 +1,35 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + tools:context=".MainActivity"> + app:showAsAction="collapseActionView|ifRoom" /> + app:showAsAction="ifRoom" /> + app:showAsAction="ifRoom" /> + app:showAsAction="never" /> + app:showAsAction="never" /> diff --git a/app/src/main/res/menu/library_selection.xml b/app/src/main/res/menu/library_selection.xml index 0cced57b5d..c3acfec065 100644 --- a/app/src/main/res/menu/library_selection.xml +++ b/app/src/main/res/menu/library_selection.xml @@ -1,26 +1,30 @@ + xmlns:app="http://schemas.android.com/apk/res-auto"> - + - + - + - + android:title="@string/action_select_all" + app:showAsAction="ifRoom" /> diff --git a/app/src/main/res/menu/menu_navigation.xml b/app/src/main/res/menu/menu_navigation.xml index 1ea7a65415..c16fb4dfe3 100644 --- a/app/src/main/res/menu/menu_navigation.xml +++ b/app/src/main/res/menu/menu_navigation.xml @@ -1,10 +1,11 @@ - + + android:title="@string/label_recent_manga" /> + android:title="@string/label_extensions" /> + android:title="@string/label_download_queue" /> - + + android:title="@string/label_settings" /> + android:title="@string/label_help" /> diff --git a/app/src/main/res/menu/migration.xml b/app/src/main/res/menu/migration.xml index f783ded6f7..0faa7e76c5 100644 --- a/app/src/main/res/menu/migration.xml +++ b/app/src/main/res/menu/migration.xml @@ -6,6 +6,6 @@ android:id="@+id/action_change_source" android:icon="@drawable/ic_filter_list_white_24dp" android:title="@string/action_filter" - app:showAsAction="always"/> + app:showAsAction="always" /> - \ No newline at end of file + diff --git a/app/src/main/res/menu/reader.xml b/app/src/main/res/menu/reader.xml index 36c6d5853d..fb2788e97b 100644 --- a/app/src/main/res/menu/reader.xml +++ b/app/src/main/res/menu/reader.xml @@ -1,6 +1,6 @@ + xmlns:app="http://schemas.android.com/apk/res-auto"> + app:showAsAction="ifRoom" />