Skip to content

Commit 5fec0c0

Browse files
RajashekarRajuRajashekarRaju
committed
Finalized light/dark theme colors. Single blue variant with minimum colors for all layouts.
1 parent c762ffc commit 5fec0c0

File tree

4 files changed

+30
-84
lines changed

4 files changed

+30
-84
lines changed

‎app/src/main/res/values-night/colors.xml‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<color name="primaryColor">#236D8F</color>
4-
<color name="primaryDarkColor">#123A4C</color>
5-
<color name="onPrimaryColor">#ffffff</color>
4+
<color name="onPrimaryColor">#141A20</color>
65

7-
<color name="secondaryColor">#123A4C</color>
8-
<color name="onSecondaryColor">#DFDFDF</color>
6+
<color name="surfaceColor">#1D262E</color>
7+
<color name="onSurfaceColor">#E3F2FD</color>
98

10-
<color name="surfaceColor">#ffffff</color>
11-
<color name="onSurfaceColor">#112132</color>
12-
13-
<!-- <color name="colorBrand">#236D8F</color>-->
14-
15-
<color name="colorBackground">#09111B</color>
16-
<color name="colorOnBackground">#607d8b</color>
17-
18-
<color name="colorLowWave">#2264ab</color>
19-
<color name="colorMidWave">#184a7e</color>
20-
<color name="colorHighWave">#09111b</color>
9+
<color name="colorBackground">#141A20</color>
10+
<color name="colorOnBackground">#E3F2FD</color>
2111

12+
<color name="colorHighWave">#374450</color>
13+
<color name="colorMidWave">#232D35</color>
14+
<color name="colorLowWave">#141A20</color>
2215
</resources>

‎app/src/main/res/values-night/themes.xml‎

Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,28 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<resources>
2+
<resources xmlns:tools="http://schemas.android.com/tools">
33

44
<style name="Base.AppTheme" parent="@style/Theme.MaterialComponents.DayNight.NoActionBar">
55

6-
<item name="colorPrimary">@color/primaryColor</item>
7-
<item name="colorPrimaryDark">@color/primaryDarkColor</item>
8-
<item name="colorOnPrimary">@color/onPrimaryColor</item>
9-
10-
<item name="colorSecondary">@color/secondaryColor</item>
11-
<item name="colorOnSecondary">@color/onSecondaryColor</item>
12-
13-
<item name="colorSurface">@color/surfaceColor</item>
14-
<item name="colorOnSurface">@color/onSurfaceColor</item>
15-
16-
<item name="background">@color/colorBackground</item>
17-
<item name="colorOnBackground">@color/colorOnBackground</item>
18-
<!-- <item name="android:background">@color/colorBackground</item>-->
19-
206
<item name="android:statusBarColor">@color/colorBackground</item>
217
<item name="android:navigationBarColor">@color/colorBackground</item>
8+
<item name="android:windowLightStatusBar" tools:ignore="NewApi">false</item>
9+
<item name="android:windowLightNavigationBar" tools:ignore="NewApi">false</item>
2210

2311
<item name="fontFamily">@font/poppins_regular</item>
2412
<item name="android:fontFamily">@font/poppins_regular</item>
13+
14+
<item name="elevationOverlayEnabled">true</item>
2515
</style>
2616

2717
<style name="AppTheme" parent="@style/Base.AppTheme" />
2818

29-
<style name="AppTheme.HomeTheme">
19+
<style name="AppTheme.Blue">
3020
<item name="colorPrimary">@color/primaryColor</item>
31-
<item name="colorSurface">@color/surfaceColor</item>
32-
<item name="colorOnSurface">@color/onSurfaceColor</item>
33-
<item name="background">@color/colorBackground</item>
34-
<item name="colorOnBackground">@color/colorOnBackground</item>
35-
<!-- <item name="android:background">@color/colorBackground</item>-->
36-
<item name="android:navigationBarColor">@color/secondaryColor</item>
37-
</style>
38-
39-
<style name="AppTheme.IntroTheme">
40-
41-
</style>
21+
<item name="colorOnPrimary">@color/onPrimaryColor</item>
4222

43-
<style name="AppTheme.MainTheme">
44-
<item name="colorPrimary">@color/primaryColor</item>
4523
<item name="colorSurface">@color/surfaceColor</item>
4624
<item name="colorOnSurface">@color/onSurfaceColor</item>
25+
4726
<item name="background">@color/colorBackground</item>
4827
<item name="colorOnBackground">@color/colorOnBackground</item>
4928
</style>

‎app/src/main/res/values/colors.xml‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<color name="primaryColor">#236D8F</color>
4-
<color name="primaryDarkColor">#123A4C</color>
54
<color name="onPrimaryColor">#ffffff</color>
65

7-
<color name="secondaryColor">#DFDFDF</color>
8-
<color name="onSecondaryColor">#123A4C</color>
6+
<color name="surfaceColor">#BAE2FF</color>
7+
<color name="onSurfaceColor">#112132</color>
98

10-
<color name="surfaceColor">#112132</color>
11-
<color name="onSurfaceColor">#ffffff</color>
12-
13-
<!-- <color name="colorBrand">#236D8F</color>-->
14-
15-
<color name="colorBackground">#fafafa</color>
16-
<color name="colorOnBackground">#000000</color>
17-
18-
<color name="colorLowWave">#9A9A9A</color>
19-
<color name="colorMidWave">#D6D6D6</color>
20-
<color name="colorHighWave">#FFFFFF</color>
9+
<color name="colorBackground">#E3F2FD</color>
10+
<color name="colorOnBackground">#141A20</color>
2111

12+
<color name="colorHighWave">#E3F2FD</color>
13+
<color name="colorMidWave">#BAE2FF</color>
14+
<color name="colorLowWave">#9CD4FD</color>
2215
</resources>

‎app/src/main/res/values/themes.xml‎

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,26 @@
33

44
<style name="Base.AppTheme" parent="@style/Theme.MaterialComponents.DayNight.NoActionBar">
55

6-
<item name="colorPrimary">@color/primaryColor</item>
7-
<item name="colorPrimaryDark">@color/primaryDarkColor</item>
8-
<item name="colorOnPrimary">@color/onPrimaryColor</item>
9-
10-
<item name="colorSurface">@color/surfaceColor</item>
11-
<item name="colorOnSurface">@color/onSurfaceColor</item>
12-
13-
<item name="background">@color/colorBackground</item>
14-
<item name="colorOnBackground">@color/colorOnBackground</item>
15-
<!-- <item name="android:background">@color/colorBackground</item>-->
16-
17-
<item name="android:statusBarColor">@android:color/transparent</item>
18-
<item name="android:navigationBarColor">@android:color/transparent</item>
6+
<item name="android:statusBarColor">@color/colorBackground</item>
7+
<item name="android:navigationBarColor">@color/colorBackground</item>
198
<item name="android:windowLightStatusBar" tools:ignore="NewApi">true</item>
209
<item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item>
2110

2211
<item name="fontFamily">@font/poppins_regular</item>
2312
<item name="android:fontFamily">@font/poppins_regular</item>
13+
14+
<item name="elevationOverlayEnabled">false</item>
2415
</style>
2516

2617
<style name="AppTheme" parent="@style/Base.AppTheme" />
2718

28-
<style name="AppTheme.HomeTheme">
19+
<style name="AppTheme.Blue">
2920
<item name="colorPrimary">@color/primaryColor</item>
30-
<item name="colorSurface">@color/surfaceColor</item>
31-
<item name="colorOnSurface">@color/onSurfaceColor</item>
32-
<item name="background">@color/colorBackground</item>
33-
<item name="colorOnBackground">@color/colorOnBackground</item>
34-
<!-- <item name="android:background">@color/colorBackground</item>-->
35-
</style>
36-
37-
<style name="AppTheme.IntroTheme">
38-
39-
</style>
21+
<item name="colorOnPrimary">@color/onPrimaryColor</item>
4022

41-
<style name="AppTheme.MainTheme">
42-
<item name="colorPrimary">@color/primaryColor</item>
4323
<item name="colorSurface">@color/surfaceColor</item>
4424
<item name="colorOnSurface">@color/onSurfaceColor</item>
25+
4526
<item name="background">@color/colorBackground</item>
4627
<item name="colorOnBackground">@color/colorOnBackground</item>
4728
</style>

0 commit comments

Comments
 (0)