mirror of
https://github.com/tachiyomiorg/tachiyomi.git
synced 2024-11-15 13:45:06 +01:00
6d6766a86a
* Start of dual pages * Fixes to dual pages + added button to shift Next to add a button to get out of this nightmare * Adding preference to truly support on and off * Set double pages correctly for L2R reading mode * Hide shift double page in single page mode also fix shift into or out of double pages not going to right page * Shift page back on loading a new chapter * Fix back shift when reaching near end of chapter with shifted pages * Fix chapters not being marked as read when last pages are doubled * more fixes * change menu icon and verbage * Fixed going to previous/next chapter when turning on/off double shift sometimes * Fix shift icon for double page in R2L * Adding double page as option in reader sheet * Adding saving/share/setting cover for second page * Add back page indicator * RTL language support for current page in double mode * Changing to double page always moves the current page to first slot Also fix bad snap back from single to double or vice versa * Reset shift icon when going to a new chapter * Add Double pages to reader settings * Add padding to current/total pages text since it gets pretty long with double digits in double pages mode * Option for automatic single/double layout based on orientation With option to change mid read * More fixes * Lotta reworking to make this work Lotta reworking to make this work Seriously a lot of reworking to make this work * Cleanup + Some documentation Because I won't "know my own code" I genuinely do not know what I just coded * Swapped around icons for double page in chapter sheet bar Since it was confusing even me * Fix shifting not updating the ui, nor shifting back to the right page * Fix changing chapters * Fixed Prev Chapter transition page jumping back 1 * Fixed progress spinner for single page loading * Fix the case of a second page shifting for full width while double shift is on It would unshift the pages in this case, requiring another shift back If this sounds confusing or complex, it's because it is Also clean up * Update Initial dual page bg to match reader bg theme * More cleanup * More cleanup + docs + refactoring * String update * more cleanup * Update toolbar ripple based if the menu item is visible * Fix more issues with shifting + next chapter's first page being a double * Cleanup ChapterTransision Checks * Always run shifting logic * Even more optimizing which hopefully didnt break something (prolly did) (spoilers it did I had to undo this local commit) (more spoilers it still will break again) * Fix Retry in double mode * Set gifs as fullpages * Fix going from automatic to single/double page layout * More cleanup, more comments * Fix changing page layout when on a transition page for a manga with a single chapter The edge cases you can find....man * Restore shifted pages on activity recrreation * Adding a "beta" tag to page layout IMO it's absolutely solid and release candidate ready, but you can get away with so much by calling something a "beta" or an "alpha"
142 lines
6.3 KiB
XML
142 lines
6.3 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<eu.kanade.tachiyomi.ui.reader.settings.ReaderPagedView xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
android:id="@+id/filter_bottom_sheet"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:background="@drawable/bottom_sheet_rounded_background"
|
|
android:clipToPadding="false">
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:paddingStart="@dimen/material_component_dialogs_padding_around_content_area"
|
|
android:orientation="vertical"
|
|
android:paddingTop="0dp"
|
|
android:paddingEnd="@dimen/material_component_dialogs_padding_around_content_area">
|
|
|
|
<eu.kanade.tachiyomi.widget.MaterialSpinnerView
|
|
android:id="@+id/pager_nav"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="4dp"
|
|
app:title="@string/nav_layout"
|
|
android:entries="@array/reader_nav" />
|
|
|
|
<eu.kanade.tachiyomi.widget.MaterialSpinnerView
|
|
android:id="@+id/pager_invert"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="4dp"
|
|
app:title="@string/invert_tapping"
|
|
android:entries="@array/invert_tapping_mode" />
|
|
|
|
<eu.kanade.tachiyomi.widget.MaterialSpinnerView
|
|
android:id="@+id/scale_type"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="4dp"
|
|
app:title="@string/scale_type"
|
|
android:entries="@array/image_scale_type" />
|
|
|
|
<eu.kanade.tachiyomi.widget.MaterialSpinnerView
|
|
android:id="@+id/page_layout"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="4dp"
|
|
app:title="@string/page_layout"
|
|
android:entries="@array/page_layouts" />
|
|
|
|
<eu.kanade.tachiyomi.widget.MaterialSpinnerView
|
|
android:id="@+id/extend_past_cutout"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="4dp"
|
|
app:title="@string/cutout_area_behavior"
|
|
android:entries="@array/cutout_behavior" />
|
|
|
|
<eu.kanade.tachiyomi.widget.MaterialSpinnerView
|
|
android:id="@+id/zoom_start"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="4dp"
|
|
app:title="@string/zoom_start_position"
|
|
android:entries="@array/zoom_start" />
|
|
|
|
<com.google.android.material.switchmaterial.SwitchMaterial
|
|
android:id="@+id/crop_borders"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="4dp"
|
|
android:text="@string/crop_borders"
|
|
android:textColor="?android:attr/textColorPrimary" />
|
|
|
|
<com.google.android.material.switchmaterial.SwitchMaterial
|
|
android:id="@+id/page_transitions"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="0dp"
|
|
android:text="@string/animate_page_transitions"
|
|
android:textColor="?android:attr/textColorPrimary" />
|
|
|
|
<!-- Webtoon Prefs -->
|
|
<eu.kanade.tachiyomi.widget.MaterialSpinnerView
|
|
android:id="@+id/webtoon_nav"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="4dp"
|
|
app:title="@string/nav_layout"
|
|
android:entries="@array/reader_nav" />
|
|
|
|
<eu.kanade.tachiyomi.widget.MaterialSpinnerView
|
|
android:id="@+id/webtoon_invert"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="4dp"
|
|
app:title="@string/invert_tapping"
|
|
android:entries="@array/invert_tapping_mode" />
|
|
|
|
<eu.kanade.tachiyomi.widget.MaterialSpinnerView
|
|
android:id="@+id/webtoon_side_padding"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="4dp"
|
|
app:title="@string/pref_webtoon_side_padding"
|
|
android:entries="@array/webtoon_side_padding" />
|
|
|
|
<com.google.android.material.switchmaterial.SwitchMaterial
|
|
android:id="@+id/crop_borders_webtoon"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="4dp"
|
|
android:text="@string/crop_borders"
|
|
android:textColor="?android:attr/textColorPrimary"
|
|
app:layout_constraintTop_toTopOf="parent" />
|
|
|
|
<com.google.android.material.switchmaterial.SwitchMaterial
|
|
android:id="@+id/webtoon_enable_zoom_out"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="4dp"
|
|
android:text="@string/enable_zoom_out"
|
|
android:textColor="?android:attr/textColorPrimary"
|
|
app:layout_constraintTop_toBottomOf="@id/webtoon_side_padding" />
|
|
|
|
<androidx.constraintlayout.widget.Group
|
|
android:id="@+id/pager_prefs_group"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:visibility="gone"
|
|
app:constraint_referenced_ids="scale_type,zoom_start,crop_borders,page_transitions"
|
|
tools:visibility="visible" />
|
|
|
|
<androidx.constraintlayout.widget.Group
|
|
android:id="@+id/webtoon_prefs_group"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:visibility="gone"
|
|
app:constraint_referenced_ids="crop_borders_webtoon,webtoon_side_padding,webtoon_enable_zoom_out" />
|
|
|
|
</LinearLayout>
|
|
</eu.kanade.tachiyomi.ui.reader.settings.ReaderPagedView> |