From 6872faa93dabeb37d5899dea7126c85976383388 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Tue, 13 Aug 2019 15:29:27 +0800
Subject: Set NSFW and spoiler are now available.

---
 app/src/main/res/layout/item_comment.xml           | 80 ----------------------
 .../main/res/menu/view_post_detail_activity.xml    | 14 +++-
 app/src/main/res/values/strings.xml                | 17 ++++-
 3 files changed, 28 insertions(+), 83 deletions(-)

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

diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml
index 1283aa5b..53613bc8 100644
--- a/app/src/main/res/layout/item_comment.xml
+++ b/app/src/main/res/layout/item_comment.xml
@@ -155,86 +155,6 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <!--<RelativeLayout
-            android:id="@+id/relative_layout_item_post_comment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp">
-
-            <ImageView
-                android:id="@+id/plus_button_item_post_comment"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:src="@drawable/ic_arrow_upward_black_20dp"
-                android:layout_centerVertical="true"
-                android:tint="@android:color/tab_indicator_text"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"/>
-
-            <TextView
-                android:id="@+id/score_text_view_item_post_comment"
-                android:layout_width="64dp"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_toEndOf="@id/plus_button_item_post_comment"
-                android:gravity="center"/>
-
-            <ImageView
-                android:id="@+id/minus_button_item_post_comment"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_toEndOf="@id/score_text_view_item_post_comment"
-                android:src="@drawable/ic_arrow_downward_black_20dp"
-                android:tint="@android:color/tab_indicator_text"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"/>
-
-            <ImageView
-                android:id="@+id/expand_button_item_post_comment"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_toStartOf="@id/share_button_item_post_comment"
-                android:layout_centerVertical="true"
-                android:layout_marginEnd="16dp"
-                android:src="@drawable/ic_expand_less_black_20dp"
-                android:tint="@android:color/tab_indicator_text"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                android:visibility="gone"/>
-
-            <ImageView
-                android:id="@+id/share_button_item_post_comment"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_toStartOf="@id/reply_button_item_post_comment"
-                android:layout_centerVertical="true"
-                android:layout_marginEnd="16dp"
-                android:src="@drawable/ic_outline_share_20px"
-                android:tint="@android:color/tab_indicator_text"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"/>
-
-            <ImageView
-                android:id="@+id/reply_button_item_post_comment"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_alignParentEnd="true"
-                android:src="@drawable/ic_reply_black_20dp"
-                android:tint="@android:color/tab_indicator_text"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"/>
-
-        </RelativeLayout>-->
-
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/view_post_detail_activity.xml b/app/src/main/res/menu/view_post_detail_activity.xml
index 76e2db37..3df40201 100644
--- a/app/src/main/res/menu/view_post_detail_activity.xml
+++ b/app/src/main/res/menu/view_post_detail_activity.xml
@@ -23,8 +23,20 @@
 
     <item
         android:id="@+id/action_delete_view_post_detail_activity"
-        android:orderInCategory="3"
+        android:orderInCategory="4"
         android:title="@string/action_delete_post"
         app:showAsAction="never"
         android:visible="false" />
+
+    <item
+        android:id="@+id/action_nsfw_view_post_detail_activity"
+        android:orderInCategory="5"
+        app:showAsAction="never"
+        android:visible="false" />
+
+    <item
+        android:id="@+id/action_spoiler_view_post_detail_activity"
+        android:orderInCategory="6"
+        app:showAsAction="never"
+        android:visible="false" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9b3dd695..77d23b4c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,6 +11,8 @@
     <string name="post_video_activity_label">Video Post</string>
     <string name="rules_activity_label">Rules</string>
     <string name="search_subreddits_activity_label">Subreddits</string>
+    <string name="edit_post_activity_label">Edit Post</string>
+    <string name="edit_comment_activity_label">Edit Comment</string>
 
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
@@ -26,6 +28,10 @@
     <string name="action_sort">Sort</string>
     <string name="action_edit_post">Edit Post</string>
     <string name="action_delete_post">Delete Post</string>
+    <string name="action_mark_nsfw">Mark NSFW</string>
+    <string name="action_unmark_nsfw">Unmark NSFW</string>
+    <string name="action_mark_spoiler">Mark Spoiler</string>
+    <string name="action_unmark_spoiler">Unmark Spoiler</string>
 
     <string name="parse_json_response_error">Error occurred when parsing the JSON response</string>
     <string name="retrieve_token_error">Error Retrieving the token</string>
@@ -187,8 +193,15 @@
     <string name="edit">Edit</string>
     <string name="delete">Delete</string>
     <string name="cancel">Cancel</string>
+    <string name="edit_success">Edit successful</string>
     <string name="delete_post_success">Delete successfully</string>
     <string name="delete_post_failed">Delete failed</string>
-
-    <string name="edit_success">Edit Successful</string>
+    <string name="mark_nsfw_success">Mark NSFW successful</string>
+    <string name="mark_nsfw_failed">Mark NSFW failed</string>
+    <string name="unmark_nsfw_success">Unmark NSFW successful</string>
+    <string name="unmark_nsfw_failed">Unmark NSFW failed</string>
+    <string name="mark_spoiler_success">Mark spoiler successful</string>
+    <string name="mark_spoiler_failed">Mark spoiler failed</string>
+    <string name="unmark_spoiler_success">Unmark spoiler successful</string>
+    <string name="unmark_spoiler_failed">Unmark spoiler failed</string>
 </resources>
-- 
cgit v1.2.3