From 11e5b2ea5d5275f11ea50f4a72a06e0427251723 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 4 Jun 2019 09:36:45 -0400
Subject: [PATCH] rename main theme to light theme

---
 src/Android/Accessibility/AccessibilityActivity.cs | 2 +-
 src/Android/MainActivity.cs                        | 4 ++--
 src/Android/Properties/AndroidManifest.xml         | 2 +-
 src/Android/Resources/Resource.designer.cs         | 6 +++---
 src/Android/Resources/values-v21/styles.xml        | 4 +++-
 src/Android/Resources/values/styles.xml            | 6 +++---
 src/Android/SplashActivity.cs                      | 8 ++++++--
 7 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/Android/Accessibility/AccessibilityActivity.cs b/src/Android/Accessibility/AccessibilityActivity.cs
index 20475184c..5d52e0ef8 100644
--- a/src/Android/Accessibility/AccessibilityActivity.cs
+++ b/src/Android/Accessibility/AccessibilityActivity.cs
@@ -7,7 +7,7 @@ using System;
 
 namespace Bit.Droid.Accessibility
 {
-    [Activity(Theme = "@style/MainTheme.Splash", WindowSoftInputMode = SoftInput.StateHidden)]
+    [Activity(Theme = "@style/LightTheme.Splash", WindowSoftInputMode = SoftInput.StateHidden)]
     public class AccessibilityActivity : Activity
     {
         private DateTime? _lastLaunch = null;
diff --git a/src/Android/MainActivity.cs b/src/Android/MainActivity.cs
index 07f50cc32..4113dc779 100644
--- a/src/Android/MainActivity.cs
+++ b/src/Android/MainActivity.cs
@@ -23,7 +23,7 @@ namespace Bit.Droid
     [Activity(
         Label = "Bitwarden",
         Icon = "@mipmap/ic_launcher",
-        Theme = "@style/MainTheme",
+        Theme = "@style/LightTheme",
         Exported = false,
         ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
     [Register("com.x8bit.bitwarden.MainActivity")]
@@ -291,7 +291,7 @@ namespace Bit.Droid
             }
             else
             {
-                SetTheme(Resource.Style.MainTheme);
+                SetTheme(Resource.Style.LightTheme);
             }
         }
 
diff --git a/src/Android/Properties/AndroidManifest.xml b/src/Android/Properties/AndroidManifest.xml
index 193f130ac..92ea739c6 100644
--- a/src/Android/Properties/AndroidManifest.xml
+++ b/src/Android/Properties/AndroidManifest.xml
@@ -20,7 +20,7 @@
 
   <application
     android:label="Bitwarden"
-    android:theme="@style/MainTheme"
+    android:theme="@style/LightTheme"
     android:allowBackup="false"
     tools:replace="android:allowBackup"
     android:icon="@mipmap/ic_launcher"
diff --git a/src/Android/Resources/Resource.designer.cs b/src/Android/Resources/Resource.designer.cs
index d0c7f1421..a42a23c6b 100644
--- a/src/Android/Resources/Resource.designer.cs
+++ b/src/Android/Resources/Resource.designer.cs
@@ -11673,13 +11673,13 @@ namespace Bit.Droid
 			public const int HockeyApp_SingleLineInputStyle = 2131624449;
 			
 			// aapt resource value: 0x7f0e0205
-			public const int MainTheme = 2131624453;
+			public const int LightTheme = 2131624453;
 			
 			// aapt resource value: 0x7f0e0206
-			public const int MainTheme_Base = 2131624454;
+			public const int LightTheme_Base = 2131624454;
 			
 			// aapt resource value: 0x7f0e0202
-			public const int MainTheme_Splash = 2131624450;
+			public const int LightTheme_Splash = 2131624450;
 			
 			// aapt resource value: 0x7f0e007e
 			public const int Platform_AppCompat = 2131624062;
diff --git a/src/Android/Resources/values-v21/styles.xml b/src/Android/Resources/values-v21/styles.xml
index 686f0939f..780d00f0b 100644
--- a/src/Android/Resources/values-v21/styles.xml
+++ b/src/Android/Resources/values-v21/styles.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <resources>
-  <style name="MainTheme" parent="MainTheme.Base">
+  <style name="LightTheme" parent="LightTheme.Base">
   </style>
   <style name="DarkTheme" parent="DarkTheme.Base">
   </style>
+  <style name="BlackTheme" parent="BlackTheme.Base">
+  </style>
 </resources>
diff --git a/src/Android/Resources/values/styles.xml b/src/Android/Resources/values/styles.xml
index dba4acfe6..0c9f14883 100644
--- a/src/Android/Resources/values/styles.xml
+++ b/src/Android/Resources/values/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <resources>
-  <style name="MainTheme.Splash" parent="MainTheme.Base">
+  <style name="LightTheme.Splash" parent="LightTheme.Base">
     <item name="android:windowBackground">@drawable/splash_screen</item>
     <item name="android:windowNoTitle">true</item>
   </style>
@@ -11,10 +11,10 @@
   <style name="BlackTheme.Splash" parent="DarkTheme.Splash">
   </style>
 
-  <style name="MainTheme" parent="MainTheme.Base">
+  <style name="LightTheme" parent="LightTheme.Base">
   </style>
 
-  <style name="MainTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">
+  <style name="LightTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">
     <item name="windowNoTitle">true</item>
     <item name="windowActionBar">false</item>
     <item name="colorPrimary">@color/primary</item>
diff --git a/src/Android/SplashActivity.cs b/src/Android/SplashActivity.cs
index 5097e0cab..4b4c1dfe9 100644
--- a/src/Android/SplashActivity.cs
+++ b/src/Android/SplashActivity.cs
@@ -14,7 +14,7 @@ namespace Bit.Droid
         MainLauncher = true,
         NoHistory = true,
         Icon = "@mipmap/ic_launcher",
-        Theme = "@style/MainTheme.Splash",
+        Theme = "@style/LightTheme.Splash",
         WindowSoftInputMode = Android.Views.SoftInput.StateHidden,
         ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
     [Register("com.x8bit.bitwarden.SplashActivity")]
@@ -44,9 +44,13 @@ namespace Bit.Droid
             {
                 SetTheme(Resource.Style.DarkTheme_Splash);
             }
+            else if(theme == "black")
+            {
+                SetTheme(Resource.Style.BlackTheme_Splash);
+            }
             else
             {
-                SetTheme(Resource.Style.MainTheme_Splash);
+                SetTheme(Resource.Style.LightTheme_Splash);
             }
         }
     }