From a70a00e6e9511d8826874488b2904b86b3d3e930 Mon Sep 17 00:00:00 2001
From: Hermes Junior <ohermesjunior@gmail.com>
Date: Wed, 17 Jun 2020 18:14:36 +0200
Subject: Add icons to sort bottom sheets.

---
 ...fragment_search_post_sort_type_bottom_sheet.xml | 112 ++++++++-------
 .../res/layout/fragment_sort_type_bottom_sheet.xml | 154 ++++++++++++---------
 .../fragment_user_thing_sort_type_bottom_sheet.xml |  90 +++++++-----
 3 files changed, 204 insertions(+), 152 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml
index f7511131..8b1c86b6 100644
--- a/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml
@@ -1,95 +1,111 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView 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="wrap_content"
-    android:paddingBottom="8dp"
-    android:overScrollMode="never">
+    android:overScrollMode="never"
+    android:paddingBottom="8dp">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/relevance_type_text_view_search_sort_type_bottom_sheet_fragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/sort_relevance"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="?attr/font_default"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:drawableStart="@drawable/ic_best_24"
+            android:drawablePadding="48dp"
+            android:focusable="true"
             android:fontFamily="?attr/font_family"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp"
             android:paddingStart="32dp"
+            android:paddingTop="16dp"
             android:paddingEnd="32dp"
-            android:clickable="true"
-            android:focusable="true"
-            android:background="?attr/selectableItemBackground" />
+            android:paddingBottom="16dp"
+            android:text="@string/sort_relevance"
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="?attr/font_default"
+            app:drawableTint="?attr/primaryTextColor" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/hot_type_text_view_search_sort_type_bottom_sheet_fragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/sort_hot"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="?attr/font_default"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:drawableStart="@drawable/ic_hot_24"
+            android:drawablePadding="48dp"
+            android:focusable="true"
             android:fontFamily="?attr/font_family"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp"
             android:paddingStart="32dp"
+            android:paddingTop="16dp"
             android:paddingEnd="32dp"
-            android:clickable="true"
-            android:focusable="true"
-            android:background="?attr/selectableItemBackground" />
+            android:paddingBottom="16dp"
+            android:text="@string/sort_hot"
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="?attr/font_default"
+            app:drawableTint="?attr/primaryTextColor" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/top_type_text_view_search_sort_type_bottom_sheet_fragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/sort_top"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="?attr/font_default"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:drawableStart="@drawable/ic_top_24"
+            android:drawablePadding="48dp"
+            android:focusable="true"
             android:fontFamily="?attr/font_family"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp"
             android:paddingStart="32dp"
+            android:paddingTop="16dp"
             android:paddingEnd="32dp"
-            android:clickable="true"
-            android:focusable="true"
-            android:background="?attr/selectableItemBackground" />
+            android:paddingBottom="16dp"
+            android:text="@string/sort_top"
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="?attr/font_default"
+            app:drawableTint="?attr/primaryTextColor" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/new_type_text_view_search_sort_type_bottom_sheet_fragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/sort_new"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="?attr/font_default"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:drawableStart="@drawable/ic_new_24"
+            android:drawablePadding="48dp"
+            android:focusable="true"
             android:fontFamily="?attr/font_family"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp"
             android:paddingStart="32dp"
+            android:paddingTop="16dp"
             android:paddingEnd="32dp"
-            android:clickable="true"
-            android:focusable="true"
-            android:background="?attr/selectableItemBackground" />
+            android:paddingBottom="16dp"
+            android:text="@string/sort_new"
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="?attr/font_default"
+            app:drawableTint="?attr/primaryTextColor" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/comments_type_text_view_search_sort_type_bottom_sheet_fragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/sort_comments"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="?attr/font_default"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:drawableStart="@drawable/ic_comment_toolbar_24dp"
+            android:drawablePadding="48dp"
+            android:focusable="true"
             android:fontFamily="?attr/font_family"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp"
             android:paddingStart="32dp"
+            android:paddingTop="16dp"
             android:paddingEnd="32dp"
-            android:clickable="true"
-            android:focusable="true"
-            android:background="?attr/selectableItemBackground" />
+            android:paddingBottom="16dp"
+            android:text="@string/sort_comments"
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="?attr/font_default"
+            app:drawableTint="?attr/primaryTextColor" />
 
     </LinearLayout>
 
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml
index d8a62445..d5c9e34d 100644
--- a/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml
@@ -1,127 +1,149 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView 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="wrap_content"
-    android:paddingBottom="8dp"
-    android:overScrollMode="never">
+    android:overScrollMode="never"
+    android:paddingBottom="8dp">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/best_type_text_view_sort_type_bottom_sheet_fragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/sort_best"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="?attr/font_default"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:drawableStart="@drawable/ic_best_24"
+            android:drawablePadding="48dp"
+            android:focusable="true"
             android:fontFamily="?attr/font_family"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp"
             android:paddingStart="32dp"
+            android:paddingTop="16dp"
             android:paddingEnd="32dp"
-            android:clickable="true"
-            android:focusable="true"
-            android:background="?attr/selectableItemBackground" />
+            android:paddingBottom="16dp"
+            android:text="@string/sort_best"
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="?attr/font_default"
+            app:drawableTint="?attr/primaryTextColor" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/hot_type_text_view_sort_type_bottom_sheet_fragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/sort_hot"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="?attr/font_default"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:drawableStart="@drawable/ic_hot_24"
+            android:drawablePadding="48dp"
+            android:focusable="true"
             android:fontFamily="?attr/font_family"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp"
             android:paddingStart="32dp"
+            android:paddingTop="16dp"
             android:paddingEnd="32dp"
-            android:clickable="true"
-            android:focusable="true"
-            android:background="?attr/selectableItemBackground" />
+            android:paddingBottom="16dp"
+            android:text="@string/sort_hot"
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="?attr/font_default"
+            app:drawableTint="?attr/primaryTextColor" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/new_type_text_view_sort_type_bottom_sheet_fragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/sort_new"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="?attr/font_default"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:drawableStart="@drawable/ic_new_24"
+            android:drawablePadding="48dp"
+            android:focusable="true"
             android:fontFamily="?attr/font_family"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp"
             android:paddingStart="32dp"
+            android:paddingTop="16dp"
             android:paddingEnd="32dp"
-            android:clickable="true"
-            android:focusable="true"
-            android:background="?attr/selectableItemBackground" />
+            android:paddingBottom="16dp"
+            android:text="@string/sort_new"
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="?attr/font_default"
+            app:drawableTint="?attr/primaryTextColor" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/random_type_text_view_sort_type_bottom_sheet_fragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/sort_random"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="?attr/font_default"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:drawableStart="@drawable/ic_random_24"
+            android:drawablePadding="48dp"
+            android:focusable="true"
             android:fontFamily="?attr/font_family"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp"
             android:paddingStart="32dp"
+            android:paddingTop="16dp"
             android:paddingEnd="32dp"
-            android:clickable="true"
-            android:focusable="true"
-            android:background="?attr/selectableItemBackground" />
+            android:paddingBottom="16dp"
+            android:text="@string/sort_random"
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="?attr/font_default"
+            app:drawableTint="?attr/primaryTextColor" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/rising_type_text_view_sort_type_bottom_sheet_fragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/sort_rising"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="?attr/font_default"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:drawableStart="@drawable/ic_rising_24"
+            android:drawablePadding="48dp"
+            android:focusable="true"
             android:fontFamily="?attr/font_family"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp"
             android:paddingStart="32dp"
+            android:paddingTop="16dp"
             android:paddingEnd="32dp"
-            android:clickable="true"
-            android:focusable="true"
-            android:background="?attr/selectableItemBackground" />
+            android:paddingBottom="16dp"
+            android:text="@string/sort_rising"
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="?attr/font_default"
+            app:drawableTint="?attr/primaryTextColor" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/top_type_text_view_sort_type_bottom_sheet_fragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/sort_top"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="?attr/font_default"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:drawableStart="@drawable/ic_top_24"
+            android:drawablePadding="48dp"
+            android:focusable="true"
             android:fontFamily="?attr/font_family"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp"
             android:paddingStart="32dp"
+            android:paddingTop="16dp"
             android:paddingEnd="32dp"
-            android:clickable="true"
-            android:focusable="true"
-            android:background="?attr/selectableItemBackground" />
+            android:paddingBottom="16dp"
+            android:text="@string/sort_top"
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="?attr/font_default"
+            app:drawableTint="?attr/primaryTextColor" />
 
-        <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/controversial_type_text_view_sort_type_bottom_sheet_fragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/sort_controversial"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="?attr/font_default"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:drawableStart="@drawable/ic_controversial_24"
+            android:drawablePadding="48dp"
+            android:focusable="true"
             android:fontFamily="?attr/font_family"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp"
             android:paddingStart="32dp"
+            android:paddingTop="16dp"
             android:paddingEnd="32dp"
-            android:clickable="true"
-            android:focusable="true"
-            android:background="?attr/selectableItemBackground" />
+            android:paddingBottom="16dp"
+            android:text="@string/sort_controversial"
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="?attr/font_default"
+            app:drawableTint="?attr/primaryTextColor" />
 
     </LinearLayout>
 
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/fragment_user_thing_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_user_thing_sort_type_bottom_sheet.xml
index 8abaf5ff..17056053 100644
--- a/app/src/main/res/layout/fragment_user_thing_sort_type_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_user_thing_sort_type_bottom_sheet.xml
@@ -1,71 +1,85 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     android:paddingBottom="8dp">
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/new_type_text_view_user_thing_sort_type_bottom_sheet_fragment"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/sort_new"
-        android:textColor="?attr/primaryTextColor"
-        android:textSize="?attr/font_default"
+        android:background="?attr/selectableItemBackground"
+        android:clickable="true"
+        android:drawableStart="@drawable/ic_new_24"
+        android:drawablePadding="48dp"
+        android:focusable="true"
         android:fontFamily="?attr/font_family"
-        android:paddingTop="16dp"
-        android:paddingBottom="16dp"
         android:paddingStart="32dp"
+        android:paddingTop="16dp"
         android:paddingEnd="32dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:background="?attr/selectableItemBackground" />
+        android:paddingBottom="16dp"
+        android:text="@string/sort_new"
+        android:textColor="?attr/primaryTextColor"
+        android:textSize="?attr/font_default"
+        app:drawableTint="?attr/primaryTextColor" />
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/hot_type_text_view_user_thing_sort_type_bottom_sheet_fragment"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/sort_hot"
-        android:textColor="?attr/primaryTextColor"
-        android:textSize="?attr/font_default"
+        android:background="?attr/selectableItemBackground"
+        android:clickable="true"
+        android:drawableStart="@drawable/ic_hot_24"
+        android:drawablePadding="48dp"
+        android:focusable="true"
         android:fontFamily="?attr/font_family"
-        android:paddingTop="16dp"
-        android:paddingBottom="16dp"
         android:paddingStart="32dp"
+        android:paddingTop="16dp"
         android:paddingEnd="32dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:background="?attr/selectableItemBackground" />
+        android:paddingBottom="16dp"
+        android:text="@string/sort_hot"
+        android:textColor="?attr/primaryTextColor"
+        android:textSize="?attr/font_default"
+        app:drawableTint="?attr/primaryTextColor" />
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/top_type_text_view_user_thing_sort_type_bottom_sheet_fragment"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/sort_top"
-        android:textColor="?attr/primaryTextColor"
-        android:textSize="?attr/font_default"
+        android:background="?attr/selectableItemBackground"
+        android:clickable="true"
+        android:drawableStart="@drawable/ic_top_24"
+        android:drawablePadding="48dp"
+        android:focusable="true"
         android:fontFamily="?attr/font_family"
-        android:paddingTop="16dp"
-        android:paddingBottom="16dp"
         android:paddingStart="32dp"
+        android:paddingTop="16dp"
         android:paddingEnd="32dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:background="?attr/selectableItemBackground" />
+        android:paddingBottom="16dp"
+        android:text="@string/sort_top"
+        android:textColor="?attr/primaryTextColor"
+        android:textSize="?attr/font_default"
+        app:drawableTint="?attr/primaryTextColor" />
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/controversial_type_text_view_user_thing_sort_type_bottom_sheet_fragment"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/sort_controversial"
-        android:textColor="?attr/primaryTextColor"
-        android:textSize="?attr/font_default"
+        android:background="?attr/selectableItemBackground"
+        android:clickable="true"
+        android:drawableStart="@drawable/ic_controversial_24"
+        android:drawablePadding="48dp"
+        android:focusable="true"
         android:fontFamily="?attr/font_family"
-        android:paddingTop="16dp"
-        android:paddingBottom="16dp"
         android:paddingStart="32dp"
+        android:paddingTop="16dp"
         android:paddingEnd="32dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:background="?attr/selectableItemBackground" />
+        android:paddingBottom="16dp"
+        android:text="@string/sort_controversial"
+        android:textColor="?attr/primaryTextColor"
+        android:textSize="?attr/font_default"
+        app:drawableTint="?attr/primaryTextColor" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
-- 
cgit v1.2.3