mirror of
https://github.com/bitwarden/android.git
synced 2024-11-22 01:16:02 +03:00
Simplify the BaseTheme and remove the night styles.xml. (#165)
This commit is contained in:
parent
852176045b
commit
249c1010f5
4 changed files with 8 additions and 54 deletions
4
app/src/main/res/values-night/ic_launcher_background.xml
Normal file
4
app/src/main/res/values-night/ic_launcher_background.xml
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<color name="ic_launcher_background">@color/dark_gray</color>
|
||||||
|
</resources>
|
|
@ -1,35 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8" ?>
|
|
||||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
|
||||||
|
|
||||||
<style name="BaseTheme" parent="android:Theme.Material">
|
|
||||||
<item name="android:buttonStyle">@style/ButtonStyle</item>
|
|
||||||
<item name="android:colorAccent">@color/dark_primary</item>
|
|
||||||
<item name="android:colorActivatedHighlight">@android:color/transparent</item>
|
|
||||||
<item name="android:colorControlNormal">@color/dark_border</item>
|
|
||||||
<item name="android:colorPrimaryDark">@color/dark_notification_bar</item>
|
|
||||||
<item name="android:navigationBarColor">@android:color/transparent</item>
|
|
||||||
<item name="android:statusBarColor">@android:color/transparent</item>
|
|
||||||
<item name="android:popupTheme">@android:style/ThemeOverlay.Material</item>
|
|
||||||
<item name="android:textCursorDrawable">@null</item>
|
|
||||||
<item name="android:windowActionBar">false</item>
|
|
||||||
<item name="android:windowActionModeOverlay">true</item>
|
|
||||||
<item name="android:windowBackground">@null</item>
|
|
||||||
<item name="android:windowNoTitle">true</item>
|
|
||||||
<item name="android:windowLayoutInDisplayCutoutMode">default</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<style name="ButtonStyle" parent="android:Widget.Material.Button">
|
|
||||||
<item name="android:textAllCaps">false</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<!-- Launch theme (for auto dark/light based on system) -->
|
|
||||||
<style name="LaunchTheme" parent="Theme.SplashScreen">
|
|
||||||
<item name="postSplashScreenTheme">@style/BaseTheme</item>
|
|
||||||
<item name="windowSplashScreenAnimatedIcon">
|
|
||||||
@drawable/logo_rounded
|
|
||||||
</item>
|
|
||||||
<item name="windowSplashScreenBackground">
|
|
||||||
@color/dark_gray
|
|
||||||
</item>
|
|
||||||
</style>
|
|
||||||
</resources>
|
|
|
@ -1,4 +1,4 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
<color name="ic_launcher_background">#175DDC</color>
|
<color name="ic_launcher_background">@color/blue_175DDC</color>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -1,16 +1,9 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
<resources>
|
||||||
|
|
||||||
<style name="BaseTheme" parent="android:Theme.Material.Light.DarkActionBar">
|
<style name="BaseTheme" parent="android:Theme.Material.Light.DarkActionBar">
|
||||||
<item name="android:buttonStyle">@style/ButtonStyle</item>
|
|
||||||
<item name="android:colorAccent">@color/primary</item>
|
|
||||||
<item name="android:colorActivatedHighlight">@android:color/transparent</item>
|
|
||||||
<item name="android:colorControlNormal">@color/border</item>
|
|
||||||
<item name="android:colorPrimary">@color/primary</item>
|
|
||||||
<item name="android:colorPrimaryDark">@color/notification_bar</item>
|
|
||||||
<item name="android:navigationBarColor">@android:color/transparent</item>
|
<item name="android:navigationBarColor">@android:color/transparent</item>
|
||||||
<item name="android:statusBarColor">@android:color/transparent</item>
|
<item name="android:statusBarColor">@android:color/transparent</item>
|
||||||
<item name="android:popupTheme">@android:style/ThemeOverlay.Material.Light</item>
|
|
||||||
<item name="android:textCursorDrawable">@null</item>
|
<item name="android:textCursorDrawable">@null</item>
|
||||||
<item name="android:windowActionBar">false</item>
|
<item name="android:windowActionBar">false</item>
|
||||||
<item name="android:windowBackground">@null</item>
|
<item name="android:windowBackground">@null</item>
|
||||||
|
@ -19,18 +12,10 @@
|
||||||
<item name="android:windowLayoutInDisplayCutoutMode">default</item>
|
<item name="android:windowLayoutInDisplayCutoutMode">default</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="ButtonStyle" parent="android:Widget.Material.Button">
|
|
||||||
<item name="android:textAllCaps">false</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<!-- Launch theme (for auto dark/light based on system) -->
|
<!-- Launch theme (for auto dark/light based on system) -->
|
||||||
<style name="LaunchTheme" parent="Theme.SplashScreen">
|
<style name="LaunchTheme" parent="Theme.SplashScreen">
|
||||||
<item name="postSplashScreenTheme">@style/BaseTheme</item>
|
<item name="postSplashScreenTheme">@style/BaseTheme</item>
|
||||||
<item name="windowSplashScreenAnimatedIcon">
|
<item name="windowSplashScreenAnimatedIcon">@drawable/logo_rounded</item>
|
||||||
@drawable/logo_rounded
|
<item name="windowSplashScreenBackground">@color/ic_launcher_background</item>
|
||||||
</item>
|
|
||||||
<item name="windowSplashScreenBackground">
|
|
||||||
@color/ic_launcher_background
|
|
||||||
</item>
|
|
||||||
</style>
|
</style>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
Loading…
Reference in a new issue