Skip to content

Commit 891ec46

Browse files
Donnnnosarsamurmu
Donnnno
and
sarsamurmu
committed
Update for v3.19.0
Co-Authored-By: Sarsa Murmu <sarsamurmu05@gmail.com>
1 parent 51a4eeb commit 891ec46

File tree

15 files changed

+262
-128
lines changed

15 files changed

+262
-128
lines changed

‎app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion rootProject.ext.CompileSdk
4+
compileSdk rootProject.ext.CompileSdk
55

66
defaultConfig {
77
applicationId 'com.candybar.sample'
@@ -47,7 +47,7 @@ dependencies {
4747
* If you've missed some versions you've to also follow update guide for those versions
4848
*/
4949

50-
implementation 'com.github.Donnnno:candybar-foss:3.18.3'
50+
implementation 'com.github.Donnnno:candybar-foss:3.19.0'
5151

5252
}
5353

‎app/src/main/AndroidManifest.xml

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,34 +19,22 @@
1919
android:networkSecurityConfig="@xml/network_config"
2020
android:label="@string/app_name"
2121
android:supportsRtl="true"
22-
android:theme="@style/CandyBar.Theme.App"
22+
android:theme="@style/Theme.App.Starting"
2323
tools:replace="android:icon"
2424
tools:targetApi="n">
2525

2626
<activity
27-
android:name=".activities.SplashActivity"
27+
android:name=".activities.MainActivity"
2828
android:launchMode="singleTop"
29-
android:noHistory="true"
30-
android:screenOrientation="fullSensor"
31-
android:theme="@style/CandyBar.Theme.Splash"
29+
android:theme="@style/Theme.App.Starting"
30+
android:configChanges="uiMode|orientation|keyboardHidden|screenSize"
3231
android:exported="true">
33-
<intent-filter>
34-
<action android:name="android.intent.action.MAIN" />
35-
<category android:name="android.intent.category.LAUNCHER" />
36-
</intent-filter>
3732
<meta-data
3833
android:name="android.app.shortcuts"
3934
android:resource="@xml/shortcuts" />
40-
</activity>
41-
42-
<activity
43-
android:name=".activities.MainActivity"
44-
android:launchMode="singleTop"
45-
android:theme="@style/CandyBar.Theme.App"
46-
android:configChanges="uiMode|orientation|keyboardHidden|screenSize"
47-
android:exported="true">
4835
<intent-filter>
4936
<action android:name="android.intent.action.MAIN" />
37+
<category android:name="android.intent.category.LAUNCHER" />
5038
</intent-filter>
5139
<intent-filter>
5240
<action android:name="android.intent.action.VIEW" />

‎app/src/main/java/com/candybar/sample/activities/SplashActivity.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎app/src/main/res/drawable-nodpi/ic_splash_screen.png

5.99 KB
Loading

‎app/src/main/res/drawable-xxxhdpi/ic_splash_screen.png

-12.9 KB
Binary file not shown.

‎app/src/main/res/drawable/ic_splash_screen.png

-7.51 KB
Binary file not shown.

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

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<style name="CandyBar.Theme.App.MaterialYou" parent="CandyBar.Theme.Base">
4+
<item name="cb_colorPrimary">@android:color/system_neutral1_900</item>
5+
<item name="cb_colorPrimaryDark">?cb_colorPrimary</item>
6+
<item name="cb_colorAccent">@android:color/system_accent1_300</item>
7+
8+
<!-- Navigation Bar -->
9+
<item name="cb_navigationBar">@android:color/system_neutral1_900</item>
10+
11+
<!-- Splash Screen -->
12+
<item name="cb_splashColor">@android:color/system_neutral1_900</item>
13+
14+
<!-- Navigation View -->
15+
<item name="cb_navigationViewHeaderBackground">#00000000</item>
16+
<item name="cb_navigationViewTitle">@android:color/system_accent1_100</item>
17+
<item name="cb_navigationViewTitleBack">#33000000</item>
18+
19+
<item name="cb_navigationViewText">@android:color/system_accent2_100</item>
20+
<item name="cb_navigationViewTextSelected">@android:color/system_accent2_0</item>
21+
<item name="cb_navigationViewSelectedBackground">@android:color/system_accent1_500</item>
22+
<item name="cb_navigationViewRippleColor">@android:color/system_accent1_100</item>
23+
24+
<!-- Swipe Refresh -->
25+
<item name="cb_swipeRefresh">@android:color/system_accent1_100</item>
26+
27+
<!-- Tap Intro -->
28+
<item name="cb_tapIntroTitle">?cb_mainBackground</item>
29+
<item name="cb_tapIntroDescription">?cb_mainBackground</item>
30+
<item name="cb_tapIntroCircleInner">?cb_primaryText</item>
31+
<item name="cb_tapIntroCircleOuter">?cb_secondaryText</item>
32+
33+
<!-- Toolbar -->
34+
<item name="cb_toolbarIcon">@android:color/system_accent1_100</item>
35+
36+
<!-- Tab -->
37+
<item name="cb_tabIndicator">@android:color/system_neutral1_300</item>
38+
<item name="cb_tabText">@android:color/system_neutral1_100</item>
39+
<item name="cb_tabTextSelected">@android:color/system_neutral1_100</item>
40+
41+
<!-- Card -->
42+
<item name="cb_cardBackground">@android:color/system_neutral1_900</item>
43+
<item name="cb_cardStroke">@android:color/system_neutral1_800</item>
44+
45+
<!-- Ripple -->
46+
<item name="cb_rippleColor">@android:color/system_accent1_700</item>
47+
<item name="cb_rippleAccent">@android:color/system_accent1_700</item>
48+
49+
<!-- Attributes -->
50+
<item name="cb_mainBackground">@android:color/system_neutral1_900</item>
51+
<item name="cb_primaryText">@android:color/system_accent2_50</item>
52+
<item name="cb_secondaryText">@android:color/system_accent2_100</item>
53+
54+
<item name="cb_dividerList">?cb_cardBackground</item>
55+
56+
<!-- Wallpaper Preview -->
57+
<item name="cb_wallpaperStatusBar">#66000000</item>
58+
<item name="cb_wallpaperToolbar">#66000000</item>
59+
</style>
60+
</resources>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<!-- Splash Screen -->
4+
<color name="splashColor">#222222</color>
5+
</resources>

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

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<style name="CandyBar.Theme.App.DayNight" parent="CandyBar.Theme.Base">
4+
<item name="cb_colorPrimary">#222222</item>
5+
<item name="cb_colorPrimaryDark">#222222</item>
6+
<item name="cb_colorAccent">#1BB96F</item>
7+
8+
<!-- Navigation Bar -->
9+
<item name="cb_navigationBar">#222222</item>
10+
11+
<!-- Splash Screen -->
12+
<item name="cb_splashColor">#222222</item>
13+
14+
<!-- Navigation View -->
15+
<item name="cb_navigationViewHeaderBackground">#00000000</item>
16+
<item name="cb_navigationViewTitle">#FFFFFF</item>
17+
<item name="cb_navigationViewTitleBack">#33000000</item>
18+
19+
<item name="cb_navigationViewText">#FFFFFF</item>
20+
<item name="cb_navigationViewTextSelected">#1BB96F</item>
21+
<item name="cb_navigationViewSelectedBackground">#2A1BB96F</item>
22+
<item name="cb_navigationViewRippleColor">#25000000</item>
23+
24+
<!-- Swipe Refresh -->
25+
<item name="cb_swipeRefresh">#1BB96F</item>
26+
27+
<!-- Tap Intro -->
28+
<item name="cb_tapIntroTitle">?cb_mainBackground</item>
29+
<item name="cb_tapIntroDescription">?cb_mainBackground</item>
30+
<item name="cb_tapIntroCircleInner">?cb_primaryText</item>
31+
<item name="cb_tapIntroCircleOuter">?cb_secondaryText</item>
32+
33+
<!-- Toolbar -->
34+
<item name="cb_toolbarIcon">#FFFFFFFF</item>
35+
36+
<!-- Tab -->
37+
<item name="cb_tabIndicator">#BDBDBD</item>
38+
<item name="cb_tabText">#616161</item>
39+
<item name="cb_tabTextSelected">#BDBDBD</item>
40+
41+
<!-- Card -->
42+
<item name="cb_cardBackground">#2C2C2C</item>
43+
<item name="cb_cardStroke">#11000000</item>
44+
45+
<!-- Ripple -->
46+
<item name="cb_rippleColor">#1BB96F</item>
47+
<item name="cb_rippleAccent">#1BB96F</item>
48+
49+
<!-- Attributes -->
50+
<item name="cb_mainBackground">#222222</item>
51+
<item name="cb_primaryText">#FFFFFF</item>
52+
<item name="cb_secondaryText">#ABABAB</item>
53+
54+
<item name="cb_dividerList">#2C2C2C</item>
55+
56+
<!-- Wallpaper Preview -->
57+
<item name="cb_wallpaperStatusBar">#66000000</item>
58+
<item name="cb_wallpaperToolbar">#66000000</item>
59+
</style>
60+
</resources>

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

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<style name="CandyBar.Theme.App.MaterialYou" parent="CandyBar.Theme.Base">
4+
<item name="cb_colorPrimary">@android:color/system_accent1_300</item>
5+
<item name="cb_colorPrimaryDark">?cb_colorPrimaryDark</item>
6+
<item name="cb_colorAccent">@android:color/system_accent1_600</item>
7+
8+
<!-- Navigation Bar -->
9+
<item name="cb_navigationBar">@android:color/system_accent1_10</item>
10+
11+
<!-- Splash Screen -->
12+
<item name="cb_splashColor">@android:color/system_accent1_10</item>
13+
14+
<!-- Navigation View -->
15+
<item name="cb_navigationViewHeaderBackground">#00000000</item>
16+
<item name="cb_navigationViewTitle">@android:color/system_accent1_900</item>
17+
<item name="cb_navigationViewTitleBack">#00000000</item>
18+
19+
<item name="cb_navigationViewText">@android:color/system_accent2_900</item>
20+
<item name="cb_navigationViewTextSelected">@android:color/system_accent2_900</item>
21+
<item name="cb_navigationViewSelectedBackground">@android:color/system_accent1_10</item>
22+
<item name="cb_navigationViewRippleColor">@android:color/system_accent1_100</item>
23+
24+
<!-- Swipe Refresh -->
25+
<item name="cb_swipeRefresh">@android:color/system_accent1_900</item>
26+
27+
<!-- Tap Intro -->
28+
<item name="cb_tapIntroTitle">?cb_mainBackground</item>
29+
<item name="cb_tapIntroDescription">?cb_mainBackground</item>
30+
<item name="cb_tapIntroCircleInner">?cb_primaryText</item>
31+
<item name="cb_tapIntroCircleOuter">?cb_secondaryText</item>
32+
33+
<!-- Toolbar -->
34+
<item name="cb_toolbarIcon">@android:color/system_accent2_900</item>
35+
36+
<!-- Tab -->
37+
<item name="cb_tabIndicator">@android:color/system_accent3_700</item>
38+
<item name="cb_tabText">@android:color/system_accent1_900</item>
39+
<item name="cb_tabTextSelected">@android:color/system_accent1_900</item>
40+
41+
<!-- Card -->
42+
<item name="cb_cardBackground">@android:color/system_accent1_100</item>
43+
<item name="cb_cardStroke">@android:color/system_accent2_50</item>
44+
45+
<!-- Ripple -->
46+
<item name="cb_rippleColor">@android:color/system_accent1_100</item>
47+
<item name="cb_rippleAccent">@android:color/system_accent1_100</item>
48+
49+
<!-- Attributes -->
50+
<item name="cb_mainBackground">@android:color/system_accent1_50</item>
51+
<item name="cb_primaryText">@android:color/system_accent2_900</item>
52+
<item name="cb_secondaryText">@android:color/system_accent2_900</item>
53+
54+
<item name="cb_dividerList">?cb_cardBackground</item>
55+
56+
<!-- Wallpaper Preview -->
57+
<item name="cb_wallpaperStatusBar">#66000000</item>
58+
<item name="cb_wallpaperToolbar">#66000000</item>
59+
</style>
60+
</resources>

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

Lines changed: 4 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33

4-
<!--
5-
Try to not reference other theme colors, or it may result in
6-
an error (android.view.InflateException)
7-
8-
If you want to reuse colors using referencing, just create a
9-
new color and reference it. Do not try to reference existing
10-
theme colors.
11-
Example -
12-
```
13-
Declaring the color
14-
<color name="common_color">#FFF</color>
15-
16-
Referencing the common color
17-
<color name="someColor">@color/common_color</color>
18-
<color name="anotherColor">@color/common_color</color>
19-
```
20-
-->
21-
22-
<color name="colorPrimary">#1A73E9</color>
23-
<color name="colorPrimaryDark">#1A73E9</color>
24-
<color name="colorAccent">#6E3AFF</color>
25-
26-
<color name="darkColorPrimary">#222222</color>
27-
<color name="darkColorPrimaryDark">#222222</color>
28-
<color name="darkColorAccent">#6E3AFF</color>
29-
30-
<!-- Shortcut Icon -->
31-
<color name="shortcutIconBackground">#1A73E9</color>
32-
<color name="shortcutIconForeground">#FFF</color>
33-
34-
<!-- Navigation Bar
35-
* Must be solid color, no alpha -->
36-
<color name="navigationBar">#1A73E9</color>
37-
<color name="navigationBarDark">#1A73E9</color>
38-
394
<!-- Splash Screen -->
40-
<color name="splashColor">#FFFFFF</color>
41-
42-
<!-- Navigation View -->
43-
<color name="navigationViewHeaderBackground">#00FFFFFF</color>
44-
<color name="navigationViewHeaderBackgroundDark">#00FFFFFF</color>
45-
<color name="navigationViewTitle">#FFFFFF</color>
46-
<color name="navigationViewTitleBack">#33000000</color>
47-
48-
<color name="navigationViewText">#484848</color>
49-
<color name="navigationViewTextDark">#FFFFFF</color>
50-
<color name="navigationViewTextSelected">#1A73E9</color>
51-
<color name="navigationViewTextSelectedDark">#1A73E9</color>
52-
<color name="navigationViewSelectedBackground">#2A1A73E9</color>
53-
<color name="navigationViewSelectedBackgroundDark">#2A1A73E9</color>
54-
55-
<!-- Swipe Refresh -->
56-
<color name="swipeRefresh">#6E3AFF</color>
57-
58-
<!-- Toolbar -->
59-
<color name="toolbarIcon">#FFF</color>
60-
<color name="toolbarIconDark">#FFFFFFFF</color>
61-
62-
<!-- Tab -->
63-
<color name="tabIndicator">#FFF</color>
64-
<color name="tabIndicatorDark">#6E3AFF</color>
65-
<color name="tabText">#32FFFFFF</color>
66-
<color name="tabTextDark">#32FFFFFF</color>
67-
<color name="tabTextSelected">#FFF</color>
68-
<color name="tabTextSelectedDark">#6E3AFF</color>
69-
70-
<!-- Card -->
71-
<color name="cardBackground">#FFFFFF</color>
72-
<color name="cardBackgroundDark">#2C2C2C</color>
73-
<color name="cardStroke">#11000000</color>
74-
<color name="cardStrokeDark">#11000000</color>
75-
76-
<!-- Ripple -->
77-
<color name="rippleColor">#1A73E9</color>
78-
<color name="rippleColorDark">#1A73E9</color>
79-
<color name="rippleAccent">#6E3AFF</color>
80-
<color name="rippleAccentDark">#6E3AFF</color>
81-
82-
<!-- Attributes -->
83-
<color name="mainBackground">#FFFFFF</color>
84-
<color name="mainBackgroundDark">#222222</color>
85-
<color name="primaryText">#484848</color>
86-
<color name="primaryTextDark">#FFFFFF</color>
87-
<color name="secondaryText">#777777</color>
88-
<color name="secondaryTextDark">#ABABAB</color>
89-
90-
<color name="dividerList">#FFFFFF</color>
91-
<color name="dividerListDark">#2C2C2C</color>
92-
93-
<!-- Wallpaper Preview -->
94-
<color name="wallpaperStatusBar">#66000000</color>
95-
<color name="wallpaperToolbar">#66000000</color>
5+
<color name="splashColor">#FFF</color>
6+
<!-- Shortcut Icons -->
7+
<color name="shortcutIconBackground">#26C484</color>
8+
<color name="shortcutIconForeground">#FFF</color>
969

9710
</resources>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
- dark
1616
-->
1717
<string name="default_theme">auto</string>
18-
18+
<!-- Whether the Material You theme should be applied by default in supported devices -->
19+
<bool name="material_you_by_default">true</bool>
1920

2021
<!--
2122
CONFIG: MUZEI

0 commit comments

Comments
 (0)