From 744e586cfec3b8081c2ef276e1ba7c8b9f615aa6 Mon Sep 17 00:00:00 2001
From: Anton Chekulaev <metaphore@bk.ru>
Date: Wed, 2 Sep 2020 13:13:19 +1000
Subject: [PATCH] Flat action bar styles for the landing activities.

---
 AndroidManifest.xml                     | 18 ++++++++++++------
 res/layout-sw400dp/activity_landing.xml |  2 --
 res/layout/activity_landing.xml         |  2 --
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0a6f5f9ace..f34234853b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -92,25 +92,31 @@
         <!-- Session -->
         <activity
             android:name="org.thoughtcrime.securesms.loki.activities.LandingActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.Session.DayNight.FlatActionBar"/>
         <activity
             android:name="org.thoughtcrime.securesms.loki.activities.RegisterActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.Session.DayNight.FlatActionBar"/>
         <activity
             android:name="org.thoughtcrime.securesms.loki.activities.RestoreActivity"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustResize" />
+            android:windowSoftInputMode="adjustResize"
+            android:theme="@style/Theme.Session.DayNight.FlatActionBar" />
         <activity
             android:name="org.thoughtcrime.securesms.loki.activities.LinkDeviceActivity"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustResize" />
+            android:windowSoftInputMode="adjustResize"
+            android:theme="@style/Theme.Session.DayNight.FlatActionBar"  />
         <activity
             android:name="org.thoughtcrime.securesms.loki.activities.DisplayNameActivity"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustResize" />
+            android:windowSoftInputMode="adjustResize"
+            android:theme="@style/Theme.Session.DayNight.FlatActionBar"/>
         <activity
             android:name="org.thoughtcrime.securesms.loki.activities.PNModeActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.Session.DayNight.FlatActionBar"  />
         <activity
             android:name="org.thoughtcrime.securesms.loki.activities.HomeActivity"
             android:screenOrientation="portrait"
diff --git a/res/layout-sw400dp/activity_landing.xml b/res/layout-sw400dp/activity_landing.xml
index 559ebd36ee..7ecae1b271 100644
--- a/res/layout-sw400dp/activity_landing.xml
+++ b/res/layout-sw400dp/activity_landing.xml
@@ -17,7 +17,6 @@
         android:layout_marginRight="@dimen/very_large_spacing"
         android:textSize="@dimen/very_large_font_size"
         android:textStyle="bold"
-        android:textColor="@color/text"
         android:text="@string/activity_landing_title_2" />
     
     <org.thoughtcrime.securesms.loki.views.FakeChatView
@@ -61,7 +60,6 @@
         android:background="@color/transparent"
         android:textAllCaps="false"
         android:textSize="@dimen/medium_font_size"
-        android:textColor="@color/text"
         android:text="@string/activity_landing_link_button_title" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/activity_landing.xml b/res/layout/activity_landing.xml
index 1eab2bf48e..7dbddf0219 100644
--- a/res/layout/activity_landing.xml
+++ b/res/layout/activity_landing.xml
@@ -17,7 +17,6 @@
         android:layout_marginRight="@dimen/very_large_spacing"
         android:textSize="@dimen/large_font_size"
         android:textStyle="bold"
-        android:textColor="@color/text"
         android:text="@string/activity_landing_title_2" />
     
     <org.thoughtcrime.securesms.loki.views.FakeChatView
@@ -61,7 +60,6 @@
         android:background="@color/transparent"
         android:textAllCaps="false"
         android:textSize="@dimen/medium_font_size"
-        android:textColor="@color/text"
         android:text="@string/activity_landing_link_button_title" />
 
 </LinearLayout>
\ No newline at end of file