From 117a33be3b3c112bcde45fce3974851a8ae58c47 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Tue, 9 Jul 2019 17:47:40 +0800
Subject: Minor UI tweaks. Preparing for submitting text posts.

---
 app/src/main/res/layout/activity_post_text.xml     | 94 ++++++++++++++++++++++
 app/src/main/res/layout/app_bar_main.xml           |  8 ++
 .../main/res/layout/exo_playback_control_view.xml  |  3 +
 app/src/main/res/layout/item_load_comments.xml     |  3 +-
 .../item_load_comments_failed_placeholder.xml      |  2 +-
 .../res/layout/item_no_comment_placeholder.xml     |  2 +-
 app/src/main/res/layout/item_post_detail.xml       |  2 +-
 app/src/main/res/values/strings.xml                |  7 ++
 8 files changed, 116 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/layout/activity_post_text.xml

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

diff --git a/app/src/main/res/layout/activity_post_text.xml b/app/src/main/res/layout/activity_post_text.xml
new file mode 100644
index 00000000..cb08e1f2
--- /dev/null
+++ b/app/src/main/res/layout/activity_post_text.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".PostTextActivity">
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            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:paddingTop="8dp"
+                android:paddingBottom="8dp"
+                android:paddingStart="16dp"
+                android:paddingEnd="16dp">
+
+                <pl.droidsonroids.gif.GifImageView
+                    android:id="@+id/subreddit_icon_gif_image_view_post_text_activity"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_alignParentStart="true"
+                    android:layout_centerVertical="true"
+                    android:src="@drawable/subreddit_default_icon" />
+
+                <TextView
+                    android:id="@+id/subreddit_name_text_view_post_text_activity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_toStartOf="@id/rules_button_post_text_activity"
+                    android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_text_activity"
+                    android:layout_centerVertical="true"
+                    android:layout_marginStart="32dp"
+                    android:layout_marginEnd="16dp"
+                    android:text="@string/choose_a_subreddit" />
+
+                <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:textColor="@color/colorAccent" />
+
+            </RelativeLayout>
+
+            <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"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="top"
+                android:padding="16dp"
+                android:hint="@string/post_title_hint"
+                android:inputType="textCapSentences|textMultiLine"
+                android:textSize="18sp"
+                android:background="#00000000"
+                android:textColor="@color/primaryTextColor" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/dividerColor" />
+
+            <EditText
+                android:id="@+id/post_text_content_edit_text_post_text_activity"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="top"
+                android:padding="16dp"
+                android:hint="@string/post_text_content_hint"
+                android:inputType="textCapSentences|textMultiLine"
+                android:textSize="18sp"
+                android:background="#00000000"
+                android:textColor="@color/primaryTextColor" />
+
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 1407326c..50f1384f 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -62,4 +62,12 @@
 
     <include layout="@layout/content_main" />
 
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab_main_activity"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="@dimen/fab_margin"
+        app:srcCompat="@drawable/baseline_add_white_24" />
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/exo_playback_control_view.xml b/app/src/main/res/layout/exo_playback_control_view.xml
index 752826fb..93a801af 100644
--- a/app/src/main/res/layout/exo_playback_control_view.xml
+++ b/app/src/main/res/layout/exo_playback_control_view.xml
@@ -4,6 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="bottom"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
+    android:paddingBottom="16dp"
     android:background="@color/transparentActionBarColor"
     android:orientation="vertical">
 
diff --git a/app/src/main/res/layout/item_load_comments.xml b/app/src/main/res/layout/item_load_comments.xml
index 06bc8c38..00bd5877 100644
--- a/app/src/main/res/layout/item_load_comments.xml
+++ b/app/src/main/res/layout/item_load_comments.xml
@@ -9,8 +9,7 @@
         android:id="@+id/comment_progress_bar_view_post_detail"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="16dp"
+        android:layout_margin="16dp"
         app:mlpb_progress_stoke_width="3dp"
         app:mlpb_progress_color="@color/colorAccent"
         app:mlpb_background_color="@color/circularProgressBarBackground"
diff --git a/app/src/main/res/layout/item_load_comments_failed_placeholder.xml b/app/src/main/res/layout/item_load_comments_failed_placeholder.xml
index 25af5d14..d81cdb97 100644
--- a/app/src/main/res/layout/item_load_comments_failed_placeholder.xml
+++ b/app/src/main/res/layout/item_load_comments_failed_placeholder.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="36dp"
+    android:layout_margin="36dp"
     android:orientation="vertical">
 
     <ImageView
diff --git a/app/src/main/res/layout/item_no_comment_placeholder.xml b/app/src/main/res/layout/item_no_comment_placeholder.xml
index 707243c6..a4d85501 100644
--- a/app/src/main/res/layout/item_no_comment_placeholder.xml
+++ b/app/src/main/res/layout/item_no_comment_placeholder.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="36dp"
+    android:layout_margin="36dp"
     android:orientation="vertical">
 
     <ImageView
diff --git a/app/src/main/res/layout/item_post_detail.xml b/app/src/main/res/layout/item_post_detail.xml
index 870d21ef..4a40eb1b 100644
--- a/app/src/main/res/layout/item_post_detail.xml
+++ b/app/src/main/res/layout/item_post_detail.xml
@@ -26,7 +26,7 @@
                 app:layout_constraintTop_toTopOf="parent">
 
                 <CustomView.AspectRatioGifImageView
-                    android:id="@+id/subreddit_icon_circle_image_view_item_post_detail"
+                    android:id="@+id/subreddit_icon_gif_image_view_item_post_detail"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_gravity="center"/>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 29b0c4e3..726e34b6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,6 +4,7 @@
     <string name="search_activity_label">Search</string>
     <string name="comment_activity_label">Add Comment</string>
     <string name="comment_activity_label_is_replying">Reply</string>
+    <string name="post_text_activity">Text Post</string>
 
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
@@ -84,4 +85,10 @@
     <string name="comment_load_more_comments_failed">Load failed. Tap to retry.</string>
 
     <string name="loading">Loading</string>
+
+    <string name="post_title_hint">Title</string>
+    <string name="post_text_content_hint">Content</string>
+    <string name="post_url_hint">URL</string>
+    <string name="choose_a_subreddit">Choose a subreddit</string>
+    <string name="rules">Rules</string>
 </resources>
-- 
cgit v1.2.3