devol
/
Bitwarden-app-android-iphone-ios
mirror of https://github.com/bitwarden/mobile
1
0
Fork 0
Code Issues 2 Releases Wiki Activity

rename main theme to light theme

This commit is contained in:
Kyle Spearrin 2019-06-04 09:36:45 -04:00
parent fdfd2d20e6
commit 11e5b2ea5d
7 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Android/Accessibility/AccessibilityActivity.cs
View File

@ -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;

4
src/Android/MainActivity.cs
View File

@ -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);
}
}

2
src/Android/Properties/AndroidManifest.xml
View File

@ -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"

6
src/Android/Resources/Resource.designer.cs generated
View File

@ -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;

4
src/Android/Resources/values-v21/styles.xml
View File

@ -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>

6
src/Android/Resources/values/styles.xml
View File

@ -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>

8
src/Android/SplashActivity.cs
View File

@ -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);
}
}
}