Support Markdown bottom bar in EditCommentActivity, EditPostActivity and PostTextActivity.

3 files changed, 219 insertions, 181 deletions

diff --git a/app/src/main/res/layout/activity_edit_comment.xml b/app/src/main/res/layout/activity_edit_comment.xml
index ba239230..740aad93 100644
--- a/app/src/main/res/layout/activity_edit_comment.xml
+++ b/app/src/main/res/layout/activity_edit_comment.xml
@@ -23,18 +23,34 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <EditText
-        android:id="@+id/comment_edit_text_edit_comment_activity"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#00000000"
-        android:gravity="top"
-        android:hint="@string/post_text_content_hint"
-        android:inputType="textCapSentences|textMultiLine"
-        android:padding="16dp"
-        android:textColor="?attr/primaryTextColor"
-        android:textSize="?attr/content_font_18"
-        android:fontFamily="?attr/content_font_family"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+        android:orientation="vertical"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <EditText
+            android:id="@+id/comment_edit_text_edit_comment_activity"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:background="#00000000"
+            android:gravity="top"
+            android:hint="@string/post_text_content_hint"
+            android:inputType="textCapSentences|textMultiLine"
+            android:padding="16dp"
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="?attr/content_font_18"
+            android:fontFamily="?attr/content_font_family" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/markdown_bottom_bar_recycler_view_edit_comment_activity"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:scrollbars="horizontal"
+            android:layout_gravity="bottom" />
+
+    </LinearLayout>
+
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_edit_post.xml b/app/src/main/res/layout/activity_edit_post.xml
index 5d124696..a7d0078f 100644
--- a/app/src/main/res/layout/activity_edit_post.xml
+++ b/app/src/main/res/layout/activity_edit_post.xml
@@ -13,65 +13,72 @@
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <com.google.android.material.appbar.CollapsingToolbarLayout
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar_edit_post_activity"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:titleEnabled="false"
-            app:toolbarId="@+id/toolbar_edit_post_activity">
-
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar_edit_post_activity"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:minHeight="?attr/actionBarSize"
-                app:popupTheme="@style/AppTheme.PopupOverlay"
-                app:navigationIcon="?attr/homeAsUpIndicator" />
-
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
+            app:popupTheme="@style/AppTheme.PopupOverlay"
+            app:navigationIcon="?attr/homeAsUpIndicator" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <androidx.core.widget.NestedScrollView
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:orientation="vertical"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <LinearLayout
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:layout_height="0dp"
+            android:layout_weight="1">
 
-            <TextView
-                android:id="@+id/post_title_text_view_edit_post_activity"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="top"
-                android:padding="16dp"
-                android:textSize="?attr/title_font_18"
-                android:textColor="?attr/primaryTextColor"
-                android:fontFamily="?attr/title_font_family" />
+                android:layout_height="match_parent"
+                android:orientation="vertical">
 
-            <View
-                android:id="@+id/divider_edit_post_activity"
-                android:layout_width="match_parent"
-                android:layout_height="1dp" />
+                <TextView
+                    android:id="@+id/post_title_text_view_edit_post_activity"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="top"
+                    android:padding="16dp"
+                    android:textSize="?attr/title_font_18"
+                    android:textColor="?attr/primaryTextColor"
+                    android:fontFamily="?attr/title_font_family" />
 
-            <EditText
-                android:id="@+id/post_text_content_edit_text_edit_post_activity"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="top"
-                android:padding="16dp"
-                android:hint="@string/post_text_content_hint"
-                android:inputType="textCapSentences|textMultiLine"
-                android:textSize="?attr/content_font_18"
-                android:background="#00000000"
-                android:textColor="?attr/primaryTextColor"
-                android:fontFamily="?attr/content_font_family" />
+                <View
+                    android:id="@+id/divider_edit_post_activity"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <EditText
+                    android:id="@+id/post_text_content_edit_text_edit_post_activity"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="top"
+                    android:padding="16dp"
+                    android:hint="@string/post_text_content_hint"
+                    android:inputType="textCapSentences|textMultiLine"
+                    android:textSize="?attr/content_font_18"
+                    android:background="#00000000"
+                    android:textColor="?attr/primaryTextColor"
+                    android:fontFamily="?attr/content_font_family" />
+
+            </LinearLayout>
+
+        </androidx.core.widget.NestedScrollView>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/markdown_bottom_bar_recycler_view_edit_post_activity"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:scrollbars="horizontal"
+            android:layout_gravity="bottom" />
 
-        </LinearLayout>
+    </LinearLayout>
 
-    </androidx.core.widget.NestedScrollView>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_post_text.xml b/app/src/main/res/layout/activity_post_text.xml
index 67ba4234..d9b02754 100644
--- a/app/src/main/res/layout/activity_post_text.xml
+++ b/app/src/main/res/layout/activity_post_text.xml
@@ -23,148 +23,163 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <androidx.core.widget.NestedScrollView
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:orientation="vertical"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <LinearLayout
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingStart="16dp"
-                android:paddingTop="8dp"
-                android:paddingEnd="16dp"
-                android:paddingBottom="8dp">
-
-                <pl.droidsonroids.gif.GifImageView
-                    android:id="@+id/subreddit_icon_gif_image_view_search_activity"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_alignParentStart="true"
-                    android:layout_centerVertical="true" />
-
-                <TextView
-                    android:id="@+id/subreddit_name_text_view_search_activity"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_marginStart="32dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_toStartOf="@id/rules_button_post_text_activity"
-                    android:layout_toEndOf="@id/subreddit_icon_gif_image_view_search_activity"
-                    android:text="@string/choose_a_subreddit"
-                    android:textSize="?attr/font_default"
-                    android:fontFamily="?attr/font_family" />
-
-                <Button
-                    android:id="@+id/rules_button_post_text_activity"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:layout_centerVertical="true"
-                    android:text="@string/rules"
-                    android:textSize="?attr/font_default"
-                    android:fontFamily="?attr/font_family" />
-
-            </RelativeLayout>
-
-            <View
-                android:id="@+id/divider_1_post_text_activity"
-                android:layout_width="match_parent"
-                android:layout_height="1dp" />
+            android:layout_height="0dp"
+            android:layout_weight="1">
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="match_parent"
+                android:orientation="vertical">
 
-                <com.libRG.CustomTextView
-                    android:id="@+id/flair_custom_text_view_post_text_activity"
-                    android:layout_width="wrap_content"
+                <RelativeLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_margin="16dp"
-                    android:padding="4dp"
-                    android:text="@string/flair"
-                    android:textColor="?attr/primaryTextColor"
-                    android:textSize="?attr/font_default"
-                    android:fontFamily="?attr/font_family"
-                    android:visibility="gone"
-                    app:lib_setRadius="3dp"
-                    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:paddingStart="16dp"
+                    android:paddingTop="8dp"
+                    android:paddingEnd="16dp"
+                    android:paddingBottom="8dp">
+
+                    <pl.droidsonroids.gif.GifImageView
+                        android:id="@+id/subreddit_icon_gif_image_view_search_activity"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:layout_alignParentStart="true"
+                        android:layout_centerVertical="true" />
+
+                    <TextView
+                        android:id="@+id/subreddit_name_text_view_search_activity"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:layout_marginStart="32dp"
+                        android:layout_marginEnd="16dp"
+                        android:layout_toStartOf="@id/rules_button_post_text_activity"
+                        android:layout_toEndOf="@id/subreddit_icon_gif_image_view_search_activity"
+                        android:text="@string/choose_a_subreddit"
+                        android:textSize="?attr/font_default"
+                        android:fontFamily="?attr/font_family" />
+
+                    <Button
+                        android:id="@+id/rules_button_post_text_activity"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentEnd="true"
+                        android:layout_centerVertical="true"
+                        android:text="@string/rules"
+                        android:textSize="?attr/font_default"
+                        android:fontFamily="?attr/font_family" />
+
+                </RelativeLayout>
+
+                <View
+                    android:id="@+id/divider_1_post_text_activity"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <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="?attr/primaryTextColor"
+                        android:textSize="?attr/font_default"
+                        android:fontFamily="?attr/font_family"
+                        android:visibility="gone"
+                        app:lib_setRadius="3dp"
+                        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="?attr/primaryTextColor"
+                        android:textSize="?attr/font_default"
+                        android:fontFamily="?attr/font_family"
+                        app:lib_setRadius="3dp"
+                        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="?attr/primaryTextColor"
+                        android:textSize="?attr/font_default"
+                        android:fontFamily="?attr/font_family"
+                        app:lib_setRadius="3dp"
+                        app:lib_setRoundedView="true"
+                        app:lib_setShape="rectangle" />
+
+                </LinearLayout>
+
+                <View
+                    android:id="@+id/divider_2_post_text_activity"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <EditText
+                    android:id="@+id/post_title_edit_text_post_text_activity"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_margin="16dp"
-                    android:padding="4dp"
-                    android:text="@string/spoiler"
+                    android:background="#00000000"
+                    android:gravity="top"
+                    android:hint="@string/post_title_hint"
+                    android:inputType="textCapSentences|textMultiLine"
+                    android:padding="16dp"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="?attr/font_default"
-                    android:fontFamily="?attr/font_family"
-                    app:lib_setRadius="3dp"
-                    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:textSize="?attr/title_font_18"
+                    android:fontFamily="?attr/title_font_family" />
+
+                <View
+                    android:id="@+id/divider_3_post_text_activity"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp" />
+
+                <EditText
+                    android:id="@+id/post_text_content_edit_text_post_text_activity"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="#00000000"
+                    android:gravity="top"
+                    android:hint="@string/post_text_content_hint"
+                    android:inputType="textCapSentences|textMultiLine"
+                    android:padding="16dp"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="?attr/font_default"
-                    android:fontFamily="?attr/font_family"
-                    app:lib_setRadius="3dp"
-                    app:lib_setRoundedView="true"
-                    app:lib_setShape="rectangle" />
+                    android:textSize="?attr/content_font_18"
+                    android:fontFamily="?attr/content_font_family" />
 
             </LinearLayout>
 
-            <View
-                android:id="@+id/divider_2_post_text_activity"
-                android:layout_width="match_parent"
-                android:layout_height="1dp" />
+        </androidx.core.widget.NestedScrollView>
 
-            <EditText
-                android:id="@+id/post_title_edit_text_post_text_activity"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="#00000000"
-                android:gravity="top"
-                android:hint="@string/post_title_hint"
-                android:inputType="textCapSentences|textMultiLine"
-                android:padding="16dp"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="?attr/title_font_18"
-                android:fontFamily="?attr/title_font_family" />
-
-            <View
-                android:id="@+id/divider_3_post_text_activity"
-                android:layout_width="match_parent"
-                android:layout_height="1dp" />
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/markdown_bottom_bar_recycler_view_post_text_activity"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:scrollbars="horizontal"
+            android:layout_gravity="bottom" />
 
-            <EditText
-                android:id="@+id/post_text_content_edit_text_post_text_activity"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="#00000000"
-                android:gravity="top"
-                android:hint="@string/post_text_content_hint"
-                android:inputType="textCapSentences|textMultiLine"
-                android:padding="16dp"
-                android:textColor="?attr/primaryTextColor"
-                android:textSize="?attr/content_font_18"
-                android:fontFamily="?attr/content_font_family" />
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
+    </LinearLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file