aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2026-01-01 13:54:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix theme after migration to Nordic Theme

Browse Source
This commit is contained in:
Sylwester Zieliński
2021-12-07 12:25:31 +01:00
parent fb237c11c1
commit 1f5dcfb3dd
7 changed files with 4 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib_theme/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
View File

@@ -22,6 +22,6 @@
-->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/actionBarColor"/>
<background android:drawable="@color/md_theme_primary"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>

2
lib_theme/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
View File

@@ -22,6 +22,6 @@
-->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/actionBarColor"/>
<background android:drawable="@color/md_theme_primary"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>

11
lib_theme/src/main/res/values-night/colors.xml
View File

@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#FF212121</color>
<color name="colorPrimaryDark">@android:color/black</color>
<color name="colorSecondary">#FF008CD2</color>
<color name="colorSecondaryDark">#FF008CD2</color>
<color name="colorOnSecondary">#FFFFFFFF</color>
<color name="colorOnPrimary">#FFFFFFFF</color>
<color name="background">@android:color/black</color>
<color name="actionBarColor">#FF0090B0</color>
</resources>

11
lib_theme/src/main/res/values/colors.xml
View File

@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#FF00A9CE</color>
<color name="colorPrimaryDark">#FF007a9d</color>
<color name="colorOnPrimary">#FFFFFFFF</color>
<color name="colorSecondary">#FF0077c8</color>
<color name="colorSecondaryDark">#FF004c97</color>
<color name="colorOnSecondary">#FFFFFFFF</color>
<color name="background">#FFF5F5F5</color>
<color name="actionBarColor">#FF0090B0</color>
</resources>

26
lib_theme/src/main/res/values/themes.xml
View File

@@ -1,26 +0,0 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="Theme.Test" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<!-- Primary brand color. -->
<item name="android:background">@color/background</item>
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryVariant">@color/colorPrimaryDark</item>
<item name="colorOnPrimary">@color/colorOnPrimary</item>
<!-- Secondary brand color. -->
<item name="colorSecondary">@color/colorSecondary</item>
<item name="colorSecondaryVariant">@color/colorSecondaryDark</item>
<item name="colorOnSecondary">@color/colorOnSecondary</item>
<!-- Status bar color. -->
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
<!-- Customize your theme here. -->
</style>
<style name="Theme.Test.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="Theme.Test.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
<style name="Theme.Test.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
</resources>