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

Reorganize reader sheet contents a bit

Browse Source 
(cherry picked from commit c255f57d956a6f81d4a1ea6c22e1ca29d81d28ba)

# Conflicts:
#	app/src/main/res/layout/reader_general_settings.xml
This commit is contained in:
arkon 2021-03-27 10:53:19 -04:00 committed by Jobobby04
parent 75f0ab2f40
commit 5b9d2175e2
2 changed files with 10 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/res/layout/reader_general_settings.xml
View File

@ -11,24 +11,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<!-- General reading mode preferences -->
<TextView
android:id="@+id/display_prefs"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:text="@string/pref_category_display"
android:textColor="?attr/colorAccent"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/page_transitions" />
<TextView <TextView
android:id="@+id/rotation_mode_text" android:id="@+id/rotation_mode_text"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="@string/pref_rotation_type" android:text="@string/pref_rotation_type"
app:layout_constraintBaseline_toBaselineOf="@id/rotation_mode" app:layout_constraintBaseline_toBaselineOf="@id/rotation_mode"
app:layout_constraintEnd_toStartOf="@id/verticalcenter" app:layout_constraintEnd_toStartOf="@id/verticalcenter"
@ -38,11 +24,10 @@
android:id="@+id/rotation_mode" android:id="@+id/rotation_mode"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:entries="@array/rotation_type" android:entries="@array/rotation_type"
app:layout_constraintEnd_toEndOf="@id/spinner_end" app:layout_constraintEnd_toEndOf="@id/spinner_end"
app:layout_constraintStart_toEndOf="@id/verticalcenter" app:layout_constraintStart_toEndOf="@id/verticalcenter"
app:layout_constraintTop_toBottomOf="@id/display_prefs" /> app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/background_color_text" android:id="@+id/background_color_text"
@ -146,13 +131,6 @@
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
app:layout_constraintTop_toBottomOf="@id/always_show_chapter_transition" /> app:layout_constraintTop_toBottomOf="@id/always_show_chapter_transition" />
<android.widget.Space
android:id="@+id/end_general_preferences"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="@id/auto_webtoon_mode"
tools:ignore="MissingConstraints" />
<android.widget.Space <android.widget.Space
android:id="@+id/spinner_end" android:id="@+id/spinner_end"
android:layout_width="16dp" android:layout_width="16dp"

29
app/src/main/res/layout/reader_reading_mode_settings.xml
View File

@ -11,30 +11,13 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<android.widget.Space
android:id="@+id/spinner_end"
android:layout_width="16dp"
android:layout_height="0dp"
app:layout_constraintStart_toEndOf="parent"
tools:ignore="MissingConstraints" />
<!-- Series-specific preferences --> <!-- Series-specific preferences -->
<TextView
android:id="@+id/series_prefs"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/pref_category_for_this_series"
android:textColor="?attr/colorAccent"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/viewer_text" android:id="@+id/viewer_text"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/viewer" android:text="@string/pref_category_for_this_series"
app:layout_constraintBaseline_toBaselineOf="@id/viewer" app:layout_constraintBaseline_toBaselineOf="@id/viewer"
app:layout_constraintEnd_toStartOf="@id/verticalcenter" app:layout_constraintEnd_toStartOf="@id/verticalcenter"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
@ -43,11 +26,10 @@
android:id="@+id/viewer" android:id="@+id/viewer"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginTop="20dp"
android:entries="@array/viewers_selector" android:entries="@array/viewers_selector"
app:layout_constraintEnd_toEndOf="@id/spinner_end" app:layout_constraintEnd_toEndOf="@id/spinner_end"
app:layout_constraintStart_toEndOf="@id/verticalcenter" app:layout_constraintStart_toEndOf="@id/verticalcenter"
app:layout_constraintTop_toBottomOf="@id/series_prefs" /> app:layout_constraintTop_toTopOf="parent" />
<!-- Pager preferences --> <!-- Pager preferences -->
@ -81,6 +63,13 @@
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintGuide_percent="0.5" /> app:layout_constraintGuide_percent="0.5" />
<android.widget.Space
android:id="@+id/spinner_end"
android:layout_width="16dp"
android:layout_height="0dp"
app:layout_constraintStart_toEndOf="parent"
tools:ignore="MissingConstraints" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>