Run default Android Studio formatter on resources

This commit is contained in:
arkon 2020-02-17 17:26:20 -05:00
parent 3ecc883944
commit ef533b4c87
8 changed files with 95 additions and 92 deletions

View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android"> <set xmlns:android="http://schemas.android.com/apk/res/android">
<alpha <alpha
android:fromAlpha="0.0"
android:toAlpha="1.0"
android:interpolator="@android:anim/accelerate_interpolator"
android:duration="300" android:duration="300"
android:fillAfter="true"/> android:fillAfter="true"
android:fromAlpha="0.0"
android:interpolator="@android:anim/accelerate_interpolator"
android:toAlpha="1.0" />
</set> </set>

View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android"> <set xmlns:android="http://schemas.android.com/apk/res/android">
<alpha <alpha
android:fromAlpha="0.0"
android:toAlpha="1.0"
android:interpolator="@android:anim/accelerate_interpolator"
android:duration="2000" android:duration="2000"
android:fillAfter="true"/> android:fillAfter="true"
android:fromAlpha="0.0"
android:interpolator="@android:anim/accelerate_interpolator"
android:toAlpha="1.0" />
</set> </set>

View file

@ -1,75 +1,71 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout <androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
tools:context="eu.kanade.tachiyomi.ui.catalogue.browse.BrowseCatalogueController"
android:id="@id/swipe_refresh" android:id="@id/swipe_refresh"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
tools:context="eu.kanade.tachiyomi.ui.catalogue.browse.BrowseCatalogueController">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
xmlns:android="http://schemas.android.com/apk/res/android">
<ImageView <ImageView
android:id="@+id/manga_cover" android:id="@+id/manga_cover"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:layout_marginStart="16dp"
android:contentDescription="@string/description_cover" android:contentDescription="@string/description_cover"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintDimensionRatio="h,3:2" app:layout_constraintDimensionRatio="h,3:2"
tools:background="@color/material_grey_700" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintVertical_bias="0.0" /> app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0"
tools:background="@color/material_grey_700" />
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_favorite" android:id="@+id/fab_favorite"
style="@style/Theme.Widget.FAB" style="@style/Theme.Widget.FAB"
app:srcCompat="@drawable/ic_bookmark_border_white_24dp"
android:layout_marginBottom="16dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"/> app:layout_constraintEnd_toEndOf="parent"
app:srcCompat="@drawable/ic_bookmark_border_white_24dp" />
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:id="@+id/info_scrollview" android:id="@+id/info_scrollview"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
app:layout_constraintTop_toTopOf="parent" android:layout_marginBottom="16dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/manga_cover" app:layout_constraintStart_toEndOf="@+id/manga_cover"
app:layout_constraintEnd_toEndOf="parent"> app:layout_constraintTop_toTopOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<TextView <TextView
android:text="@string/manga_info_full_title_label"
android:id="@+id/manga_full_title" android:id="@+id/manga_full_title"
style="@style/TextAppearance.Medium.Title" style="@style/TextAppearance.Medium.Title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxLines="2" android:maxLines="2"
android:text="@string/manga_info_full_title_label"
android:textIsSelectable="false" android:textIsSelectable="false"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:autoSizeTextType="uniform"
app:autoSizeMinTextSize="12sp"
app:autoSizeMaxTextSize="20sp" app:autoSizeMaxTextSize="20sp"
app:autoSizeStepGranularity="2sp"/> app:autoSizeMinTextSize="12sp"
app:autoSizeStepGranularity="2sp"
app:autoSizeTextType="uniform"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/manga_author_label" android:id="@+id/manga_author_label"
@ -78,8 +74,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/manga_info_author_label" android:text="@string/manga_info_author_label"
android:textIsSelectable="false" android:textIsSelectable="false"
app:layout_constraintTop_toBottomOf="@+id/manga_full_title" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toStartOf="parent"/> app:layout_constraintTop_toBottomOf="@+id/manga_full_title" />
<TextView <TextView
android:id="@+id/manga_author" android:id="@+id/manga_author"
@ -91,8 +87,8 @@
android:maxLines="1" android:maxLines="1"
android:textIsSelectable="false" android:textIsSelectable="false"
app:layout_constraintBaseline_toBaselineOf="@+id/manga_author_label" app:layout_constraintBaseline_toBaselineOf="@+id/manga_author_label"
app:layout_constraintStart_toEndOf="@+id/manga_author_label" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintStart_toEndOf="@+id/manga_author_label" />
<TextView <TextView
android:id="@+id/manga_artist_label" android:id="@+id/manga_artist_label"
@ -101,8 +97,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/manga_info_artist_label" android:text="@string/manga_info_artist_label"
android:textIsSelectable="false" android:textIsSelectable="false"
app:layout_constraintTop_toBottomOf="@+id/manga_author_label" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toStartOf="parent"/> app:layout_constraintTop_toBottomOf="@+id/manga_author_label" />
<TextView <TextView
android:id="@+id/manga_artist" android:id="@+id/manga_artist"
@ -114,8 +110,8 @@
android:maxLines="1" android:maxLines="1"
android:textIsSelectable="false" android:textIsSelectable="false"
app:layout_constraintBaseline_toBaselineOf="@+id/manga_artist_label" app:layout_constraintBaseline_toBaselineOf="@+id/manga_artist_label"
app:layout_constraintStart_toEndOf="@+id/manga_artist_label" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintStart_toEndOf="@+id/manga_artist_label" />
<TextView <TextView
android:id="@+id/manga_chapters_label" android:id="@+id/manga_chapters_label"
@ -124,8 +120,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/manga_info_last_chapter_label" android:text="@string/manga_info_last_chapter_label"
android:textIsSelectable="false" android:textIsSelectable="false"
app:layout_constraintTop_toBottomOf="@+id/manga_artist_label" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toStartOf="parent"/> app:layout_constraintTop_toBottomOf="@+id/manga_artist_label" />
<TextView <TextView
android:id="@+id/manga_chapters" android:id="@+id/manga_chapters"
@ -137,8 +133,8 @@
android:maxLines="1" android:maxLines="1"
android:textIsSelectable="false" android:textIsSelectable="false"
app:layout_constraintBaseline_toBaselineOf="@+id/manga_chapters_label" app:layout_constraintBaseline_toBaselineOf="@+id/manga_chapters_label"
app:layout_constraintStart_toEndOf="@+id/manga_chapters_label" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintStart_toEndOf="@+id/manga_chapters_label" />
<TextView <TextView
android:id="@+id/manga_last_update_label" android:id="@+id/manga_last_update_label"
@ -147,8 +143,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/manga_info_latest_data_label" android:text="@string/manga_info_latest_data_label"
android:textIsSelectable="false" android:textIsSelectable="false"
app:layout_constraintTop_toBottomOf="@+id/manga_chapters_label" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toStartOf="parent"/> app:layout_constraintTop_toBottomOf="@+id/manga_chapters_label" />
<TextView <TextView
android:id="@+id/manga_last_update" android:id="@+id/manga_last_update"
@ -160,8 +156,8 @@
android:maxLines="1" android:maxLines="1"
android:textIsSelectable="false" android:textIsSelectable="false"
app:layout_constraintBaseline_toBaselineOf="@+id/manga_last_update_label" app:layout_constraintBaseline_toBaselineOf="@+id/manga_last_update_label"
app:layout_constraintStart_toEndOf="@+id/manga_last_update_label" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintStart_toEndOf="@+id/manga_last_update_label" />
<TextView <TextView
android:id="@+id/manga_status_label" android:id="@+id/manga_status_label"
@ -170,8 +166,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/manga_info_status_label" android:text="@string/manga_info_status_label"
android:textIsSelectable="false" android:textIsSelectable="false"
app:layout_constraintTop_toBottomOf="@+id/manga_last_update_label" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toStartOf="parent"/> app:layout_constraintTop_toBottomOf="@+id/manga_last_update_label" />
<TextView <TextView
android:id="@+id/manga_status" android:id="@+id/manga_status"
@ -183,8 +179,8 @@
android:maxLines="1" android:maxLines="1"
android:textIsSelectable="false" android:textIsSelectable="false"
app:layout_constraintBaseline_toBaselineOf="@+id/manga_status_label" app:layout_constraintBaseline_toBaselineOf="@+id/manga_status_label"
app:layout_constraintStart_toEndOf="@+id/manga_status_label" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintStart_toEndOf="@+id/manga_status_label" />
<TextView <TextView
android:id="@+id/manga_source_label" android:id="@+id/manga_source_label"
@ -193,8 +189,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/manga_info_source_label" android:text="@string/manga_info_source_label"
android:textIsSelectable="false" android:textIsSelectable="false"
app:layout_constraintTop_toBottomOf="@+id/manga_status_label" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toStartOf="parent"/> app:layout_constraintTop_toBottomOf="@+id/manga_status_label" />
<TextView <TextView
android:id="@+id/manga_source" android:id="@+id/manga_source"
@ -206,8 +202,8 @@
android:maxLines="1" android:maxLines="1"
android:textIsSelectable="false" android:textIsSelectable="false"
app:layout_constraintBaseline_toBaselineOf="@+id/manga_source_label" app:layout_constraintBaseline_toBaselineOf="@+id/manga_source_label"
app:layout_constraintStart_toEndOf="@+id/manga_source_label" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintStart_toEndOf="@+id/manga_source_label" />
<TextView <TextView
android:id="@+id/manga_summary_label" android:id="@+id/manga_summary_label"
@ -216,34 +212,34 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/description" android:text="@string/description"
android:textIsSelectable="false" android:textIsSelectable="false"
app:layout_constraintTop_toBottomOf="@+id/manga_source" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toStartOf="parent"/> app:layout_constraintTop_toBottomOf="@+id/manga_source" />
<TextView <TextView
android:id="@+id/manga_summary" android:id="@+id/manga_summary"
style="@style/TextAppearance.Regular.Body1.Secondary" style="@style/TextAppearance.Regular.Body1.Secondary"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="64dp"
android:textIsSelectable="false" android:textIsSelectable="false"
app:layout_constraintTop_toBottomOf="@+id/manga_summary_label"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="64dp"/> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/manga_summary_label" />
<me.gujun.android.taggroup.TagGroup <me.gujun.android.taggroup.TagGroup
android:id="@+id/manga_genres_tags" android:id="@+id/manga_genres_tags"
style="@style/TagGroup" style="@style/TagGroup"
android:layout_marginTop="8dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/manga_summary" android:layout_marginTop="8dp"
app:layout_constraintStart_toStartOf="parent" android:layout_marginEnd="64dp"
app:layout_constraintEnd_toEndOf="parent"
app:atg_borderStrokeWidth="1dp"
app:atg_backgroundColor="@android:color/transparent" app:atg_backgroundColor="@android:color/transparent"
app:atg_borderColor="@color/md_blue_A400" app:atg_borderColor="@color/md_blue_A400"
app:atg_borderStrokeWidth="1dp"
app:atg_textColor="@color/md_blue_A400" app:atg_textColor="@color/md_blue_A400"
android:layout_marginEnd="64dp"/> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/manga_summary" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

View file

@ -1,21 +1,20 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:background="?android:colorBackground"
android:baselineAligned="false" android:baselineAligned="false"
android:background="?android:colorBackground"> android:orientation="horizontal">
<FrameLayout <FrameLayout
android:id="@+id/frame" android:id="@+id/frame"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="@id/scroll"
app:layout_constraintEnd_toStartOf="@id/scroll" app:layout_constraintEnd_toStartOf="@id/scroll"
app:layout_constraintTop_toTopOf="@id/scroll" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="@id/scroll"> app:layout_constraintTop_toTopOf="@id/scroll">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -40,10 +39,10 @@
android:id="@+id/scroll" android:id="@+id/scroll"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@id/frame" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toEndOf="parent"> app:layout_constraintStart_toEndOf="@id/frame">
<include layout="@layout/reader_color_filter"/> <include layout="@layout/reader_color_filter" />
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>

View file

@ -26,8 +26,7 @@
android:title="@string/action_display" android:title="@string/action_display"
app:showAsAction="never"> app:showAsAction="never">
<menu> <menu>
<group <group android:checkableBehavior="single">
android:checkableBehavior="single">
<item <item
android:id="@+id/action_display_grid" android:id="@+id/action_display_grid"
android:title="@string/action_display_grid" /> android:title="@string/action_display_grid" />

View file

@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<full-backup-content> <full-backup-content>
<include domain="database" path="tachiyomi.db"/> <include
domain="database"
path="tachiyomi.db" />
</full-backup-content> </full-backup-content>

View file

@ -1,8 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<paths> <paths>
<cache-path name="cache_files" path="."/> <cache-path
<external-path name="ext_files" path="." /> name="cache_files"
<external-cache-path name="ext_cache_files" path="."/> path="." />
<external-path
name="ext_files"
path="." />
<external-cache-path
name="ext_cache_files"
path="." />
<!--suppress AndroidElementNotAllowed --> <!--suppress AndroidElementNotAllowed -->
<root-path name="ext_storage" path="/storage/"/> <root-path
name="ext_storage"
path="/storage/" />
</paths> </paths>

View file

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<searchable xmlns:android="http://schemas.android.com/apk/res/android" <searchable xmlns:android="http://schemas.android.com/apk/res/android"
android:label="@string/app_name" android:hint="@string/action_global_search_hint"
android:hint="@string/action_global_search_hint" > android:label="@string/app_name" />
</searchable>