aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/drawable-night/ic_preview_24dp.xml9
-rw-r--r--app/src/main/res/drawable/ic_best_24.xml17
-rw-r--r--app/src/main/res/drawable/ic_controversial_24.xml9
-rw-r--r--app/src/main/res/drawable/ic_hot_24.xml9
-rw-r--r--app/src/main/res/drawable/ic_new_24.xml9
-rw-r--r--app/src/main/res/drawable/ic_random_24.xml9
-rw-r--r--app/src/main/res/drawable/ic_rising_24.xml9
-rw-r--r--app/src/main/res/drawable/ic_top_24.xml9
-rw-r--r--app/src/main/res/layout/activity_comment.xml6
-rw-r--r--app/src/main/res/layout/activity_view_video.xml7
-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
-rw-r--r--app/src/main/res/layout/item_post_detail_no_preview_link.xml2
-rw-r--r--app/src/main/res/layout/item_post_detail_text.xml2
-rw-r--r--app/src/main/res/values/arrays.xml4
-rw-r--r--app/src/main/res/values/strings.xml15
-rw-r--r--app/src/main/res/xml/about_preferences.xml7
-rw-r--r--app/src/main/res/xml/autoplay_preferences.xml18
-rw-r--r--app/src/main/res/xml/credits_preferences.xml7
-rw-r--r--app/src/main/res/xml/main_preferences.xml11
-rw-r--r--app/src/main/res/xml/video_preferences.xml38
22 files changed, 362 insertions, 191 deletions
diff --git a/app/src/main/res/drawable-night/ic_preview_24dp.xml b/app/src/main/res/drawable-night/ic_preview_24dp.xml
new file mode 100644
index 00000000..e54e3a9f
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_preview_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:pathData="M12,6.5c3.79,0 7.17,2.13 8.82,5.5 -1.65,3.37 -5.02,5.5 -8.82,5.5S4.83,15.37 3.18,12C4.83,8.63 8.21,6.5 12,6.5m0,-2C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,9.5c1.38,0 2.5,1.12 2.5,2.5s-1.12,2.5 -2.5,2.5 -2.5,-1.12 -2.5,-2.5 1.12,-2.5 2.5,-2.5m0,-2c-2.48,0 -4.5,2.02 -4.5,4.5s2.02,4.5 4.5,4.5 4.5,-2.02 4.5,-4.5 -2.02,-4.5 -4.5,-4.5z"
+ android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_best_24.xml b/app/src/main/res/drawable/ic_best_24.xml
new file mode 100644
index 00000000..6a592ecc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_best_24.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <group
+ android:pivotX="12"
+ android:pivotY="12"
+ android:rotation="30">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M11.3,22.66h1.4L12.7,24h-1.4zM11.3,22.66M12.07,0.06L12,0l-0.07,0.06a15.15,15.15 0,0 0,-3.47 4.89h7.08A15.1,15.1 0,0 0,12.07 0.06zM12.07,0.06M4.04,13.69v6.2l3.67,-1.15a16.43,16.43 0,0 1,-1.85 -6.21zM4.04,13.69M13.28,10.8a1.28,1.28 0,1 0,-2.56 0,1.28 1.28,0 0,0 2.56,0zM13.28,10.8" />
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M14.44,19.13a15,15 0,0 0,1.64 -12.77L7.92,6.36a15,15 0,0 0,1.64 12.77h1.74v2.06h1.4v-2.07zM9.32,10.8a2.68,2.68 0,1 1,5.37 0,2.68 2.68,0 0,1 -5.37,0zM9.32,10.8M8.83,20.53h1.4v1.9h-1.4zM8.83,20.53M18.14,12.53c-0.2,2.17 -0.83,4.28 -1.85,6.2l3.67,1.16v-6.2zM18.14,12.53M13.77,20.53h1.4v1.9h-1.4zM13.77,20.53" />
+ </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_controversial_24.xml b/app/src/main/res/drawable/ic_controversial_24.xml
new file mode 100644
index 00000000..8084cc1d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_controversial_24.xml
@@ -0,0 +1,9 @@
+<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/white"
+ android:pathData="M9,3L5,6.99h3L8,14h2L10,6.99h3L9,3zM16,17.01L16,10h-2v7.01h-3L15,21l4,-3.99h-3z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_hot_24.xml b/app/src/main/res/drawable/ic_hot_24.xml
new file mode 100644
index 00000000..c163a23d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_hot_24.xml
@@ -0,0 +1,9 @@
+<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/white"
+ android:pathData="M13.5,0.67s0.74,2.65 0.74,4.8c0,2.06 -1.35,3.73 -3.41,3.73 -2.07,0 -3.63,-1.67 -3.63,-3.73l0.03,-0.36C5.21,7.51 4,10.62 4,14c0,4.42 3.58,8 8,8s8,-3.58 8,-8C20,8.61 17.41,3.8 13.5,0.67zM11.71,19c-1.78,0 -3.22,-1.4 -3.22,-3.14 0,-1.62 1.05,-2.76 2.81,-3.12 1.77,-0.36 3.6,-1.21 4.62,-2.58 0.39,1.29 0.59,2.65 0.59,4.04 0,2.65 -2.15,4.8 -4.8,4.8z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_new_24.xml b/app/src/main/res/drawable/ic_new_24.xml
new file mode 100644
index 00000000..5ed64d37
--- /dev/null
+++ b/app/src/main/res/drawable/ic_new_24.xml
@@ -0,0 +1,9 @@
+<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/white"
+ android:pathData="M23,12l-2.44,-2.78 0.34,-3.68 -3.61,-0.82 -1.89,-3.18L12,3 8.6,1.54 6.71,4.72l-3.61,0.81 0.34,3.68L1,12l2.44,2.78 -0.34,3.69 3.61,0.82 1.89,3.18L12,21l3.4,1.46 1.89,-3.18 3.61,-0.82 -0.34,-3.68L23,12z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_random_24.xml b/app/src/main/res/drawable/ic_random_24.xml
new file mode 100644
index 00000000..002ff2d7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_random_24.xml
@@ -0,0 +1,9 @@
+<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/white"
+ android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM7.5,18c-0.83,0 -1.5,-0.67 -1.5,-1.5S6.67,15 7.5,15s1.5,0.67 1.5,1.5S8.33,18 7.5,18zM7.5,9C6.67,9 6,8.33 6,7.5S6.67,6 7.5,6 9,6.67 9,7.5 8.33,9 7.5,9zM12,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM16.5,18c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM16.5,9c-0.83,0 -1.5,-0.67 -1.5,-1.5S15.67,6 16.5,6s1.5,0.67 1.5,1.5S17.33,9 16.5,9z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_rising_24.xml b/app/src/main/res/drawable/ic_rising_24.xml
new file mode 100644
index 00000000..75754f74
--- /dev/null
+++ b/app/src/main/res/drawable/ic_rising_24.xml
@@ -0,0 +1,9 @@
+<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/white"
+ android:pathData="M16,6l2.29,2.29 -4.88,4.88 -4,-4L2,16.59 3.41,18l6,-6 4,4 6.3,-6.29L22,12V6z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_top_24.xml b/app/src/main/res/drawable/ic_top_24.xml
new file mode 100644
index 00000000..ed64f733
--- /dev/null
+++ b/app/src/main/res/drawable/ic_top_24.xml
@@ -0,0 +1,9 @@
+<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/white"
+ android:pathData="M10,20h4L14,6h-4v16zM4,20h4v-8L4,12v8zM16,9v11h4L20,9h-4zM7,6l5,-5 5,5z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_comment.xml b/app/src/main/res/layout/activity_comment.xml
index 100db899..1fe93f50 100644
--- a/app/src/main/res/layout/activity_comment.xml
+++ b/app/src/main/res/layout/activity_comment.xml
@@ -45,9 +45,9 @@
android:id="@+id/content_markdown_view_comment_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="16dp"
- android:layout_marginEnd="16dp"
- android:layout_marginBottom="16dp"
+ android:layout_marginStart="8dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginBottom="8dp"
android:visibility="gone" />
<View
diff --git a/app/src/main/res/layout/activity_view_video.xml b/app/src/main/res/layout/activity_view_video.xml
index 2907fd4d..1d18f2ab 100644
--- a/app/src/main/res/layout/activity_view_video.xml
+++ b/app/src/main/res/layout/activity_view_video.xml
@@ -15,7 +15,8 @@
android:layout_height="match_parent"
android:fillViewport="true">
- <RelativeLayout
+ <androidx.coordinatorlayout.widget.CoordinatorLayout
+ android:id="@+id/coordinator_layout_view_video_activity"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -29,10 +30,10 @@
android:id="@+id/progress_bar_view_video_activity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_centerInParent="true"
+ android:layout_gravity="center"
android:visibility="gone" />
- </RelativeLayout>
+ </androidx.coordinatorlayout.widget.CoordinatorLayout>
</androidx.core.widget.NestedScrollView>
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>
diff --git a/app/src/main/res/layout/item_post_detail_no_preview_link.xml b/app/src/main/res/layout/item_post_detail_no_preview_link.xml
index 7b1f1eb7..f294801a 100644
--- a/app/src/main/res/layout/item_post_detail_no_preview_link.xml
+++ b/app/src/main/res/layout/item_post_detail_no_preview_link.xml
@@ -108,7 +108,7 @@
android:id="@+id/content_markdown_view_item_post_detail_no_preview_link"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginTop="16dp"
+ android:layout_marginTop="8dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:visibility="gone" />
diff --git a/app/src/main/res/layout/item_post_detail_text.xml b/app/src/main/res/layout/item_post_detail_text.xml
index de939064..7828687d 100644
--- a/app/src/main/res/layout/item_post_detail_text.xml
+++ b/app/src/main/res/layout/item_post_detail_text.xml
@@ -108,7 +108,7 @@
android:id="@+id/content_markdown_view_item_post_detail_text"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginTop="16dp"
+ android:layout_marginTop="8dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:visibility="gone" />
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 878bf61b..3efd7c75 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1,5 +1,7 @@
<resources>
<string-array name="settings_notification_interval">
+ <item>15 minutes</item>
+ <item>30 minutes</item>
<item>1 hour</item>
<item>2 hours</item>
<item>3 hours</item>
@@ -10,6 +12,8 @@
</string-array>
<string-array name="settings_notification_interval_values">
+ <item>15</item>
+ <item>30</item>
<item>1</item>
<item>2</item>
<item>3</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 53f28bc9..1eecbe16 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -313,6 +313,7 @@
<string name="label_account">Account</string>
<string name="label_post">Post</string>
+ <string name="label_preferences">Preferences</string>
<string name="account_switched">Account Switched. So all other pages are gone.</string>
@@ -328,7 +329,9 @@
<string name="settings_interface_title">Interface</string>
<string name="settings_gestures_and_buttons_title">Gestures &amp; Buttons</string>
<string name="settings_open_link_in_app_title">Open Link In App</string>
+ <string name="settigns_video_title">Video</string>
<string name="settings_video_autoplay_title">Video Autoplay</string>
+ <string name="settings_mute_autoplaying_videos_title">Mute Autoplaying Videos</string>
<string name="settings_autoplay_nsfw_videos_title">Autoplay NSFW Videos</string>
<string name="settings_immersive_interface_title">Immersive Interface</string>
<string name="settings_immersive_interface_ignore_nav_bar_title">Ignore Navigation Bar in Immersive Interface</string>
@@ -341,6 +344,7 @@
<string name="settings_volume_keys_navigate_comments_title">Use Volume Keys to Navigate Comments in Posts</string>
<string name="settings_volume_keys_navigate_posts_title">Use Volume Keys to Navigate Posts</string>
<string name="settings_mute_video_title">Mute Video</string>
+ <string name="settings_automatically_try_redgifs_title">Automatically Try Accessing Redgifs if Videos on Gfycat are Removed.</string>
<string name="settings_confirm_to_exit">Confirm to Exit</string>
<string name="settings_show_top_level_comments_first_title">Show Top-level Comments First</string>
<string name="settings_show_comment_divider_title">Show Comment Divider</string>
@@ -387,10 +391,12 @@
<string name="settings_credits_crosspost_icon_summary">Icon made by Freepik from www.flaticon.com</string>
<string name="settings_credits_thumbtack_icon_title">Thumbtack Icon</string>
<string name="settings_credits_thumbtack_icon_summary">Icon made by Freepik from www.flaticon.com</string>
+ <string name="settings_credits_best_rocket_icon_title">Rocket Icon</string>
+ <string name="settings_credits_best_rocket_icon_summary">Icon made by Freepik from www.flaticon.com</string>
<string name="settings_credits_material_icons_title">Material Icons</string>
<string name="settings_open_source_title">Open Source</string>
<string name="settings_open_source_summary">Star it on Github if you like this app</string>
- <string name="settings_rate_title">Rate in Google Play</string>
+ <string name="settings_rate_title">Rate on Google Play</string>
<string name="settings_rate_summary">Give me a 5-star rating and I will be really happy</string>
<string name="settings_f_droid_title">F-Droid</string>
<string name="settings_f_droid_summary">It\'s available in IzzyOnDroid, an F-Droid Repository</string>
@@ -402,6 +408,8 @@
<string name="settings_subreddit_summary">r/Infinity_For_Reddit</string>
<string name="settings_share_title">Share</string>
<string name="settings_share_summary">Share this app to other people if you enjoy it</string>
+ <string name="settings_version_title">Infinity For Reddit</string>
+ <string name="settings_version_summary">Version %s</string>
<string name="settings_category_customization_title">Customization</string>
<string name="settings_customize_light_theme_title">Light Theme</string>
<string name="settings_customize_dark_theme_title">Dark Theme</string>
@@ -425,6 +433,7 @@
<string name="settings_tab_subreddit_name">Subreddit Name (Without r/ prefix)</string>
<string name="settings_tab_multi_reddit_name">MultiReddit Name (/user/yourusername/m/yourmultiredditname)</string>
<string name="settings_tab_username">Username (Without u/ prefix)</string>
+ <string name="no_developer_easter_egg">There\'s no developer options here</string>
<string name="no_link_available">Cannot get the link</string>
@@ -780,7 +789,7 @@
<string name="set_to_both">Set to Both</string>
<string name="default_font_font_preview">Default</string>
- <!-- TODO: Remove or change this placeholder text -->
- <string name="hello_blank_fragment">Hello blank fragment</string>
+
+ <string name="load_video_in_redgifs">Try loading the video on Redgifs</string>
</resources>
diff --git a/app/src/main/res/xml/about_preferences.xml b/app/src/main/res/xml/about_preferences.xml
index 2772f2ed..a73f9aaa 100644
--- a/app/src/main/res/xml/about_preferences.xml
+++ b/app/src/main/res/xml/about_preferences.xml
@@ -45,4 +45,9 @@
app:title="@string/settings_share_title"
app:summary="@string/settings_share_summary" />
-</PreferenceScreen> \ No newline at end of file
+ <Preference
+ android:key="version"
+ app:title="@string/settings_version_title"
+ app:summary="@string/settings_version_summary" />
+
+</PreferenceScreen>
diff --git a/app/src/main/res/xml/autoplay_preferences.xml b/app/src/main/res/xml/autoplay_preferences.xml
deleted file mode 100644
index 6cb07dd9..00000000
--- a/app/src/main/res/xml/autoplay_preferences.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto">
-
- <ListPreference
- app:defaultValue="0"
- android:entries="@array/settings_video_autoplay"
- app:entryValues="@array/settings_video_autoplay_values"
- app:key="video_autoplay"
- app:title="@string/settings_video_autoplay_title"
- app:useSimpleSummaryProvider="true" />
-
- <SwitchPreference
- app:defaultValue="true"
- app:key="autoplay_nsfw_videos"
- app:title="@string/settings_autoplay_nsfw_videos_title" />
-
-</PreferenceScreen> \ No newline at end of file
diff --git a/app/src/main/res/xml/credits_preferences.xml b/app/src/main/res/xml/credits_preferences.xml
index e630422b..8e622332 100644
--- a/app/src/main/res/xml/credits_preferences.xml
+++ b/app/src/main/res/xml/credits_preferences.xml
@@ -33,7 +33,12 @@
android:summary="@string/settings_credits_thumbtack_icon_summary" />
<Preference
+ android:key="best_rocket_icon"
+ app:title="@string/settings_credits_best_rocket_icon_title"
+ android:summary="@string/settings_credits_best_rocket_icon_summary" />
+
+ <Preference
android:key="material_icons"
app:title="@string/settings_credits_material_icons_title"/>
-</PreferenceScreen> \ No newline at end of file
+</PreferenceScreen>
diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml
index f332a49c..c15bfee4 100644
--- a/app/src/main/res/xml/main_preferences.xml
+++ b/app/src/main/res/xml/main_preferences.xml
@@ -29,14 +29,9 @@
app:title="@string/settings_open_link_in_app_title" />
<Preference
- app:title="@string/settings_video_autoplay_title"
- app:fragment="ml.docilealligator.infinityforreddit.Settings.AutoplayPreferenceFragment" />
-
- <SwitchPreference
- app:defaultValue="false"
- app:key="mute_video"
- app:icon="@drawable/ic_mute_preferences_24dp"
- app:title="@string/settings_mute_video_title" />
+ app:title="@string/settigns_video_title"
+ android:icon="@drawable/ic_outline_video_24dp"
+ app:fragment="ml.docilealligator.infinityforreddit.Settings.VideoPreferenceFragment" />
<SwitchPreference
app:defaultValue="false"
diff --git a/app/src/main/res/xml/video_preferences.xml b/app/src/main/res/xml/video_preferences.xml
new file mode 100644
index 00000000..bb690347
--- /dev/null
+++ b/app/src/main/res/xml/video_preferences.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+
+ <SwitchPreference
+ app:defaultValue="false"
+ app:key="mute_video"
+ app:icon="@drawable/ic_mute_preferences_24dp"
+ app:title="@string/settings_mute_video_title" />
+
+ <SwitchPreference
+ app:defaultValue="true"
+ app:key="automatically_try_redgifs"
+ app:title="@string/settings_automatically_try_redgifs_title" />
+
+ <PreferenceCategory
+ app:title="@string/settings_video_autoplay_title" />
+
+ <ListPreference
+ app:defaultValue="0"
+ android:entries="@array/settings_video_autoplay"
+ app:entryValues="@array/settings_video_autoplay_values"
+ app:key="video_autoplay"
+ app:title="@string/settings_video_autoplay_title"
+ app:useSimpleSummaryProvider="true" />
+
+ <SwitchPreference
+ app:defaultValue="true"
+ app:key="mute_autoplaying_videos"
+ app:icon="@drawable/ic_mute_preferences_24dp"
+ app:title="@string/settings_mute_autoplaying_videos_title" />
+
+ <SwitchPreference
+ app:defaultValue="true"
+ app:key="autoplay_nsfw_videos"
+ app:title="@string/settings_autoplay_nsfw_videos_title" />
+
+</PreferenceScreen> \ No newline at end of file