Saving and unsaving comments are now available. Use xml thumbtack to avoid crashes on low resolution devices. Add a subreddit link in Settings -> About.

7 files changed, 59 insertions, 6 deletions

diff --git a/app/src/main/res/drawable/ic_thumbtack_24dp.xml b/app/src/main/res/drawable/ic_thumbtack_24dp.xml
new file mode 100644
index 00000000..4d784693
--- /dev/null
+++ b/app/src/main/res/drawable/ic_thumbtack_24dp.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="401.506"
+    android:viewportWidth="401.506" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M397.373,135.487L267.742,5.867c-2.67,-2.671 -6.22,-4.142 -9.991,-4.142c-3.773,0 -7.322,1.471 -9.991,4.142l-38.254,38.252c-2.67,2.67 -4.141,6.219 -4.141,9.992c0,3.774 1.471,7.322 4.141,9.992l5.575,5.562l-95.653,95.653L15.314,191.032c-4.944,1.221 -8.863,5.025 -10.227,9.93c-1.367,4.909 0.021,10.187 3.622,13.777l78.173,78.177l-82.741,82.74c-2.67,2.67 -4.141,6.219 -4.141,9.99c0,3.773 1.471,7.322 4.141,9.992c2.671,2.67 6.219,4.143 9.992,4.143s7.321,-1.473 9.992,-4.143l82.74,-82.738l78.188,78.18c3.556,3.561 8.759,5 13.796,3.621c4.891,-1.361 8.694,-5.281 9.915,-10.227l25.704,-104.104l0.396,-0.396l95.257,-95.257l9.016,9.016c2.632,2.631 6.274,4.141 9.993,4.141c3.773,0 7.322,-1.471 9.991,-4.141l38.253,-38.262C402.883,149.962 402.883,140.999 397.373,135.487zM187.332,353.387L46.402,212.465l75.883,-18.742l83.781,83.789L187.332,353.387zM221.695,253.174l-75.072,-75.081l88.44,-88.442l75.071,75.08L221.695,253.174zM349.129,163.754L239.484,54.109l18.267,-18.266l109.646,109.636L349.129,163.754z"/>
+</vector>
diff --git a/app/src/main/res/drawable/thumbtack.png b/app/src/main/res/drawable/thumbtack.png
deleted file mode 100644
index b537f614..00000000
--- a/app/src/main/res/drawable/thumbtack.png
+++ /dev/null
diff --git a/app/src/main/res/layout/fragment_modify_comment_bottom_sheet.xml b/app/src/main/res/layout/fragment_modify_comment_bottom_sheet.xml
index a419912e..c637e910 100644
--- a/app/src/main/res/layout/fragment_modify_comment_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_modify_comment_bottom_sheet.xml
@@ -8,6 +8,20 @@
     tools:context=".ModifyCommentBottomSheetFragment">
 
     <TextView
+        android:id="@+id/save_text_view_modify_comment_bottom_sheet_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
+        android:paddingStart="32dp"
+        android:paddingEnd="32dp"
+        android:text="@string/edit"
+        android:textColor="@color/primaryTextColor"
+        android:clickable="true"
+        android:focusable="true"
+        android:background="?attr/selectableItemBackground" />
+
+    <TextView
         android:id="@+id/edit_text_view_modify_comment_bottom_sheet_fragment"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml
index 16c4dafa..0c103825 100644
--- a/app/src/main/res/layout/item_comment.xml
+++ b/app/src/main/res/layout/item_comment.xml
@@ -20,7 +20,7 @@
         android:layout_marginBottom="12dp"
         android:orientation="vertical">
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -28,19 +28,25 @@
 
             <TextView
                 android:id="@+id/author_text_view_item_post_comment"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
                 android:layout_marginEnd="16dp"
-                android:textColor="@color/colorPrimaryDarkDayNightTheme"/>
+                android:textColor="@color/colorPrimaryDarkDayNightTheme"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/comment_time_text_view_item_post_comment"
+                app:layout_constraintHorizontal_bias="0" />
 
             <TextView
                 android:id="@+id/comment_time_text_view_item_post_comment"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="end" />
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
 
-        </LinearLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <TextView
             android:id="@+id/comment_markdown_view_item_post_comment"
@@ -108,6 +114,19 @@
                 android:src="@drawable/ic_outline_more_vert_24px"
                 android:tint="@android:color/tab_indicator_text"
                 android:visibility="gone"
+                app:layout_constraintEnd_toStartOf="@+id/save_button_item_post_comment"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"/>
+
+            <ImageView
+                android:id="@+id/save_button_item_post_comment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="16dp"
+                android:background="?actionBarItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:tint="@android:color/tab_indicator_text"
                 app:layout_constraintEnd_toStartOf="@+id/expand_button_item_post_comment"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"/>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index f82fc670..196fc489 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -38,6 +38,8 @@
     </string-array>
 
     <string-array name="settings_lazy_mode_interval">
+        <item>1s</item>
+        <item>2s</item>
         <item>2.5s</item>
         <item>3s</item>
         <item>5s</item>
@@ -46,6 +48,8 @@
     </string-array>
 
     <string-array name="settings_lazy_mode_interval_values">
+        <item>1</item>
+        <item>2</item>
         <item>2.5</item>
         <item>3</item>
         <item>5</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 51149699..094846ee 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -300,6 +300,8 @@
     <string name="settings_email_summary">docilealligator.app@gmail.com</string>
     <string name="settings_reddit_account_title">Reddit Account</string>
     <string name="settings_reddit_account_summary">u/Hostilenemy</string>
+    <string name="settings_subreddit_title">Subreddit</string>
+    <string name="settings_subreddit_summary">r/Infinity_For_Reddit</string>
 
     <string name="no_link_available">Cannot get the link</string>
 
@@ -318,4 +320,9 @@
     <string name="share">Share</string>
 
     <string name="no_email_client">No Email client found</string>
+
+    <string name="comment_saved_success">Comment saved</string>
+    <string name="comment_saved_failed">Unable to save comment</string>
+    <string name="comment_unsaved_success">Comment unsaved</string>
+    <string name="comment_unsaved_failed">Unable to unsave comment</string>
 </resources>
diff --git a/app/src/main/res/xml/about_preferences.xml b/app/src/main/res/xml/about_preferences.xml
index e27844fc..942a0cd4 100644
--- a/app/src/main/res/xml/about_preferences.xml
+++ b/app/src/main/res/xml/about_preferences.xml
@@ -30,4 +30,9 @@
         app:title="@string/settings_reddit_account_title"
         app:summary="@string/settings_reddit_account_summary" />
 
+    <Preference
+        android:key="subreddit"
+        app:title="@string/settings_subreddit_title"
+        app:summary="@string/settings_subreddit_summary" />
+
 </PreferenceScreen>
\ No newline at end of file