Update for v3.19.0

zixpo · Jan 20, 2024 · 6407744 · 6407744
1 parent 13ec941
commit 6407744
Show file tree

Hide file tree

Showing 15 changed files with 262 additions and 129 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,7 +13,7 @@ apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion rootProject.ext.CompileSdk
+    compileSdk rootProject.ext.CompileSdk
 
     namespace 'com.candybar.sample'
 
@@ -62,7 +62,7 @@ dependencies {
      * If you've missed some versions you've to also follow update guide for those versions
      */
 
-    implementation 'com.github.zixpo:candybar:3.18.4'
+    implementation 'com.github.zixpo:candybar:3.19.0'
 
     // TODO: Remove `//` below to enable OneSignal
     //implementation 'com.onesignal:OneSignal:[4.0.0, 4.99.99]'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -23,33 +23,21 @@
         android:networkSecurityConfig="@xml/network_config"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/CandyBar.Theme.App"
+        android:theme="@style/Theme.App.Starting"
         tools:targetApi="n">
 
         <activity
-            android:name=".activities.SplashActivity"
+            android:name=".activities.MainActivity"
             android:launchMode="singleTop"
-            android:noHistory="true"
-            android:screenOrientation="portrait"
-            android:theme="@style/CandyBar.Theme.Splash"
+            android:theme="@style/Theme.App.Starting"
+            android:configChanges="uiMode|orientation|keyboardHidden|screenSize"
             android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
             <meta-data
                 android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
-        </activity>
-
-        <activity
-            android:name=".activities.MainActivity"
-            android:launchMode="singleTop"
-            android:theme="@style/CandyBar.Theme.App"
-            android:configChanges="uiMode|orientation|keyboardHidden|screenSize"
-            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />

diff --git a/app/src/main/java/com/candybar/sample/activities/SplashActivity.java b/app/src/main/java/com/candybar/sample/activities/SplashActivity.java
diff --git a/app/src/main/res/drawable-nodpi/ic_splash_screen.png b/app/src/main/res/drawable-nodpi/ic_splash_screen.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_splash_screen.png b/app/src/main/res/drawable-xxxhdpi/ic_splash_screen.png
diff --git a/app/src/main/res/drawable/ic_splash_screen.png b/app/src/main/res/drawable/ic_splash_screen.png
diff --git a/app/src/main/res/values-night-v31/themes.xml b/app/src/main/res/values-night-v31/themes.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="CandyBar.Theme.App.MaterialYou" parent="CandyBar.Theme.Base">
+        <item name="cb_colorPrimary">@android:color/system_neutral1_900</item>
+        <item name="cb_colorPrimaryDark">?cb_colorPrimary</item>
+        <item name="cb_colorAccent">@android:color/system_accent1_300</item>
+
+        <!-- Navigation Bar -->
+        <item name="cb_navigationBar">@android:color/system_neutral1_900</item>
+
+        <!-- Splash Screen -->
+        <item name="cb_splashColor">@android:color/system_neutral1_900</item>
+
+        <!-- Navigation View -->
+        <item name="cb_navigationViewHeaderBackground">#00000000</item>
+        <item name="cb_navigationViewTitle">@android:color/system_accent1_100</item>
+        <item name="cb_navigationViewTitleBack">#33000000</item>
+
+        <item name="cb_navigationViewText">@android:color/system_accent2_100</item>
+        <item name="cb_navigationViewTextSelected">@android:color/system_accent2_0</item>
+        <item name="cb_navigationViewSelectedBackground">@android:color/system_accent1_500</item>
+        <item name="cb_navigationViewRippleColor">@android:color/system_accent1_100</item>
+
+        <!-- Swipe Refresh -->
+        <item name="cb_swipeRefresh">@android:color/system_accent1_100</item>
+
+        <!-- Tap Intro -->
+        <item name="cb_tapIntroTitle">?cb_mainBackground</item>
+        <item name="cb_tapIntroDescription">?cb_mainBackground</item>
+        <item name="cb_tapIntroCircleInner">?cb_primaryText</item>
+        <item name="cb_tapIntroCircleOuter">?cb_secondaryText</item>
+
+        <!-- Toolbar -->
+        <item name="cb_toolbarIcon">@android:color/system_accent1_100</item>
+
+        <!-- Tab -->
+        <item name="cb_tabIndicator">@android:color/system_neutral1_300</item>
+        <item name="cb_tabText">@android:color/system_neutral1_100</item>
+        <item name="cb_tabTextSelected">@android:color/system_neutral1_100</item>
+
+        <!-- Card -->
+        <item name="cb_cardBackground">@android:color/system_neutral1_900</item>
+        <item name="cb_cardStroke">@android:color/system_neutral1_800</item>
+
+        <!-- Ripple -->
+        <item name="cb_rippleColor">@android:color/system_accent1_700</item>
+        <item name="cb_rippleAccent">@android:color/system_accent1_700</item>
+
+        <!-- Attributes -->
+        <item name="cb_mainBackground">@android:color/system_neutral1_900</item>
+        <item name="cb_primaryText">@android:color/system_accent2_50</item>
+        <item name="cb_secondaryText">@android:color/system_accent2_100</item>
+
+        <item name="cb_dividerList">?cb_cardBackground</item>
+
+        <!-- Wallpaper Preview -->
+        <item name="cb_wallpaperStatusBar">#66000000</item>
+        <item name="cb_wallpaperToolbar">#66000000</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Splash Screen -->
+    <color name="splashColor">#222222</color>
+</resources>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="CandyBar.Theme.App.DayNight" parent="CandyBar.Theme.Base">
+        <item name="cb_colorPrimary">#222222</item>
+        <item name="cb_colorPrimaryDark">#222222</item>
+        <item name="cb_colorAccent">#1BB96F</item>
+
+        <!-- Navigation Bar -->
+        <item name="cb_navigationBar">#222222</item>
+
+        <!-- Splash Screen -->
+        <item name="cb_splashColor">#222222</item>
+
+        <!-- Navigation View -->
+        <item name="cb_navigationViewHeaderBackground">#00000000</item>
+        <item name="cb_navigationViewTitle">#FFFFFF</item>
+        <item name="cb_navigationViewTitleBack">#33000000</item>
+
+        <item name="cb_navigationViewText">#FFFFFF</item>
+        <item name="cb_navigationViewTextSelected">#1BB96F</item>
+        <item name="cb_navigationViewSelectedBackground">#2A1BB96F</item>
+        <item name="cb_navigationViewRippleColor">#25000000</item>
+
+        <!-- Swipe Refresh -->
+        <item name="cb_swipeRefresh">#1BB96F</item>
+
+        <!-- Tap Intro -->
+        <item name="cb_tapIntroTitle">?cb_mainBackground</item>
+        <item name="cb_tapIntroDescription">?cb_mainBackground</item>
+        <item name="cb_tapIntroCircleInner">?cb_primaryText</item>
+        <item name="cb_tapIntroCircleOuter">?cb_secondaryText</item>
+
+        <!-- Toolbar -->
+        <item name="cb_toolbarIcon">#FFFFFFFF</item>
+
+        <!-- Tab -->
+        <item name="cb_tabIndicator">#BDBDBD</item>
+        <item name="cb_tabText">#616161</item>
+        <item name="cb_tabTextSelected">#BDBDBD</item>
+
+        <!-- Card -->
+        <item name="cb_cardBackground">#2C2C2C</item>
+        <item name="cb_cardStroke">#11000000</item>
+
+        <!-- Ripple -->
+        <item name="cb_rippleColor">#1BB96F</item>
+        <item name="cb_rippleAccent">#1BB96F</item>
+
+        <!-- Attributes -->
+        <item name="cb_mainBackground">#222222</item>
+        <item name="cb_primaryText">#FFFFFF</item>
+        <item name="cb_secondaryText">#ABABAB</item>
+
+        <item name="cb_dividerList">#2C2C2C</item>
+
+        <!-- Wallpaper Preview -->
+        <item name="cb_wallpaperStatusBar">#66000000</item>
+        <item name="cb_wallpaperToolbar">#66000000</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="CandyBar.Theme.App.MaterialYou" parent="CandyBar.Theme.Base">
+        <item name="cb_colorPrimary">@android:color/system_accent1_300</item>
+        <item name="cb_colorPrimaryDark">?cb_colorPrimaryDark</item>
+        <item name="cb_colorAccent">@android:color/system_accent1_600</item>
+
+        <!-- Navigation Bar -->
+        <item name="cb_navigationBar">@android:color/system_accent1_10</item>
+
+        <!-- Splash Screen -->
+        <item name="cb_splashColor">@android:color/system_accent1_10</item>
+
+        <!-- Navigation View -->
+        <item name="cb_navigationViewHeaderBackground">#00000000</item>
+        <item name="cb_navigationViewTitle">@android:color/system_accent1_900</item>
+        <item name="cb_navigationViewTitleBack">#00000000</item>
+
+        <item name="cb_navigationViewText">@android:color/system_accent2_900</item>
+        <item name="cb_navigationViewTextSelected">@android:color/system_accent2_900</item>
+        <item name="cb_navigationViewSelectedBackground">@android:color/system_accent1_10</item>
+        <item name="cb_navigationViewRippleColor">@android:color/system_accent1_100</item>
+
+        <!-- Swipe Refresh -->
+        <item name="cb_swipeRefresh">@android:color/system_accent1_900</item>
+
+        <!-- Tap Intro -->
+        <item name="cb_tapIntroTitle">?cb_mainBackground</item>
+        <item name="cb_tapIntroDescription">?cb_mainBackground</item>
+        <item name="cb_tapIntroCircleInner">?cb_primaryText</item>
+        <item name="cb_tapIntroCircleOuter">?cb_secondaryText</item>
+
+        <!-- Toolbar -->
+        <item name="cb_toolbarIcon">@android:color/system_accent2_900</item>
+
+        <!-- Tab -->
+        <item name="cb_tabIndicator">@android:color/system_accent3_700</item>
+        <item name="cb_tabText">@android:color/system_accent1_900</item>
+        <item name="cb_tabTextSelected">@android:color/system_accent1_900</item>
+
+        <!-- Card -->
+        <item name="cb_cardBackground">@android:color/system_accent1_100</item>
+        <item name="cb_cardStroke">@android:color/system_accent2_50</item>
+
+        <!-- Ripple -->
+        <item name="cb_rippleColor">@android:color/system_accent1_100</item>
+        <item name="cb_rippleAccent">@android:color/system_accent1_100</item>
+
+        <!-- Attributes -->
+        <item name="cb_mainBackground">@android:color/system_accent1_50</item>
+        <item name="cb_primaryText">@android:color/system_accent2_900</item>
+        <item name="cb_secondaryText">@android:color/system_accent2_900</item>
+
+        <item name="cb_dividerList">?cb_cardBackground</item>
+
+        <!-- Wallpaper Preview -->
+        <item name="cb_wallpaperStatusBar">#66000000</item>
+        <item name="cb_wallpaperToolbar">#66000000</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -1,97 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <!--
-        Try to not reference other theme colors, or it may result in
-        an error (android.view.InflateException)
-
-        If you want to reuse colors using referencing, just create a
-        new color and reference it. Do not try to reference existing
-        theme colors.
-        Example -
-        ```
-        Declaring the color
-        <color name="common_color">#FFF</color>
-
-        Referencing the common color
-        <color name="someColor">@color/common_color</color>
-        <color name="anotherColor">@color/common_color</color>
-        ```
-    -->
-
-    <color name="colorPrimary">#1A73E9</color>
-    <color name="colorPrimaryDark">#1A73E9</color>
-    <color name="colorAccent">#6E3AFF</color>
-
-    <color name="darkColorPrimary">#222222</color>
-    <color name="darkColorPrimaryDark">#222222</color>
-    <color name="darkColorAccent">#6E3AFF</color>
-
-    <!-- Shortcut Icon -->
-    <color name="shortcutIconBackground">#1A73E9</color>
-    <color name="shortcutIconForeground">#FFF</color>
-
-    <!-- Navigation Bar
-    * Must be solid color, no alpha -->
-    <color name="navigationBar">#1A73E9</color>
-    <color name="navigationBarDark">#1A73E9</color>
-
     <!-- Splash Screen -->
-    <color name="splashColor">#FFFFFF</color>
-
-    <!-- Navigation View -->
-    <color name="navigationViewHeaderBackground">#00FFFFFF</color>
-    <color name="navigationViewHeaderBackgroundDark">#00FFFFFF</color>
-    <color name="navigationViewTitle">#FFFFFF</color>
-    <color name="navigationViewTitleBack">#33000000</color>
-
-    <color name="navigationViewText">#484848</color>
-    <color name="navigationViewTextDark">#FFFFFF</color>
-    <color name="navigationViewTextSelected">#1A73E9</color>
-    <color name="navigationViewTextSelectedDark">#1A73E9</color>
-    <color name="navigationViewSelectedBackground">#2A1A73E9</color>
-    <color name="navigationViewSelectedBackgroundDark">#2A1A73E9</color>
-
-    <!-- Swipe Refresh -->
-    <color name="swipeRefresh">#6E3AFF</color>
-
-    <!-- Toolbar -->
-    <color name="toolbarIcon">#FFF</color>
-    <color name="toolbarIconDark">#FFFFFFFF</color>
-
-    <!-- Tab -->
-    <color name="tabIndicator">#FFF</color>
-    <color name="tabIndicatorDark">#6E3AFF</color>
-    <color name="tabText">#32FFFFFF</color>
-    <color name="tabTextDark">#32FFFFFF</color>
-    <color name="tabTextSelected">#FFF</color>
-    <color name="tabTextSelectedDark">#6E3AFF</color>
-
-    <!-- Card -->
-    <color name="cardBackground">#FFFFFF</color>
-    <color name="cardBackgroundDark">#2C2C2C</color>
-    <color name="cardStroke">#11000000</color>
-    <color name="cardStrokeDark">#11000000</color>
-
-    <!-- Ripple -->
-    <color name="rippleColor">#1A73E9</color>
-    <color name="rippleColorDark">#1A73E9</color>
-    <color name="rippleAccent">#6E3AFF</color>
-    <color name="rippleAccentDark">#6E3AFF</color>
-
-    <!-- Attributes -->
-    <color name="mainBackground">#FFFFFF</color>
-    <color name="mainBackgroundDark">#222222</color>
-    <color name="primaryText">#484848</color>
-    <color name="primaryTextDark">#FFFFFF</color>
-    <color name="secondaryText">#777777</color>
-    <color name="secondaryTextDark">#ABABAB</color>
-
-    <color name="dividerList">#FFFFFF</color>
-    <color name="dividerListDark">#2C2C2C</color>
-
-    <!-- Wallpaper Preview -->
-    <color name="wallpaperStatusBar">#66000000</color>
-    <color name="wallpaperToolbar">#66000000</color>
-
+    <color name="splashColor">#FFF</color>
+    <!-- Shortcut Icons -->
+    <color name="shortcutIconBackground">#26C484</color>
+    <color name="shortcutIconForeground">#FFF</color>
 </resources>
diff --git a/app/src/main/res/values/dashboard_configurations.xml b/app/src/main/res/values/dashboard_configurations.xml
@@ -15,6 +15,8 @@
         - dark
     -->
     <string name="default_theme">auto</string>
+    <!-- Whether the Material You theme should be applied by default in supported devices -->
+    <bool name="material_you_by_default">true</bool>
 
 
     <!--
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,8 @@ @@
             - dark
         -->
         <string name="default_theme">auto</string>
+        <!-- Whether the Material You theme should be applied by default in supported devices -->
+        <bool name="material_you_by_default">true</bool>
         <!--
@@ Expand Down @@