From ef533b4c8790df13c9502a914077e53b63ff3758 Mon Sep 17 00:00:00 2001 From: arkon Date: Mon, 17 Feb 2020 17:26:20 -0500 Subject: [PATCH] Run default Android Studio formatter on resources --- app/src/main/res/anim/fade_in.xml | 10 +- app/src/main/res/anim/fade_in_long.xml | 10 +- .../res/layout-land/manga_info_controller.xml | 118 +++++++++--------- .../layout-land/reader_color_filter_sheet.xml | 19 ++- app/src/main/res/menu/library.xml | 3 +- app/src/main/res/xml/backup_rules.xml | 4 +- app/src/main/res/xml/provider_paths.xml | 18 ++- app/src/main/res/xml/searchable.xml | 5 +- 8 files changed, 95 insertions(+), 92 deletions(-) diff --git a/app/src/main/res/anim/fade_in.xml b/app/src/main/res/anim/fade_in.xml index 94282b214f..79e511214b 100644 --- a/app/src/main/res/anim/fade_in.xml +++ b/app/src/main/res/anim/fade_in.xml @@ -1,9 +1,9 @@ - \ No newline at end of file + android:fillAfter="true" + android:fromAlpha="0.0" + android:interpolator="@android:anim/accelerate_interpolator" + android:toAlpha="1.0" /> + diff --git a/app/src/main/res/anim/fade_in_long.xml b/app/src/main/res/anim/fade_in_long.xml index 0a71c8b842..659c29f206 100644 --- a/app/src/main/res/anim/fade_in_long.xml +++ b/app/src/main/res/anim/fade_in_long.xml @@ -1,9 +1,9 @@ - \ No newline at end of file + android:fillAfter="true" + android:fromAlpha="0.0" + android:interpolator="@android:anim/accelerate_interpolator" + android:toAlpha="1.0" /> + diff --git a/app/src/main/res/layout-land/manga_info_controller.xml b/app/src/main/res/layout-land/manga_info_controller.xml index 130fd4afed..7e10e7bb67 100644 --- a/app/src/main/res/layout-land/manga_info_controller.xml +++ b/app/src/main/res/layout-land/manga_info_controller.xml @@ -1,75 +1,71 @@ - + android:layout_height="match_parent" + tools:context="eu.kanade.tachiyomi.ui.catalogue.browse.BrowseCatalogueController"> + android:layout_height="match_parent"> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.0" + tools:background="@color/material_grey_700" /> + app:layout_constraintEnd_toEndOf="parent" + app:srcCompat="@drawable/ic_bookmark_border_white_24dp" /> + app:layout_constraintTop_toTopOf="parent"> + app:autoSizeMinTextSize="12sp" + app:autoSizeStepGranularity="2sp" + app:autoSizeTextType="uniform" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/manga_full_title" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/manga_author_label" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/manga_author_label" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/manga_artist_label" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/manga_artist_label" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/manga_chapters_label" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/manga_chapters_label" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/manga_last_update_label" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/manga_last_update_label" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/manga_status_label" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/manga_status_label" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/manga_source_label" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/manga_source" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/manga_summary_label" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/manga_summary" /> 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 75c1f8424c..5ebf3cf8ba 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,21 +1,20 @@ - + android:orientation="horizontal"> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@id/scroll"> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@id/frame"> - + diff --git a/app/src/main/res/menu/library.xml b/app/src/main/res/menu/library.xml index 1375104e80..c30edde98f 100644 --- a/app/src/main/res/menu/library.xml +++ b/app/src/main/res/menu/library.xml @@ -26,8 +26,7 @@ android:title="@string/action_display" app:showAsAction="never"> - + diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml index 81c96476a7..0806252d2b 100644 --- a/app/src/main/res/xml/backup_rules.xml +++ b/app/src/main/res/xml/backup_rules.xml @@ -1,4 +1,6 @@ - + diff --git a/app/src/main/res/xml/provider_paths.xml b/app/src/main/res/xml/provider_paths.xml index 200c709f48..9c1aaf647a 100644 --- a/app/src/main/res/xml/provider_paths.xml +++ b/app/src/main/res/xml/provider_paths.xml @@ -1,8 +1,16 @@ - - - + + + - - \ No newline at end of file + + diff --git a/app/src/main/res/xml/searchable.xml b/app/src/main/res/xml/searchable.xml index f224a1c83c..17b5dae73a 100644 --- a/app/src/main/res/xml/searchable.xml +++ b/app/src/main/res/xml/searchable.xml @@ -1,5 +1,4 @@ - \ No newline at end of file + android:hint="@string/action_global_search_hint" + android:label="@string/app_name" />