From 372acf4cf45a0420998cba31683b3e66844d3a1e Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Fri, 17 Apr 2020 18:08:30 +0800
Subject: Fix white theme issues. Remove CollapsingToolbarLayout in some
 activities.

---
 app/src/main/res/layout/activity_comment.xml | 35 +++++++++++-----------------
 1 file changed, 13 insertions(+), 22 deletions(-)

(limited to 'app/src/main/res/layout/activity_comment.xml')

diff --git a/app/src/main/res/layout/activity_comment.xml b/app/src/main/res/layout/activity_comment.xml
index 09d5ab34..a9af4118 100644
--- a/app/src/main/res/layout/activity_comment.xml
+++ b/app/src/main/res/layout/activity_comment.xml
@@ -2,9 +2,9 @@
 <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:id="@+id/coordinator_layout_comment_activity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/coordinator_layout_comment_activity"
     android:background="?attr/backgroundColor"
     tools:application=".CommentActivity">
 
@@ -15,21 +15,12 @@
         android:background="?attr/toolbarAndTabBackgroundColor"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <com.google.android.material.appbar.CollapsingToolbarLayout
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar_comment_activity"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:titleEnabled="false"
-            app:toolbarId="@+id/toolbar_comment_activity">
-
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar_comment_activity"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                app:navigationIcon="?attr/homeAsUpIndicator"
-                app:popupTheme="@style/AppTheme.PopupOverlay" />
-
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
+            android:layout_height="?attr/actionBarSize"
+            app:navigationIcon="?attr/homeAsUpIndicator"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -55,9 +46,9 @@
                 android:id="@+id/content_markdown_view_comment_activity"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
+                android:layout_marginBottom="16dp"
                 android:visibility="gone" />
 
             <View
@@ -71,15 +62,15 @@
                 android:id="@+id/comment_edit_text_comment_activity"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:background="#00000000"
                 android:gravity="top"
-                android:paddingBottom="16dp"
-                android:paddingStart="16dp"
-                android:paddingEnd="16dp"
                 android:hint="@string/write_comment_hint"
                 android:inputType="textCapSentences|textMultiLine"
-                android:textSize="?attr/content_font_18"
-                android:background="#00000000"
-                android:textColor="?attr/primaryTextColor" />
+                android:paddingStart="16dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="16dp"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="?attr/content_font_18" />
 
         </LinearLayout>
 
-- 
cgit v1.2.3