aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res/layout
diff options
context:
space:
mode:
authorDocile-Alligator <chineseperson5@gmail.com>2020-06-20 04:18:02 +0000
committerGitHub <noreply@github.com>2020-06-20 04:18:02 +0000
commit8871eeaca8e46ee713bc7f7d5f666d0963cb1055 (patch)
tree2f43de21889469ff1e4277119e424278d3a7444e /app/src/main/res/layout
parentcf69dc114a5242225081deef5329202acf74e774 (diff)
parenta70a00e6e9511d8826874488b2904b86b3d3e930 (diff)
downloadinfinity-for-reddit-8871eeaca8e46ee713bc7f7d5f666d0963cb1055.tar
infinity-for-reddit-8871eeaca8e46ee713bc7f7d5f666d0963cb1055.tar.gz
infinity-for-reddit-8871eeaca8e46ee713bc7f7d5f666d0963cb1055.tar.bz2
infinity-for-reddit-8871eeaca8e46ee713bc7f7d5f666d0963cb1055.tar.lz
infinity-for-reddit-8871eeaca8e46ee713bc7f7d5f666d0963cb1055.tar.xz
infinity-for-reddit-8871eeaca8e46ee713bc7f7d5f666d0963cb1055.tar.zst
infinity-for-reddit-8871eeaca8e46ee713bc7f7d5f666d0963cb1055.zip
Merge pull request #131 from OHermesJunior/sort-icons
Add icons to sort bottom sheets.
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r--app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml112
-rw-r--r--app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml154
-rw-r--r--app/src/main/res/layout/fragment_user_thing_sort_type_bottom_sheet.xml90
3 files changed, 204 insertions, 152 deletions
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>