0.0.3-alpha (#4)

ShiftHackZ · web-flow · commit 3b4a2a80ff26 · 2023-12-20T19:10:41.000+02:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -12,7 +12,7 @@ android {
         minSdk = 21
         targetSdk = 34
         versionCode = 1
-        versionName = "0.0.2-alpha"
+        versionName = "0.0.3-alpha"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -51,6 +51,7 @@ android {
 
 dependencies {
     implementation(project(":compose"))
+    implementation(project(":splashscreen"))
 
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -10,18 +10,16 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Catppuccin"
+        android:theme="@style/Theme.Catppuccin.Splash"
         tools:targetApi="31">
         <activity
             android:name=".CatppuccinActivity"
-            android:exported="true"
-            android:theme="@style/Theme.Catppuccin">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
-
-</manifest>
+</manifest>
diff --git a/app/src/main/java/com/shifthackz/catppuccin/app/CatppuccinActivity.kt b/app/src/main/java/com/shifthackz/catppuccin/app/CatppuccinActivity.kt
@@ -31,6 +31,7 @@ class CatppuccinActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        actionBar?.hide()
         val viewModel: CatppuccinViewModel by viewModels()
         setContent {
             val uiState by viewModel.uiState.collectAsStateWithLifecycle()
diff --git a/app/src/main/java/com/shifthackz/catppuccin/app/ui/AccentColorSelector.kt b/app/src/main/java/com/shifthackz/catppuccin/app/ui/AccentColorSelector.kt
@@ -176,7 +176,7 @@ fun ColorComposable(
     Box(
         modifier = modifier
             .background(
-                color = if (selected) palette.Subtext1.copy(alpha = 0.7f) else Color.Transparent,
+                color = if (selected) color.copy(alpha = 0.4f) else Color.Transparent,
                 shape = CircleShape,
             )
             .clickable { onClick(color, token) }
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.Catppuccin.Splash" parent="Theme.Catppuccin.Mocha.SplashScreen">
+        <item name="windowSplashScreenAnimatedIcon">@drawable/catppuccin</item>
+        <item name="windowSplashScreenAnimationDuration">500</item>
+        <item name="postSplashScreenTheme">@style/Theme.Catppuccin</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="ic_launcher_background">#24273A</color>
-</resources>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
     <string name="app_name">Catppuccin</string>
-</resources>
+</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Theme.Catppuccin" parent="android:Theme.Material.Light.NoActionBar" />
+    <style name="Theme.Catppuccin" parent="android:Theme.Material.NoActionBar" />
+    
+    <style name="Theme.Catppuccin.Splash" parent="Theme.Catppuccin.Frappe.SplashScreen">
+        <item name="windowSplashScreenAnimatedIcon">@drawable/catppuccin</item>
+        <item name="windowSplashScreenAnimationDuration">500</item>
+        <item name="postSplashScreenTheme">@style/Theme.Catppuccin</item>
+    </style>
 </resources>
diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml
@@ -10,4 +10,4 @@
    <include domain="sharedpref" path="."/>
    <exclude domain="sharedpref" path="device.xml"/>
 -->
-</full-backup-content>
+</full-backup-content>
diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml
@@ -16,4 +16,4 @@
         <exclude .../>
     </device-transfer>
     -->
-</data-extraction-rules>
+</data-extraction-rules>
diff --git a/compose/src/main/java/com/shifthackz/catppuccin/compose/CatppuccinTheme.kt b/compose/src/main/java/com/shifthackz/catppuccin/compose/CatppuccinTheme.kt
@@ -109,7 +109,6 @@ object CatppuccinTheme {
         if (!view.isInEditMode) {
             SideEffect {
                 val window = (view.context as Activity).window
-//                val statusBarColor = colorScheme.background.toArgb()
                 val statusBarColor = colorScheme.surface.toArgb()
                 window.statusBarColor = statusBarColor
                 WindowCompat
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,16 +3,19 @@ activityCompose = "1.8.2"
 androidGradlePlugin = "8.2.0"
 kotlin = "1.9.10"
 androidxCoreKtx = "1.12.0"
+androidxCoreSplashscreen = "1.0.1"
 androidxFoundation = "1.5.4"
 androidxComposeBom = "2023.10.01"
 androidxComposeCompiler = "1.5.3"
 lifecycleRuntimeKtx = "2.6.2"
 lifecycleCompose = "2.6.2"
 material3 = "1.1.2"
 
+
 [libraries]
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCoreKtx" }
+androidx-core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "androidxCoreSplashscreen" }
 androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidxComposeBom" }
 androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "androidxFoundation" }
 androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -17,3 +17,4 @@ rootProject.name = "Catppuccin"
 include(":app")
 include(":compose")
 include(":palette")
+include(":splashscreen")
diff --git a/splashscreen/.gitignore b/splashscreen/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/splashscreen/build.gradle.kts b/splashscreen/build.gradle.kts
@@ -0,0 +1,17 @@
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.org.jetbrains.kotlin.android)
+}
+
+android {
+    namespace = "com.shifthackz.catppuccin.splashscreen"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 21
+    }
+}
+
+dependencies {
+    api(libs.androidx.core.splashscreen)
+}
diff --git a/splashscreen/src/main/AndroidManifest.xml b/splashscreen/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest />
diff --git a/splashscreen/src/main/res/values/colors.xml b/splashscreen/src/main/res/values/colors.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="catppuccin_splash_latte_background">#eff1f5</color>
+    <color name="catppuccin_splash_frappe_background">#303446</color>
+    <color name="catppuccin_splash_macchiato_background">#24273a</color>
+    <color name="catppuccin_splash_mocha_background">#1e1e2e</color>
+</resources>
diff --git a/splashscreen/src/main/res/values/themes.xml b/splashscreen/src/main/res/values/themes.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.Catppuccin.Latte.SplashScreen" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">@color/catppuccin_splash_latte_background</item>
+    </style>
+
+    <style name="Theme.Catppuccin.Frappe.SplashScreen" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">@color/catppuccin_splash_frappe_background</item>
+    </style>
+
+    <style name="Theme.Catppuccin.Macchiato.SplashScreen" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">@color/catppuccin_splash_macchiato_background</item>
+    </style>
+
+    <style name="Theme.Catppuccin.Mocha.SplashScreen" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">@color/catppuccin_splash_mocha_background</item>
+    </style>
+</resources>

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ fun ColorComposable(`
`176`	`176`	`Box(`
`177`	`177`	`modifier = modifier`
`178`	`178`	`.background(`
`179`		`- color = if (selected) palette.Subtext1.copy(alpha = 0.7f) else Color.Transparent,`
	`179`	`+ color = if (selected) color.copy(alpha = 0.4f) else Color.Transparent,`
`180`	`180`	`shape = CircleShape,`
`181`	`181`	`)`
`182`	`182`	`.clickable { onClick(color, token) }`