diff --git a/app/build.gradle b/app/build.gradle
index 9cfe98f..1359ef7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,7 +1,7 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion rootProject.ext.CompileSdk
+ compileSdk rootProject.ext.CompileSdk
defaultConfig {
applicationId 'com.candybar.sample'
@@ -47,7 +47,7 @@ dependencies {
* If you've missed some versions you've to also follow update guide for those versions
*/
- implementation 'com.github.Donnnno:candybar-foss:3.18.3'
+ implementation 'com.github.Donnnno:candybar-foss:3.19.0'
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e316ec1..083185a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,34 +19,22 @@
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:replace="android:icon"
tools:targetApi="n">
-
-
-
-
-
-
-
+
diff --git a/app/src/main/java/com/candybar/sample/activities/SplashActivity.java b/app/src/main/java/com/candybar/sample/activities/SplashActivity.java
deleted file mode 100644
index 6ca06e6..0000000
--- a/app/src/main/java/com/candybar/sample/activities/SplashActivity.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.candybar.sample.activities;
-
-import androidx.annotation.NonNull;
-
-import candybar.lib.activities.CandyBarSplashActivity;
-
-public class SplashActivity extends CandyBarSplashActivity {
- @NonNull
- @Override
- public Class> getMainActivity() {
- return MainActivity.class;
- }
-}
diff --git a/app/src/main/res/drawable-nodpi/ic_splash_screen.png b/app/src/main/res/drawable-nodpi/ic_splash_screen.png
index ed5b5ea..69bf374 100644
Binary files a/app/src/main/res/drawable-nodpi/ic_splash_screen.png and b/app/src/main/res/drawable-nodpi/ic_splash_screen.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_splash_screen.png b/app/src/main/res/drawable-xxxhdpi/ic_splash_screen.png
deleted file mode 100644
index ef76cae..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_splash_screen.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_splash_screen.png b/app/src/main/res/drawable/ic_splash_screen.png
deleted file mode 100644
index 463716e..0000000
Binary files a/app/src/main/res/drawable/ic_splash_screen.png and /dev/null differ
diff --git a/app/src/main/res/values-night-v31/themes.xml b/app/src/main/res/values-night-v31/themes.xml
new file mode 100644
index 0000000..ff32419
--- /dev/null
+++ b/app/src/main/res/values-night-v31/themes.xml
@@ -0,0 +1,60 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000..c428995
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,5 @@
+
+
+
+ #222222
+
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
new file mode 100644
index 0000000..47ee509
--- /dev/null
+++ b/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,60 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
new file mode 100644
index 0000000..ca05646
--- /dev/null
+++ b/app/src/main/res/values-v31/themes.xml
@@ -0,0 +1,60 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 37724d3..656eeba 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,97 +1,10 @@
-
-
- #1A73E9
- #1A73E9
- #6E3AFF
-
- #222222
- #222222
- #6E3AFF
-
-
- #1A73E9
- #FFF
-
-
- #1A73E9
- #1A73E9
-
- #FFFFFF
-
-
- #00FFFFFF
- #00FFFFFF
- #FFFFFF
- #33000000
-
- #484848
- #FFFFFF
- #1A73E9
- #1A73E9
- #2A1A73E9
- #2A1A73E9
-
-
- #6E3AFF
-
-
- #FFF
- #FFFFFFFF
-
-
- #FFF
- #6E3AFF
- #32FFFFFF
- #32FFFFFF
- #FFF
- #6E3AFF
-
-
- #FFFFFF
- #2C2C2C
- #11000000
- #11000000
-
-
- #1A73E9
- #1A73E9
- #6E3AFF
- #6E3AFF
-
-
- #FFFFFF
- #222222
- #484848
- #FFFFFF
- #777777
- #ABABAB
-
- #FFFFFF
- #2C2C2C
-
-
- #66000000
- #66000000
+ #FFF
+
+ #26C484
+ #FFF
diff --git a/app/src/main/res/values/dashboard_configurations.xml b/app/src/main/res/values/dashboard_configurations.xml
index dced7b0..e074df4 100644
--- a/app/src/main/res/values/dashboard_configurations.xml
+++ b/app/src/main/res/values/dashboard_configurations.xml
@@ -15,7 +15,8 @@
- dark
-->
auto
-
+
+ true
+ - #1A73E9
+
+
+ - #FFF
+
+
+ - #00000000
+ - #FFFFFF
+ - #33000000
+
+ - #484848
+ - #1BB96F
+ - #2A1BB96F
+ - #25000000
+
+
+ - #1BB96F
+
+
+ - ?cb_mainBackground
+ - ?cb_mainBackground
+ - ?cb_primaryText
+ - ?cb_secondaryText
+
+
+ - #FFFFFF
+
+
+ - #FFF
+ - #99FFFFFF
+ - #FFF
+
+
+ - #FFFFFF
+ - #11000000
+
+
+ - #1BB96F
+ - #1BB96F
+
+
+ - #FFFFFF
+ - #484848
+ - #777777
+
+ - #FFFFFF
+
+
+ - #66000000
+ - #66000000
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index b665f99..306cb97 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:8.0.2'
+ classpath 'com.android.tools.build:gradle:8.2.1'
}
}
@@ -19,8 +19,8 @@ allprojects {
rootProject.ext {
MinSdk = 21
- TargetSdk = 33
- CompileSdk = 33
+ TargetSdk = 34
+ CompileSdk = 34
}
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bd7d461..4303137 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
\ No newline at end of file