Flair, spoiler and nsfw support for submitting posts.

8 files changed, 273 insertions, 10 deletions

diff --git a/app/src/main/res/layout/activity_post_image.xml b/app/src/main/res/layout/activity_post_image.xml
index 60a6029e..ce345d58 100644
--- a/app/src/main/res/layout/activity_post_image.xml
+++ b/app/src/main/res/layout/activity_post_image.xml
@@ -59,6 +59,57 @@
                 android:layout_height="1dp"
                 android:background="@color/dividerColor" />
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.libRG.CustomTextView
+                    android:id="@+id/flair_custom_text_view_post_image_activity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="16dp"
+                    android:padding="4dp"
+                    android:text="@string/flair"
+                    android:textColor="@color/primaryTextColor"
+                    android:visibility="gone"
+                    app:lib_setRadius="3dp"
+                    app:lib_setRoundedBorderColor="@color/textColorPrimaryDark"
+                    app:lib_setRoundedView="true"
+                    app:lib_setShape="rectangle" />
+
+                <com.libRG.CustomTextView
+                    android:id="@+id/spoiler_custom_text_view_post_image_activity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="16dp"
+                    android:padding="4dp"
+                    android:text="@string/spoiler"
+                    android:textColor="@color/primaryTextColor"
+                    app:lib_setRadius="3dp"
+                    app:lib_setRoundedBorderColor="@color/textColorPrimaryDark"
+                    app:lib_setRoundedView="true"
+                    app:lib_setShape="rectangle" />
+
+                <com.libRG.CustomTextView
+                    android:id="@+id/nsfw_custom_text_view_post_image_activity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="16dp"
+                    android:padding="4dp"
+                    android:text="@string/nsfw"
+                    android:textColor="@color/primaryTextColor"
+                    app:lib_setRadius="3dp"
+                    app:lib_setRoundedBorderColor="@color/colorAccent"
+                    app:lib_setRoundedView="true"
+                    app:lib_setShape="rectangle" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/dividerColor" />
+
             <EditText
                 android:id="@+id/post_title_edit_text_post_image_activity"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_post_link.xml b/app/src/main/res/layout/activity_post_link.xml
index 2d57c57b..bc24d8c5 100644
--- a/app/src/main/res/layout/activity_post_link.xml
+++ b/app/src/main/res/layout/activity_post_link.xml
@@ -59,6 +59,57 @@
                 android:layout_height="1dp"
                 android:background="@color/dividerColor" />
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.libRG.CustomTextView
+                    android:id="@+id/flair_custom_text_view_post_link_activity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="16dp"
+                    android:padding="4dp"
+                    android:text="@string/flair"
+                    android:textColor="@color/primaryTextColor"
+                    android:visibility="gone"
+                    app:lib_setRadius="3dp"
+                    app:lib_setRoundedBorderColor="@color/textColorPrimaryDark"
+                    app:lib_setRoundedView="true"
+                    app:lib_setShape="rectangle" />
+
+                <com.libRG.CustomTextView
+                    android:id="@+id/spoiler_custom_text_view_post_link_activity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="16dp"
+                    android:padding="4dp"
+                    android:text="@string/spoiler"
+                    android:textColor="@color/primaryTextColor"
+                    app:lib_setRadius="3dp"
+                    app:lib_setRoundedBorderColor="@color/textColorPrimaryDark"
+                    app:lib_setRoundedView="true"
+                    app:lib_setShape="rectangle" />
+
+                <com.libRG.CustomTextView
+                    android:id="@+id/nsfw_custom_text_view_post_link_activity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="16dp"
+                    android:padding="4dp"
+                    android:text="@string/nsfw"
+                    android:textColor="@color/primaryTextColor"
+                    app:lib_setRadius="3dp"
+                    app:lib_setRoundedBorderColor="@color/colorAccent"
+                    app:lib_setRoundedView="true"
+                    app:lib_setShape="rectangle" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/dividerColor" />
+
             <EditText
                 android:id="@+id/post_title_edit_text_post_link_activity"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_post_text.xml b/app/src/main/res/layout/activity_post_text.xml
index 86455f8b..d889d00b 100644
--- a/app/src/main/res/layout/activity_post_text.xml
+++ b/app/src/main/res/layout/activity_post_text.xml
@@ -58,6 +58,57 @@
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:background="@color/dividerColor" />
+            
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.libRG.CustomTextView
+                    android:id="@+id/flair_custom_text_view_post_text_activity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="16dp"
+                    android:padding="4dp"
+                    android:text="@string/flair"
+                    android:textColor="@color/primaryTextColor"
+                    android:visibility="gone"
+                    app:lib_setRadius="3dp"
+                    app:lib_setRoundedBorderColor="@color/textColorPrimaryDark"
+                    app:lib_setRoundedView="true"
+                    app:lib_setShape="rectangle" />
+
+                <com.libRG.CustomTextView
+                    android:id="@+id/spoiler_custom_text_view_post_text_activity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="16dp"
+                    android:padding="4dp"
+                    android:text="@string/spoiler"
+                    android:textColor="@color/primaryTextColor"
+                    app:lib_setRadius="3dp"
+                    app:lib_setRoundedBorderColor="@color/textColorPrimaryDark"
+                    app:lib_setRoundedView="true"
+                    app:lib_setShape="rectangle" />
+
+                <com.libRG.CustomTextView
+                    android:id="@+id/nsfw_custom_text_view_post_text_activity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="16dp"
+                    android:padding="4dp"
+                    android:text="@string/nsfw"
+                    android:textColor="@color/primaryTextColor"
+                    app:lib_setRadius="3dp"
+                    app:lib_setRoundedBorderColor="@color/colorAccent"
+                    app:lib_setRoundedView="true"
+                    app:lib_setShape="rectangle" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/dividerColor" />
 
             <EditText
                 android:id="@+id/post_title_edit_text_post_text_activity"
diff --git a/app/src/main/res/layout/activity_post_video.xml b/app/src/main/res/layout/activity_post_video.xml
index 4b11b862..f0df4eea 100644
--- a/app/src/main/res/layout/activity_post_video.xml
+++ b/app/src/main/res/layout/activity_post_video.xml
@@ -59,6 +59,57 @@
                 android:layout_height="1dp"
                 android:background="@color/dividerColor" />
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.libRG.CustomTextView
+                    android:id="@+id/flair_custom_text_view_post_video_activity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="16dp"
+                    android:padding="4dp"
+                    android:text="@string/flair"
+                    android:textColor="@color/primaryTextColor"
+                    android:visibility="gone"
+                    app:lib_setRadius="3dp"
+                    app:lib_setRoundedBorderColor="@color/textColorPrimaryDark"
+                    app:lib_setRoundedView="true"
+                    app:lib_setShape="rectangle" />
+
+                <com.libRG.CustomTextView
+                    android:id="@+id/spoiler_custom_text_view_post_video_activity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="16dp"
+                    android:padding="4dp"
+                    android:text="@string/spoiler"
+                    android:textColor="@color/primaryTextColor"
+                    app:lib_setRadius="3dp"
+                    app:lib_setRoundedBorderColor="@color/textColorPrimaryDark"
+                    app:lib_setRoundedView="true"
+                    app:lib_setShape="rectangle" />
+
+                <com.libRG.CustomTextView
+                    android:id="@+id/nsfw_custom_text_view_post_video_activity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="16dp"
+                    android:padding="4dp"
+                    android:text="@string/nsfw"
+                    android:textColor="@color/primaryTextColor"
+                    app:lib_setRadius="3dp"
+                    app:lib_setRoundedBorderColor="@color/colorAccent"
+                    app:lib_setRoundedView="true"
+                    app:lib_setShape="rectangle" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/dividerColor" />
+
             <EditText
                 android:id="@+id/post_title_edit_text_post_video_activity"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_flair_bottom_sheet.xml b/app/src/main/res/layout/fragment_flair_bottom_sheet.xml
new file mode 100644
index 00000000..215ec734
--- /dev/null
+++ b/app/src/main/res/layout/fragment_flair_bottom_sheet.xml
@@ -0,0 +1,37 @@
+<?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="match_parent"
+    android:orientation="vertical"
+    tools:context=".FlairBottomSheetFragment">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        android:text="@string/flair"
+        android:textSize="18sp" />
+
+    <ProgressBar
+        android:id="@+id/progress_bar_flair_bottom_sheet_fragment"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="36dp"
+        android:layout_gravity="center" />
+
+    <TextView
+        android:id="@+id/error_text_view_flair_bottom_sheet_fragment"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:padding="48dp"
+        android:visibility="gone" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view_bottom_sheet_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_flair.xml b/app/src/main/res/layout/item_flair.xml
new file mode 100644
index 00000000..c6006358
--- /dev/null
+++ b/app/src/main/res/layout/item_flair.xml
@@ -0,0 +1,16 @@
+<?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"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/flair_text_view_item_flair"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        android:textColor="@color/primaryTextColor"
+        android:clickable="true"
+        android:focusable="true"
+        android:background="?attr/selectableItemBackground" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/post_type_bottom_sheet.xml b/app/src/main/res/layout/post_type_bottom_sheet.xml
index 617c1aa3..092495c4 100644
--- a/app/src/main/res/layout/post_type_bottom_sheet.xml
+++ b/app/src/main/res/layout/post_type_bottom_sheet.xml
@@ -7,7 +7,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="16dp"
-        android:text="@string/dialog_post_type"
+        android:text="@string/bottom_sheet_post_type"
         android:textSize="18sp" />
 
     <LinearLayout
@@ -31,7 +31,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:text="@string/dialog_post_text"
+            android:text="@string/bottom_sheet_post_text"
             android:textColor="@color/primaryTextColor"
             android:textSize="18sp" />
 
@@ -58,7 +58,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:text="@string/dialog_post_link"
+            android:text="@string/bottom_sheet_post_link"
             android:textColor="@color/primaryTextColor"
             android:textSize="18sp" />
 
@@ -85,7 +85,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:text="@string/dialog_post_image"
+            android:text="@string/bottom_sheet_post_image"
             android:textColor="@color/primaryTextColor"
             android:textSize="18sp" />
 
@@ -113,7 +113,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:text="@string/dialog_post_video"
+            android:text="@string/bottom_sheet_post_video"
             android:textColor="@color/primaryTextColor"
             android:textSize="18sp" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f7b748f5..d76df6b2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -107,15 +107,21 @@
     <string name="subreddits">Subreddits</string>
     <string name="users">Users</string>
 
-    <string name="dialog_post_type">Post</string>
-    <string name="dialog_post_text">Text</string>
-    <string name="dialog_post_link">Link</string>
-    <string name="dialog_post_image">Image</string>
-    <string name="dialog_post_video">Video</string>
+    <string name="bottom_sheet_post_type">Post</string>
+    <string name="bottom_sheet_post_text">Text</string>
+    <string name="bottom_sheet_post_link">Link</string>
+    <string name="bottom_sheet_post_image">Image</string>
+    <string name="bottom_sheet_post_video">Video</string>
 
     <string name="select_from_gallery">Select a picture</string>
     <string name="select_again">Select again</string>
     <string name="error_getting_image">Error getting the image</string>
 
     <string name="video_is_processing">Video is processing. Please wait.</string>
+
+    <string name="flair">Flair</string>
+    <string name="spoiler">Spoiler</string>
+
+    <string name="no_flair">No flair</string>
+    <string name="error_loading_flairs">Error loading flairs.\nTap to retry.</string>
 </resources>