mirror of
				https://github.com/mihonapp/mihon.git
				synced 2025-11-04 08:08:55 +01:00 
			
		
		
		
	Reorganize reader sheet contents a bit
This commit is contained in:
		@@ -11,45 +11,10 @@
 | 
			
		||||
        android:layout_width="match_parent"
 | 
			
		||||
        android:layout_height="match_parent">
 | 
			
		||||
 | 
			
		||||
        <!-- General display preferences -->
 | 
			
		||||
 | 
			
		||||
        <TextView
 | 
			
		||||
            android:id="@+id/general_prefs"
 | 
			
		||||
            android:layout_width="0dp"
 | 
			
		||||
            android:layout_height="wrap_content"
 | 
			
		||||
            android:layout_marginTop="32dp"
 | 
			
		||||
            android:text="@string/pref_category_general"
 | 
			
		||||
            android:textColor="?attr/colorAccent"
 | 
			
		||||
            android:textStyle="bold"
 | 
			
		||||
            app:layout_constraintStart_toStartOf="parent"
 | 
			
		||||
            app:layout_constraintTop_toBottomOf="@+id/viewer" />
 | 
			
		||||
 | 
			
		||||
        <com.google.android.material.switchmaterial.SwitchMaterial
 | 
			
		||||
            android:id="@+id/page_transitions"
 | 
			
		||||
            android:layout_width="match_parent"
 | 
			
		||||
            android:layout_height="wrap_content"
 | 
			
		||||
            android:text="@string/pref_page_transitions"
 | 
			
		||||
            android:textColor="?android:attr/textColorSecondary"
 | 
			
		||||
            app:layout_constraintTop_toBottomOf="@id/general_prefs" />
 | 
			
		||||
 | 
			
		||||
        <!-- 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
 | 
			
		||||
            android:id="@+id/rotation_mode_text"
 | 
			
		||||
            android:layout_width="0dp"
 | 
			
		||||
            android:layout_height="wrap_content"
 | 
			
		||||
            android:layout_marginTop="20dp"
 | 
			
		||||
            android:text="@string/pref_rotation_type"
 | 
			
		||||
            app:layout_constraintBaseline_toBaselineOf="@id/rotation_mode"
 | 
			
		||||
            app:layout_constraintEnd_toStartOf="@id/verticalcenter"
 | 
			
		||||
@@ -59,11 +24,10 @@
 | 
			
		||||
            android:id="@+id/rotation_mode"
 | 
			
		||||
            android:layout_width="0dp"
 | 
			
		||||
            android:layout_height="wrap_content"
 | 
			
		||||
            android:layout_marginTop="20dp"
 | 
			
		||||
            android:entries="@array/rotation_type"
 | 
			
		||||
            app:layout_constraintEnd_toEndOf="@id/spinner_end"
 | 
			
		||||
            app:layout_constraintStart_toEndOf="@id/verticalcenter"
 | 
			
		||||
            app:layout_constraintTop_toBottomOf="@id/display_prefs" />
 | 
			
		||||
            app:layout_constraintTop_toTopOf="parent" />
 | 
			
		||||
 | 
			
		||||
        <TextView
 | 
			
		||||
            android:id="@+id/background_color_text"
 | 
			
		||||
@@ -135,12 +99,13 @@
 | 
			
		||||
            android:textColor="?android:attr/textColorSecondary"
 | 
			
		||||
            app:layout_constraintTop_toBottomOf="@id/long_tap" />
 | 
			
		||||
 | 
			
		||||
        <android.widget.Space
 | 
			
		||||
            android:id="@+id/end_general_preferences"
 | 
			
		||||
            android:layout_width="0dp"
 | 
			
		||||
            android:layout_height="0dp"
 | 
			
		||||
            app:layout_constraintBottom_toBottomOf="@id/always_show_chapter_transition"
 | 
			
		||||
            tools:ignore="MissingConstraints" />
 | 
			
		||||
        <com.google.android.material.switchmaterial.SwitchMaterial
 | 
			
		||||
            android:id="@+id/page_transitions"
 | 
			
		||||
            android:layout_width="match_parent"
 | 
			
		||||
            android:layout_height="wrap_content"
 | 
			
		||||
            android:text="@string/pref_page_transitions"
 | 
			
		||||
            android:textColor="?android:attr/textColorSecondary"
 | 
			
		||||
            app:layout_constraintTop_toBottomOf="@id/always_show_chapter_transition" />
 | 
			
		||||
 | 
			
		||||
        <android.widget.Space
 | 
			
		||||
            android:id="@+id/spinner_end"
 | 
			
		||||
 
 | 
			
		||||
@@ -11,30 +11,13 @@
 | 
			
		||||
        android:layout_width="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 -->
 | 
			
		||||
 | 
			
		||||
        <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
 | 
			
		||||
            android:id="@+id/viewer_text"
 | 
			
		||||
            android:layout_width="0dp"
 | 
			
		||||
            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_constraintEnd_toStartOf="@id/verticalcenter"
 | 
			
		||||
            app:layout_constraintStart_toStartOf="parent" />
 | 
			
		||||
@@ -43,11 +26,10 @@
 | 
			
		||||
            android:id="@+id/viewer"
 | 
			
		||||
            android:layout_width="0dp"
 | 
			
		||||
            android:layout_height="24dp"
 | 
			
		||||
            android:layout_marginTop="20dp"
 | 
			
		||||
            android:entries="@array/viewers_selector"
 | 
			
		||||
            app:layout_constraintEnd_toEndOf="@id/spinner_end"
 | 
			
		||||
            app:layout_constraintStart_toEndOf="@id/verticalcenter"
 | 
			
		||||
            app:layout_constraintTop_toBottomOf="@id/series_prefs" />
 | 
			
		||||
            app:layout_constraintTop_toTopOf="parent" />
 | 
			
		||||
 | 
			
		||||
        <!-- Pager preferences -->
 | 
			
		||||
 | 
			
		||||
@@ -81,6 +63,13 @@
 | 
			
		||||
            android:orientation="vertical"
 | 
			
		||||
            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.core.widget.NestedScrollView>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user