Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migration manga fixes (#489)

Browse Source
This commit is contained in:
Román 2022-01-01 20:38:29 +00:00 committed by GitHub
parent 0a228019a9
commit f809e438f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 57 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
app/src/main/res/layout/migration_bottom_sheet.xml
View File

@ -1,19 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout 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"
android:id="@+id/constraintLayout" android:id="@+id/constraintLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:orientation="vertical"> android:orientation="vertical">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout2" android:id="@+id/constraintLayout2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="32dp" android:layout_marginTop="32dp"
android:background="@drawable/dialog_rounded_background" android:background="?attr/colorSurface"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -24,17 +24,18 @@
android:id="@+id/data_label" android:id="@+id/data_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="6dp" android:layout_marginStart="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:text="@string/data_to_include_in_migration" android:text="@string/data_to_include_in_migration"
android:textAppearance="?attr/textAppearanceTitleSmall" android:textAppearance="?attr/textAppearanceTitleSmall"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent"/>
<HorizontalScrollView <HorizontalScrollView
android:id="@+id/migration_data_scrollView" android:id="@+id/migration_data_scrollView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:scrollbars="none" android:scrollbars="none"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -50,33 +51,33 @@
android:id="@+id/mig_chapters" android:id="@+id/mig_chapters"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="4dp"
android:checked="true" android:checked="true"
android:text="@string/chapters" /> android:text="@string/chapters"/>
<CheckBox <CheckBox
android:id="@+id/mig_categories" android:id="@+id/mig_categories"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="4dp"
android:checked="true" android:checked="true"
android:text="@string/categories" /> android:text="@string/categories"/>
<CheckBox <CheckBox
android:id="@+id/mig_tracking" android:id="@+id/mig_tracking"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="4dp"
android:checked="true" android:checked="true"
android:text="@string/track" /> android:text="@string/track"/>
<CheckBox <CheckBox
android:id="@+id/mig_extra" android:id="@+id/mig_extra"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="4dp"
android:checked="true" android:checked="true"
android:text="@string/log_extra" /> android:text="@string/log_extra"/>
</LinearLayout> </LinearLayout>
</HorizontalScrollView> </HorizontalScrollView>
@ -84,12 +85,11 @@
android:id="@+id/options_label" android:id="@+id/options_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:text="@string/action_settings" android:text="@string/action_settings"
android:textAppearance="?attr/textAppearanceTitleSmall" android:textAppearance="?attr/textAppearanceTitleSmall"
app:layout_constraintStart_toStartOf="@+id/migration_data_scrollView" app:layout_constraintStart_toStartOf="@+id/migration_data_scrollView"
app:layout_constraintTop_toBottomOf="@+id/migration_data_scrollView" /> app:layout_constraintTop_toBottomOf="@+id/migration_data_scrollView"/>
<RadioGroup <RadioGroup
android:id="@+id/sourceGroup" android:id="@+id/sourceGroup"
@ -107,25 +107,24 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="0dp" android:paddingStart="0dp"
android:paddingEnd="8dp" android:paddingEnd="8dp"
android:text="@string/use_first_source" /> android:text="@string/use_first_source"/>
<RadioButton <RadioButton
android:id="@+id/radioButton2" android:id="@+id/radioButton2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/use_most_chapters" /> android:text="@string/use_most_chapters"/>
</RadioGroup> </RadioGroup>
<com.google.android.material.switchmaterial.SwitchMaterial <com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/use_smart_search" android:id="@+id/use_smart_search"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:text="@string/use_intelligent_search" android:text="@string/use_intelligent_search"
app:layout_constraintEnd_toEndOf="@+id/sourceGroup" app:layout_constraintEnd_toEndOf="@+id/sourceGroup"
app:layout_constraintStart_toStartOf="@+id/sourceGroup" app:layout_constraintStart_toStartOf="@+id/sourceGroup"
app:layout_constraintTop_toBottomOf="@+id/sourceGroup" /> app:layout_constraintTop_toBottomOf="@+id/sourceGroup"/>
<com.google.android.material.switchmaterial.SwitchMaterial <com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/extra_search_param" android:id="@+id/extra_search_param"
@ -135,59 +134,55 @@
android:text="@string/include_extra_search_parameter" android:text="@string/include_extra_search_parameter"
app:layout_constraintEnd_toEndOf="@+id/use_smart_search" app:layout_constraintEnd_toEndOf="@+id/use_smart_search"
app:layout_constraintStart_toStartOf="@+id/use_smart_search" app:layout_constraintStart_toStartOf="@+id/use_smart_search"
app:layout_constraintTop_toBottomOf="@+id/use_smart_search" /> app:layout_constraintTop_toBottomOf="@+id/use_smart_search"/>
<EditText <EditText
android:id="@+id/extra_search_param_text" android:id="@+id/extra_search_param_text"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:ems="10" android:ems="10"
android:hint="@string/search_parameter" android:hint="@string/search_parameter"
android:importantForAutofill="no" android:importantForAutofill="no"
android:inputType="textPersonName" android:inputType="textPersonName"
app:layout_constraintEnd_toEndOf="parent" android:textSize="16sp"
app:layout_constraintHorizontal_bias="0.0" app:layout_constraintEnd_toEndOf="@+id/extra_search_param"
app:layout_constraintStart_toStartOf="@+id/extra_search_param" app:layout_constraintStart_toStartOf="@+id/extra_search_param"
app:layout_constraintTop_toBottomOf="@+id/extra_search_param" /> app:layout_constraintTop_toBottomOf="@+id/extra_search_param"/>
<com.google.android.material.switchmaterial.SwitchMaterial <com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/skip_step" android:id="@+id/skip_step"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:text="@string/skip_this_step_next_time" android:text="@string/skip_this_step_next_time"
app:layout_constraintEnd_toEndOf="@+id/extra_search_param" app:layout_constraintEnd_toEndOf="@+id/Hide_not_found_manga"
app:layout_constraintStart_toStartOf="@+id/extra_search_param" app:layout_constraintStart_toStartOf="@+id/Hide_not_found_manga"
app:layout_constraintTop_toBottomOf="@+id/extra_search_param_text" /> app:layout_constraintTop_toBottomOf="@+id/Hide_not_found_manga"/>
<com.google.android.material.switchmaterial.SwitchMaterial <com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/Hide_not_found_manga" android:id="@+id/Hide_not_found_manga"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:text="@string/hide_not_found_manga" android:text="@string/hide_not_found_manga"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/extra_search_param"
app:layout_constraintEnd_toEndOf="@+id/skip_step" app:layout_constraintStart_toStartOf="@+id/extra_search_param"
app:layout_constraintStart_toStartOf="@+id/skip_step" app:layout_constraintTop_toBottomOf="@+id/extra_search_param_text"/>
app:layout_constraintTop_toBottomOf="@+id/skip_step" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/fab" android:id="@+id/fab"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="8dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="24dp"
android:minWidth="0dp" android:minWidth="0dp"
android:text="@string/action_migrate" android:text="@string/action_migrate"
app:icon="@drawable/ic_arrow_forward_24dp" app:icon="@drawable/ic_arrow_forward_24dp"
app:layout_anchor="@id/constraintLayout" app:layout_anchor="@id/constraintLayout"
app:layout_anchorGravity="bottom|end" app:layout_anchorGravity="bottom|end"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

19
app/src/main/res/layout/migration_manga_card.xml
View File

@ -99,7 +99,6 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:paddingBottom="20dp"
android:gravity="start" android:gravity="start"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@ -107,28 +106,30 @@
app:layout_constraintStart_toStartOf="@id/card" app:layout_constraintStart_toStartOf="@id/card"
app:layout_constraintTop_toBottomOf="@id/card"> app:layout_constraintTop_toBottomOf="@id/card">
<TextView <TextView
android:id="@+id/manga_source_label" android:id="@+id/manga_source_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="false" android:clickable="false"
android:textIsSelectable="false"
app:layout_constraintLeft_toLeftOf="parent"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:paddingTop="4dp"
android:paddingBottom="2dp"
android:textAppearance="?attr/textAppearanceTitleSmall" android:textAppearance="?attr/textAppearanceTitleSmall"
tools:layout_editor_absoluteY="57dp" /> android:textIsSelectable="false"
app:layout_constraintLeft_toLeftOf="parent"
tools:layout_editor_absoluteY="57dp"/>
<TextView <TextView
android:id="@+id/manga_last_chapter_label" android:id="@+id/manga_last_chapter_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="false" android:clickable="false"
android:textIsSelectable="false" android:paddingTop="2dp"
android:paddingBottom="4dp"
android:textAppearance="?attr/textAppearanceBodyMedium" android:textAppearance="?attr/textAppearanceBodyMedium"
android:textColor="?android:attr/textColorSecondary" /> android:textColor="?android:attr/textColorSecondary"
android:textIsSelectable="false"/>
</LinearLayout> </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

26
app/src/main/res/layout/migration_process_item.xml
View File

@ -10,64 +10,70 @@
layout="@layout/migration_manga_card" layout="@layout/migration_manga_card"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/imageView" app:layout_constraintEnd_toStartOf="@+id/imageView"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent"/>
<ImageView <ImageView
android:id="@+id/imageView" android:id="@+id/imageView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="25dp" android:layout_height="25dp"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:layout_marginBottom="45dp"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:contentDescription="@string/migrating_to" android:contentDescription="@string/migrating_to"
android:scaleType="center" android:scaleType="center"
android:layout_marginBottom="45dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/migration_manga_card_to" app:layout_constraintEnd_toStartOf="@+id/migration_manga_card_to"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/migration_manga_card_from" app:layout_constraintStart_toEndOf="@+id/migration_manga_card_from"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_arrow_forward_24dp" app:srcCompat="@drawable/ic_arrow_forward_24dp"
app:tint="?attr/colorOnBackground" /> app:tint="?attr/colorOnBackground"/>
<include <include
android:id="@+id/migration_manga_card_to" android:id="@+id/migration_manga_card_to"
layout="@layout/migration_manga_card" layout="@layout/migration_manga_card"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/migration_menu" app:layout_constraintEnd_toStartOf="@+id/migration_menu"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/imageView" app:layout_constraintStart_toEndOf="@+id/imageView"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent"/>
<ImageView <ImageView
android:id="@+id/migration_menu" android:id="@+id/migration_menu"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:layout_marginBottom="45dp"
android:contentDescription="@string/description_cover" android:contentDescription="@string/description_cover"
android:paddingTop="30dp" android:paddingTop="30dp"
android:paddingBottom="30dp" android:paddingBottom="30dp"
android:layout_marginBottom="45dp" android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/migration_manga_card_to" app:layout_constraintStart_toEndOf="@+id/migration_manga_card_to"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_more_24dp" app:srcCompat="@drawable/ic_more_24dp"
android:visibility="invisible" app:tint="?attr/colorOnBackground"/>
app:tint="?attr/colorOnBackground" />
<ImageView <ImageView
android:id="@+id/skip_manga" android:id="@+id/skip_manga"
android:layout_width="48dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="@+id/migration_menu" app:layout_constraintBottom_toBottomOf="@+id/migration_menu"
app:layout_constraintEnd_toEndOf="@+id/migration_menu" app:layout_constraintEnd_toEndOf="@+id/migration_menu"
app:layout_constraintStart_toStartOf="@+id/migration_menu" app:layout_constraintStart_toStartOf="@+id/migration_menu"
app:layout_constraintTop_toTopOf="@+id/migration_menu" app:layout_constraintTop_toTopOf="@+id/migration_menu"
app:srcCompat="@drawable/ic_close_24dp" app:srcCompat="@drawable/ic_close_24dp"
app:tint="?attr/colorOnBackground" /> app:tint="?attr/colorOnBackground"/>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>