mirror of
				https://github.com/mihonapp/mihon.git
				synced 2025-10-31 06:17:57 +01:00 
			
		
		
		
	Migrate source filter sheet to Compose (#9135)
This commit is contained in:
		| @@ -1,7 +0,0 @@ | ||||
| <shape xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     android:shape="rectangle"> | ||||
|     <solid android:color="@android:color/transparent" /> | ||||
|     <size | ||||
|         android:width="32dp" | ||||
|         android:height="32dp" /> | ||||
| </shape> | ||||
| @@ -1,15 +0,0 @@ | ||||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     android:width="32dp" | ||||
|     android:height="32dp" | ||||
|     android:viewportWidth="32" | ||||
|     android:viewportHeight="32"> | ||||
|     <group | ||||
|         android:pivotX="32" | ||||
|         android:pivotY="32" | ||||
|         android:scaleX="0.8" | ||||
|         android:scaleY="0.8"> | ||||
|         <path | ||||
|             android:fillColor="@android:color/white" | ||||
|             android:pathData="M20,12l-1.41,-1.41L13,16.17V4h-2v12.17l-5.58,-5.59L4,12l8,8 8,-8z" /> | ||||
|     </group> | ||||
| </vector> | ||||
| @@ -1,15 +0,0 @@ | ||||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     android:width="32dp" | ||||
|     android:height="32dp" | ||||
|     android:viewportWidth="32" | ||||
|     android:viewportHeight="32"> | ||||
|     <group | ||||
|         android:pivotX="32" | ||||
|         android:pivotY="32" | ||||
|         android:scaleX="0.8" | ||||
|         android:scaleY="0.8"> | ||||
|         <path | ||||
|             android:fillColor="@android:color/white" | ||||
|             android:pathData="M4,12l1.41,1.41L11,7.83V20h2V7.83l5.58,5.59L20,12l-8,-8 -8,8z" /> | ||||
|     </group> | ||||
| </vector> | ||||
| @@ -1,9 +0,0 @@ | ||||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     android:width="24dp" | ||||
|     android:height="24dp" | ||||
|     android:viewportWidth="24" | ||||
|     android:viewportHeight="24"> | ||||
|     <path | ||||
|         android:fillColor="@android:color/black" | ||||
|         android:pathData="M10.6,16.2 L17.65,9.15 16.25,7.75 10.6,13.4 7.75,10.55 6.35,11.95ZM5,21Q4.175,21 3.587,20.413Q3,19.825 3,19V5Q3,4.175 3.587,3.587Q4.175,3 5,3H19Q19.825,3 20.413,3.587Q21,4.175 21,5V19Q21,19.825 20.413,20.413Q19.825,21 19,21Z"/> | ||||
| </vector> | ||||
| @@ -1,9 +0,0 @@ | ||||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     android:width="24dp" | ||||
|     android:height="24dp" | ||||
|     android:viewportWidth="24" | ||||
|     android:viewportHeight="24"> | ||||
|     <path | ||||
|         android:fillColor="@android:color/black" | ||||
|         android:pathData="M19,5v14H5V5h14m0,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z" /> | ||||
| </vector> | ||||
| @@ -1,9 +0,0 @@ | ||||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     android:width="24dp" | ||||
|     android:height="24dp" | ||||
|     android:viewportWidth="24" | ||||
|     android:viewportHeight="24"> | ||||
|     <path | ||||
|         android:fillColor="@android:color/black" | ||||
|         android:pathData="M19,3H16.3H7.7H5A2,2 0 0,0 3,5V7.7V16.4V19A2,2 0 0,0 5,21H7.7H16.4H19A2,2 0 0,0 21,19V16.3V7.7V5A2,2 0 0,0 19,3M15.6,17L12,13.4L8.4,17L7,15.6L10.6,12L7,8.4L8.4,7L12,10.6L15.6,7L17,8.4L13.4,12L17,15.6L15.6,17Z" /> | ||||
| </vector> | ||||
| @@ -1,9 +0,0 @@ | ||||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     android:width="24dp" | ||||
|     android:height="24dp" | ||||
|     android:viewportWidth="24" | ||||
|     android:viewportHeight="24"> | ||||
|     <path | ||||
|         android:fillColor="@android:color/black" | ||||
|         android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z" /> | ||||
| </vector> | ||||
| @@ -1,24 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="?attr/listPreferredItemHeightSmall" | ||||
|     xmlns:tools="http://schemas.android.com/tools" | ||||
|     android:background="?attr/selectableItemBackground" | ||||
|     android:focusable="true" | ||||
|     android:paddingStart="?attr/listPreferredItemPaddingStart" | ||||
|     android:paddingEnd="?attr/listPreferredItemPaddingEnd"> | ||||
|  | ||||
|     <CheckBox | ||||
|         android:id="@+id/nav_view_item" | ||||
|         android:layout_width="0dp" | ||||
|         android:layout_height="match_parent" | ||||
|         android:layout_weight="1" | ||||
|         android:background="@android:color/transparent" | ||||
|         android:clickable="false" | ||||
|         android:gravity="center_vertical|start" | ||||
|         android:maxLines="1" | ||||
|         android:paddingHorizontal="16dp" | ||||
|         android:textAppearance="?attr/textAppearanceBodyMedium" | ||||
|         tools:text="Title" /> | ||||
|  | ||||
| </LinearLayout> | ||||
| @@ -1,22 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="?attr/listPreferredItemHeightSmall" | ||||
|     xmlns:tools="http://schemas.android.com/tools" | ||||
|     android:background="?attr/selectableItemBackground" | ||||
|     android:focusable="true" | ||||
|     android:paddingStart="?attr/listPreferredItemPaddingStart" | ||||
|     android:paddingEnd="?attr/listPreferredItemPaddingEnd"> | ||||
|  | ||||
|     <CheckedTextView | ||||
|         android:id="@+id/nav_view_item" | ||||
|         android:layout_width="0dp" | ||||
|         android:layout_height="match_parent" | ||||
|         android:layout_weight="1" | ||||
|         android:drawablePadding="16dp" | ||||
|         android:gravity="center_vertical|start" | ||||
|         android:maxLines="1" | ||||
|         android:textAppearance="?attr/textAppearanceBodyMedium" | ||||
|         tools:text="Title" /> | ||||
|  | ||||
| </LinearLayout> | ||||
| @@ -1,29 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <LinearLayout 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:layout_width="match_parent" | ||||
|     android:layout_height="?attr/listPreferredItemHeightSmall" | ||||
|     android:gravity="center_vertical" | ||||
|     android:orientation="horizontal" | ||||
|     android:paddingStart="?attr/listPreferredItemPaddingStart" | ||||
|     android:paddingEnd="?attr/listPreferredItemPaddingEnd"> | ||||
|  | ||||
|     <TextView | ||||
|         android:id="@+id/title" | ||||
|         android:layout_width="0dp" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:layout_weight="1" | ||||
|         android:ellipsize="end" | ||||
|         android:maxLines="1" | ||||
|         android:textAppearance="@style/TextAppearance.Tachiyomi.SectionHeader" | ||||
|         tools:text="Header" /> | ||||
|  | ||||
|     <ImageView | ||||
|         android:id="@+id/expand_icon" | ||||
|         android:layout_width="wrap_content" | ||||
|         android:layout_height="wrap_content" | ||||
|         app:tint="?attr/colorOnBackground" | ||||
|         tools:ignore="ContentDescription" /> | ||||
|  | ||||
| </LinearLayout> | ||||
| @@ -1,22 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="?attr/listPreferredItemHeightSmall" | ||||
|     android:background="?attr/selectableItemBackground" | ||||
|     android:focusable="true" | ||||
|     android:paddingStart="?attr/listPreferredItemPaddingStart" | ||||
|     android:paddingEnd="?attr/listPreferredItemPaddingEnd"> | ||||
|  | ||||
|     <RadioButton | ||||
|         android:id="@+id/nav_view_item" | ||||
|         android:layout_width="0dp" | ||||
|         android:layout_height="match_parent" | ||||
|         android:layout_weight="1" | ||||
|         android:background="@android:color/transparent" | ||||
|         android:clickable="false" | ||||
|         android:gravity="center_vertical|start" | ||||
|         android:maxLines="1" | ||||
|         android:paddingHorizontal="16dp" | ||||
|         android:textAppearance="?attr/textAppearanceBodyMedium" /> | ||||
|  | ||||
| </LinearLayout> | ||||
| @@ -1,33 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     xmlns:tools="http://schemas.android.com/tools" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="?attr/listPreferredItemHeightSmall" | ||||
|     android:background="?attr/selectableItemBackground" | ||||
|     android:focusable="true" | ||||
|     android:paddingStart="?attr/listPreferredItemPaddingStart" | ||||
|     android:paddingEnd="?attr/listPreferredItemPaddingEnd"> | ||||
|  | ||||
|     <TextView | ||||
|         android:id="@+id/nav_view_item_text" | ||||
|         android:layout_width="0dp" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:layout_gravity="center" | ||||
|         android:layout_weight="1" | ||||
|         android:ellipsize="end" | ||||
|         android:maxLines="1" | ||||
|         android:paddingEnd="8dp" | ||||
|         android:textAppearance="?attr/textAppearanceBodyMedium" | ||||
|         android:textColor="?android:attr/textColorSecondary" | ||||
|         tools:text="Filter:" /> | ||||
|  | ||||
|     <Spinner | ||||
|         android:id="@+id/nav_view_item" | ||||
|         android:layout_width="0dp" | ||||
|         android:layout_height="match_parent" | ||||
|         android:layout_weight="1" | ||||
|         android:gravity="center_vertical|start" | ||||
|         android:maxLines="1" | ||||
|         android:textAppearance="@style/TextAppearance.AppCompat.Body1" /> | ||||
|  | ||||
| </LinearLayout> | ||||
| @@ -1,30 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="wrap_content" | ||||
|     android:background="?attr/selectableItemBackground" | ||||
|     android:baselineAligned="false" | ||||
|     android:focusable="true" | ||||
|     android:paddingStart="?attr/listPreferredItemPaddingStart" | ||||
|     android:paddingEnd="?attr/listPreferredItemPaddingEnd"> | ||||
|  | ||||
|     <com.google.android.material.textfield.TextInputLayout | ||||
|         android:id="@+id/nav_view_item_wrapper" | ||||
|         style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense" | ||||
|         android:layout_width="0dp" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:layout_weight="1" | ||||
|         android:gravity="center_vertical|start"> | ||||
|  | ||||
|         <eu.kanade.tachiyomi.widget.TachiyomiTextInputEditText | ||||
|             android:id="@+id/nav_view_item" | ||||
|             android:layout_width="match_parent" | ||||
|             android:layout_height="wrap_content" | ||||
|             android:imeOptions="actionDone" | ||||
|             android:inputType="text" | ||||
|             android:maxLines="1" | ||||
|             android:textAppearance="?attr/textAppearanceBodyMedium" /> | ||||
|  | ||||
|     </com.google.android.material.textfield.TextInputLayout> | ||||
|  | ||||
| </LinearLayout> | ||||
| @@ -1,47 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="match_parent" | ||||
|     android:orientation="vertical"> | ||||
|  | ||||
|     <androidx.constraintlayout.widget.ConstraintLayout | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_height="?attr/actionBarSize" | ||||
|         android:background="@drawable/transparent_tabs_background" | ||||
|         android:elevation="2dp" | ||||
|         android:gravity="center" | ||||
|         android:paddingHorizontal="?attr/listPreferredItemPaddingStart"> | ||||
|  | ||||
|         <Button | ||||
|             android:id="@+id/reset_btn" | ||||
|             style="?attr/borderlessButtonStyle" | ||||
|             android:layout_width="wrap_content" | ||||
|             android:layout_height="wrap_content" | ||||
|             android:text="@string/action_reset" | ||||
|             app:layout_constraintBottom_toBottomOf="parent" | ||||
|             app:layout_constraintStart_toStartOf="parent" | ||||
|             app:layout_constraintTop_toTopOf="parent" /> | ||||
|  | ||||
|         <Button | ||||
|             android:id="@+id/filter_btn" | ||||
|             android:layout_width="wrap_content" | ||||
|             android:layout_height="wrap_content" | ||||
|             android:layout_weight="1" | ||||
|             android:text="@string/action_filter" | ||||
|             app:layout_constraintBottom_toBottomOf="parent" | ||||
|             app:layout_constraintEnd_toEndOf="parent" | ||||
|             app:layout_constraintTop_toTopOf="parent" /> | ||||
|  | ||||
|     </androidx.constraintlayout.widget.ConstraintLayout> | ||||
|  | ||||
|     <FrameLayout | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_height="0dp" | ||||
|         android:layout_gravity="top" | ||||
|         android:layout_weight="1" | ||||
|         android:clipChildren="false" | ||||
|         android:clipToPadding="false" | ||||
|         android:paddingBottom="8dp" /> | ||||
|  | ||||
| </LinearLayout> | ||||
		Reference in New Issue
	
	Block a user