|
|
|
@ -1,12 +1,11 @@
|
|
|
|
|
<?xml version="1.0" encoding="utf-8"?>
|
|
|
|
|
<eu.kanade.tachiyomi.ui.library.filter.FilterBottomSheet 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/bottom_sheet"
|
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
|
style="@style/BottomSheetDialogTheme"
|
|
|
|
|
android:background="@drawable/bg_bottom_sheet_dialog_fragment"
|
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
|
android:background="@drawable/bg_bottom_sheet_dialog_fragment"
|
|
|
|
|
android:clickable="true"
|
|
|
|
|
android:focusable="true"
|
|
|
|
|
android:orientation="vertical"
|
|
|
|
@ -16,144 +15,164 @@
|
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
|
android:layout_height="wrap_content">
|
|
|
|
|
|
|
|
|
|
<androidx.core.widget.NestedScrollView
|
|
|
|
|
android:id="@+id/scrollView"
|
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
|
app:layout_constraintTop_toTopOf="parent"
|
|
|
|
|
app:layout_constraintBottom_toBottomOf="parent"
|
|
|
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
|
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
|
|
|
android:layout_height="wrap_content">
|
|
|
|
|
|
|
|
|
|
<LinearLayout
|
|
|
|
|
<androidx.core.widget.NestedScrollView
|
|
|
|
|
android:id="@+id/scrollView"
|
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
|
app:layout_constraintBottom_toBottomOf="parent"
|
|
|
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
|
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
|
|
|
app:layout_constraintTop_toTopOf="parent">
|
|
|
|
|
|
|
|
|
|
android:orientation="vertical">
|
|
|
|
|
|
|
|
|
|
<HorizontalScrollView
|
|
|
|
|
android:id="@+id/filterScrollView"
|
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
|
<LinearLayout
|
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
|
android:layout_marginTop="6dp"
|
|
|
|
|
android:clipToPadding="false"
|
|
|
|
|
android:paddingStart="20dp"
|
|
|
|
|
android:paddingTop="10dp"
|
|
|
|
|
android:paddingEnd="20dp"
|
|
|
|
|
android:paddingBottom="10dp"
|
|
|
|
|
android:scrollbars="none">
|
|
|
|
|
|
|
|
|
|
<LinearLayout
|
|
|
|
|
android:id="@+id/filterLayout"
|
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
|
android:gravity="center_vertical"
|
|
|
|
|
android:orientation="horizontal">
|
|
|
|
|
|
|
|
|
|
</LinearLayout>
|
|
|
|
|
</HorizontalScrollView>
|
|
|
|
|
android:orientation="vertical">
|
|
|
|
|
|
|
|
|
|
<HorizontalScrollView
|
|
|
|
|
android:id="@+id/sortScrollView"
|
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
|
android:layout_marginTop="6dp"
|
|
|
|
|
android:clipToPadding="false"
|
|
|
|
|
android:paddingStart="30dp"
|
|
|
|
|
android:paddingTop="10dp"
|
|
|
|
|
android:paddingEnd="20dp"
|
|
|
|
|
android:paddingBottom="10dp"
|
|
|
|
|
android:scrollbars="none">
|
|
|
|
|
|
|
|
|
|
<LinearLayout
|
|
|
|
|
android:id="@+id/sortLayout"
|
|
|
|
|
<HorizontalScrollView
|
|
|
|
|
android:id="@+id/filterScrollView"
|
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
|
android:baselineAligned="true"
|
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
|
android:gravity="center|start"
|
|
|
|
|
android:orientation="vertical">
|
|
|
|
|
android:layout_marginTop="6dp"
|
|
|
|
|
android:clipToPadding="false"
|
|
|
|
|
android:paddingStart="20dp"
|
|
|
|
|
android:paddingTop="10dp"
|
|
|
|
|
android:paddingEnd="20dp"
|
|
|
|
|
android:paddingBottom="10dp"
|
|
|
|
|
android:scrollbars="none">
|
|
|
|
|
|
|
|
|
|
<TextView
|
|
|
|
|
android:id="@+id/mainSortTextView"
|
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
|
android:layout_marginEnd="20dp"
|
|
|
|
|
android:layout_weight="1"
|
|
|
|
|
android:layout_marginBottom="20dp"
|
|
|
|
|
android:clickable="true"
|
|
|
|
|
android:drawablePadding="16dp"
|
|
|
|
|
android:focusable="true"
|
|
|
|
|
android:gravity="center"
|
|
|
|
|
android:text="srgdg"
|
|
|
|
|
android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
|
|
|
|
|
android:textColor="?android:attr/textColorPrimary"
|
|
|
|
|
android:textSize="15sp"
|
|
|
|
|
android:textStyle="normal" />
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<TextView
|
|
|
|
|
android:id="@+id/catSortTextView"
|
|
|
|
|
<LinearLayout
|
|
|
|
|
android:id="@+id/filterLayout"
|
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
|
android:layout_marginEnd="20dp"
|
|
|
|
|
android:layout_weight="1"
|
|
|
|
|
android:layout_marginBottom="20dp"
|
|
|
|
|
android:clickable="true"
|
|
|
|
|
android:drawablePadding="16dp"
|
|
|
|
|
android:gravity="center"
|
|
|
|
|
android:focusable="true"
|
|
|
|
|
android:text="srgdg"
|
|
|
|
|
android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
|
|
|
|
|
android:textColor="?android:attr/textColorPrimary"
|
|
|
|
|
android:textSize="15sp"
|
|
|
|
|
android:textStyle="normal" />
|
|
|
|
|
android:gravity="center_vertical"
|
|
|
|
|
android:orientation="horizontal">
|
|
|
|
|
|
|
|
|
|
<ImageView
|
|
|
|
|
android:id="@+id/pendingClearButton"
|
|
|
|
|
android:layout_width="32dp"
|
|
|
|
|
android:layout_height="32dp"
|
|
|
|
|
android:layout_marginStart="10dp"
|
|
|
|
|
android:layout_marginEnd="10dp"
|
|
|
|
|
android:background="@drawable/round_clear_border"
|
|
|
|
|
android:clickable="true"
|
|
|
|
|
android:contentDescription="@string/action_clear"
|
|
|
|
|
android:focusable="true"
|
|
|
|
|
android:padding="3dp"
|
|
|
|
|
android:src="@drawable/ic_close_white_24dp"
|
|
|
|
|
android:tint="@color/gray_button" />
|
|
|
|
|
|
|
|
|
|
</LinearLayout>
|
|
|
|
|
</HorizontalScrollView>
|
|
|
|
|
|
|
|
|
|
<HorizontalScrollView
|
|
|
|
|
android:id="@+id/sortScrollView"
|
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
|
android:layout_marginTop="6dp"
|
|
|
|
|
android:clipToPadding="false"
|
|
|
|
|
android:paddingStart="30dp"
|
|
|
|
|
android:paddingTop="0dp"
|
|
|
|
|
android:paddingEnd="20dp"
|
|
|
|
|
android:paddingBottom="10dp"
|
|
|
|
|
android:scrollbars="none">
|
|
|
|
|
|
|
|
|
|
<LinearLayout
|
|
|
|
|
android:id="@+id/displayLayout"
|
|
|
|
|
android:id="@+id/sideLayout"
|
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
|
android:baselineAligned="true"
|
|
|
|
|
android:gravity="center|start"
|
|
|
|
|
android:layout_weight="1"
|
|
|
|
|
android:baselineAligned="false"
|
|
|
|
|
android:orientation="horizontal">
|
|
|
|
|
android:orientation="vertical">
|
|
|
|
|
|
|
|
|
|
<TextView
|
|
|
|
|
<LinearLayout
|
|
|
|
|
android:id="@+id/sortingLayout"
|
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
|
android:clickable="true"
|
|
|
|
|
android:layout_marginEnd="14dp"
|
|
|
|
|
android:focusable="true"
|
|
|
|
|
android:text="@string/display_as"
|
|
|
|
|
android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
|
|
|
|
|
android:textColor="?android:attr/textColorPrimary"
|
|
|
|
|
android:textSize="15sp"
|
|
|
|
|
android:textStyle="normal" />
|
|
|
|
|
|
|
|
|
|
android:layout_marginTop="10dp"
|
|
|
|
|
android:layout_marginBottom="10dp"
|
|
|
|
|
android:baselineAligned="false"
|
|
|
|
|
android:gravity="center|start"
|
|
|
|
|
android:orientation="horizontal">
|
|
|
|
|
|
|
|
|
|
<RadioGroup
|
|
|
|
|
android:id="@+id/displayGroup"
|
|
|
|
|
<TextView
|
|
|
|
|
android:id="@+id/mainSortTextView"
|
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
|
android:layout_marginEnd="20dp"
|
|
|
|
|
android:clickable="true"
|
|
|
|
|
android:drawablePadding="16dp"
|
|
|
|
|
android:focusable="true"
|
|
|
|
|
android:gravity="center"
|
|
|
|
|
android:text="srgdg"
|
|
|
|
|
android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
|
|
|
|
|
android:textColor="?android:attr/textColorPrimary"
|
|
|
|
|
android:textSize="15sp"
|
|
|
|
|
android:textStyle="normal" />
|
|
|
|
|
|
|
|
|
|
<TextView
|
|
|
|
|
android:id="@+id/catSortTextView"
|
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
|
android:layout_marginEnd="20dp"
|
|
|
|
|
android:clickable="true"
|
|
|
|
|
android:drawablePadding="16dp"
|
|
|
|
|
android:focusable="true"
|
|
|
|
|
android:gravity="center"
|
|
|
|
|
android:text="srgdg"
|
|
|
|
|
android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
|
|
|
|
|
android:textColor="?android:attr/textColorPrimary"
|
|
|
|
|
android:textSize="15sp"
|
|
|
|
|
android:textStyle="normal" />
|
|
|
|
|
|
|
|
|
|
</LinearLayout>
|
|
|
|
|
|
|
|
|
|
<LinearLayout
|
|
|
|
|
android:id="@+id/displayLayout"
|
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
|
android:baselineAligned="false"
|
|
|
|
|
android:gravity="center|start"
|
|
|
|
|
android:orientation="horizontal">
|
|
|
|
|
|
|
|
|
|
<RadioButton
|
|
|
|
|
<TextView
|
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
|
android:paddingStart="0dp"
|
|
|
|
|
android:paddingEnd="8dp"
|
|
|
|
|
android:text="@string/action_display_grid" />
|
|
|
|
|
|
|
|
|
|
<RadioButton
|
|
|
|
|
android:layout_marginEnd="14dp"
|
|
|
|
|
android:clickable="true"
|
|
|
|
|
android:focusable="true"
|
|
|
|
|
android:text="@string/display_as"
|
|
|
|
|
android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
|
|
|
|
|
android:textColor="?android:attr/textColorPrimary"
|
|
|
|
|
android:textSize="15sp"
|
|
|
|
|
android:textStyle="normal" />
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<RadioGroup
|
|
|
|
|
android:id="@+id/displayGroup"
|
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
|
android:layout_marginStart="24dp"
|
|
|
|
|
android:text="@string/action_display_list" />
|
|
|
|
|
</RadioGroup>
|
|
|
|
|
android:orientation="horizontal">
|
|
|
|
|
|
|
|
|
|
<RadioButton
|
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
|
android:paddingStart="0dp"
|
|
|
|
|
android:paddingEnd="8dp"
|
|
|
|
|
android:text="@string/action_display_grid" />
|
|
|
|
|
|
|
|
|
|
<RadioButton
|
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
|
android:layout_marginStart="24dp"
|
|
|
|
|
android:text="@string/action_display_list" />
|
|
|
|
|
</RadioGroup>
|
|
|
|
|
</LinearLayout>
|
|
|
|
|
</LinearLayout>
|
|
|
|
|
</LinearLayout>
|
|
|
|
|
</HorizontalScrollView>
|
|
|
|
|
</LinearLayout>
|
|
|
|
|
</androidx.core.widget.NestedScrollView>
|
|
|
|
|
</HorizontalScrollView>
|
|
|
|
|
</LinearLayout>
|
|
|
|
|
</androidx.core.widget.NestedScrollView>
|
|
|
|
|
|
|
|
|
|
<androidx.constraintlayout.widget.ConstraintLayout
|
|
|
|
|
android:id="@+id/topbar"
|
|
|
|
@ -162,8 +181,8 @@
|
|
|
|
|
android:background="@drawable/bg_bottom_sheet_dialog_fragment"
|
|
|
|
|
android:backgroundTint="?android:attr/colorPrimary"
|
|
|
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
|
|
|
app:layout_constraintTop_toTopOf="parent"
|
|
|
|
|
app:layout_constraintStart_toStartOf="parent">
|
|
|
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
|
|
|
app:layout_constraintTop_toTopOf="parent">
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<ImageView
|
|
|
|
@ -184,7 +203,7 @@
|
|
|
|
|
android:layout_marginTop="15dp"
|
|
|
|
|
android:layout_marginEnd="8dp"
|
|
|
|
|
android:layout_marginBottom="15dp"
|
|
|
|
|
android:text="@string/filter_and_sort"
|
|
|
|
|
android:text="Filter & Sort"
|
|
|
|
|
android:textAlignment="textStart"
|
|
|
|
|
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
|
|
|
|
|
android:textColor="?attr/actionBarTintColor"
|
|
|
|
@ -192,19 +211,6 @@
|
|
|
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
|
|
|
app:layout_constraintStart_toEndOf="@+id/imageView2"
|
|
|
|
|
app:layout_constraintTop_toTopOf="parent" />
|
|
|
|
|
|
|
|
|
|
<TextView
|
|
|
|
|
android:id="@+id/title"
|
|
|
|
|
android:layout_width="0dp"
|
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
|
android:text="Filter & Sort"
|
|
|
|
|
android:textAlignment="textStart"
|
|
|
|
|
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
|
|
|
|
|
android:textColor="?attr/actionBarTintColor"
|
|
|
|
|
app:layout_constraintBottom_toBottomOf="@+id/sortText"
|
|
|
|
|
app:layout_constraintEnd_toEndOf="@+id/sortText"
|
|
|
|
|
app:layout_constraintStart_toStartOf="@+id/sortText"
|
|
|
|
|
app:layout_constraintTop_toTopOf="@+id/sortText" />
|
|
|
|
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
|
|
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
|
|
|
</eu.kanade.tachiyomi.ui.library.filter.FilterBottomSheet>
|
|
|
|
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
|
|
|
</eu.kanade.tachiyomi.ui.library.filter.FilterBottomSheet>
|