catalyst-core 0.0.3-canary.13 → 0.0.3-canary.14

package/changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.0.3-canary.14] - 2025-09-29
+
+-   Android custom splashscreen
+
 ## [0.0.3-canary.13] - 2025-09-28
 
 -   Multi file support in useFilePicker hook

package/dist/native/androidProject/app/build.gradle.kts

@@ -141,7 +141,6 @@ dependencies {
     androidTestImplementation(libs.androidx.espresso.core)
     implementation("androidx.webkit:webkit:1.12.1")
     implementation("org.json:json:20231013")
-    implementation("androidx.core:core-splashscreen:1.0.1")
     
     // Ktor Server dependencies for FrameworkServer (~200KB total)
     implementation("io.ktor:ktor-server-core:2.3.7")
@@ -258,6 +257,49 @@ tasks.register("generateWebViewConfig") {
 
         extractProperties(webviewConfig)
 
+        // Extract splash screen configuration with defaults
+        if (webviewConfig.has("splashScreen")) {
+            val splashConfig = webviewConfig.getJSONObject("splashScreen")
+            properties.setProperty("splashScreen.enabled", "true")
+            
+            // Duration in milliseconds
+            if (splashConfig.has("duration")) {
+                properties.setProperty("splashScreen.duration", splashConfig.get("duration").toString())
+            } else {
+                properties.setProperty("splashScreen.duration", "1000")
+            }
+            
+            // Background color
+            if (splashConfig.has("backgroundColor")) {
+                properties.setProperty("splashScreen.backgroundColor", splashConfig.getString("backgroundColor"))
+            } else {
+                properties.setProperty("splashScreen.backgroundColor", "#ffffff")
+            }
+            
+            // Image dimensions
+            if (splashConfig.has("imageWidth")) {
+                properties.setProperty("splashScreen.imageWidth", splashConfig.get("imageWidth").toString())
+            } else {
+                properties.setProperty("splashScreen.imageWidth", "120")
+            }
+            
+            if (splashConfig.has("imageHeight")) {
+                properties.setProperty("splashScreen.imageHeight", splashConfig.get("imageHeight").toString())
+            } else {
+                properties.setProperty("splashScreen.imageHeight", "120")
+            }
+            
+            // Corner radius
+            if (splashConfig.has("cornerRadius")) {
+                properties.setProperty("splashScreen.cornerRadius", splashConfig.get("cornerRadius").toString())
+            } else {
+                properties.setProperty("splashScreen.cornerRadius", "20")
+            }
+        } else {
+            // No splash screen configuration, disable it
+            properties.setProperty("splashScreen.enabled", "false")
+        }
+
         // Set production-specific properties for release builds
         if (gradle.startParameter.taskNames.any { it.contains("Release") || it.contains("release") }) {
             properties.setProperty("PRODUCTION_URL", "https://yourwebapp.com") // Replace with your domain

package/dist/native/androidProject/app/src/main/AndroidManifest.xml

@@ -24,8 +24,9 @@
         android:usesCleartextTraffic="${allowCleartextTraffic}"
         tools:targetApi="31">
         <activity
-            android:name="io.yourname.androidproject.MainActivity"
+            android:name="io.yourname.androidproject.SplashActivity"
             android:exported="true"
+            android:theme="@style/Theme.AndroidProject.Splash"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -33,6 +34,11 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name="io.yourname.androidproject.MainActivity"
+            android:exported="false"
+            android:screenOrientation="portrait">
+        </activity>
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="io.yourname.androidproject.fileprovider"

package/dist/native/androidProject/app/src/main/java/io/yourname/androidproject/MainActivity.kt

@@ -12,7 +12,6 @@ import io.yourname.androidproject.utils.KeyboardUtil
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.cancelChildren
-import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 
 class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
 
@@ -25,7 +24,6 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
     private lateinit var keyboardUtil: KeyboardUtil
     private var isHardwareAccelerationEnabled = false
     private var currentUrl: String = ""
-    private var splashStartTime: Long = 0
 
     private fun enableHardwareAcceleration() {
         if (!isHardwareAccelerationEnabled) {
@@ -51,7 +49,6 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        val splashScreen = installSplashScreen()
         super.onCreate(savedInstanceState)
         if (BuildConfig.DEBUG) {
             Log.d(TAG, "📱 onCreate started on thread: ${Thread.currentThread().name}")
@@ -73,10 +70,6 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
         // Initialize MetricsMonitor
         metricsMonitor = MetricsMonitor.getInstance(this)
 
-        // Configure splash screen
-        splashStartTime = System.currentTimeMillis()
-        configureSplashScreen(splashScreen)
-
         // Setup UI
         binding = ActivityMainBinding.inflate(layoutInflater)
         supportActionBar?.hide()
@@ -204,21 +197,4 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
         customWebView.destroy()
         super.onDestroy()
     }
-
-    private fun configureSplashScreen(splashScreen: androidx.core.splashscreen.SplashScreen) {
-        val durationProperty = properties.getProperty("splashScreen.duration")
-        
-        splashScreen.setKeepOnScreenCondition {
-            val webViewLoaded = ::customWebView.isInitialized && 
-                               customWebView.getWebView().progress >= 100
-            
-            if (durationProperty != null) {
-                val duration = durationProperty.toLong()
-                val timeElapsed = System.currentTimeMillis() - splashStartTime >= duration
-                !timeElapsed
-            } else {
-                !webViewLoaded
-            }
-        }
-    }
 }

package/dist/native/androidProject/app/src/main/java/io/yourname/androidproject/SplashActivity.kt

@@ -0,0 +1,97 @@
+package io.yourname.androidproject
+
+import android.content.Intent
+import android.graphics.Color
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.util.TypedValue
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory
+import androidx.core.graphics.drawable.toBitmap
+import io.yourname.androidproject.databinding.ActivitySplashBinding
+import java.util.Properties
+
+class SplashActivity : AppCompatActivity() {
+
+    private lateinit var binding: ActivitySplashBinding
+    private lateinit var properties: Properties
+    private var isFinishing = false
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        properties = Properties()
+        try {
+            assets.open("webview_config.properties").use { properties.load(it) }
+        } catch (e: Exception) {
+            startMainActivity()
+            return
+        }
+
+        if (!properties.getProperty("splashScreen.enabled", "false").toBoolean()) {
+            startMainActivity()
+            return
+        }
+
+        binding = ActivitySplashBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        
+        configureSplashScreen()
+        startSplashTimer()
+    }
+
+    private fun configureSplashScreen() {
+        val backgroundColor = properties.getProperty("splashScreen.backgroundColor", "#ffffff")
+        val imageWidth = properties.getProperty("splashScreen.imageWidth", "120").toIntOrNull() ?: 120
+        val imageHeight = properties.getProperty("splashScreen.imageHeight", "120").toIntOrNull() ?: 120
+        val cornerRadius = properties.getProperty("splashScreen.cornerRadius", "20").toFloatOrNull() ?: 20f
+
+        try {
+            binding.splashContainer.setBackgroundColor(Color.parseColor(backgroundColor))
+        } catch (e: Exception) {
+            binding.splashContainer.setBackgroundColor(Color.WHITE)
+        }
+
+        val widthPx = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, imageWidth.toFloat(), resources.displayMetrics).toInt()
+        val heightPx = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, imageHeight.toFloat(), resources.displayMetrics).toInt()
+
+        binding.splashImage.layoutParams.apply {
+            width = widthPx
+            height = heightPx
+        }
+
+        val drawable = ContextCompat.getDrawable(this, 
+            resources.getIdentifier("splashscreen", "drawable", packageName).takeIf { it != 0 } 
+                ?: R.mipmap.ic_launcher
+        ) ?: return
+
+        if (cornerRadius > 0) {
+            val radiusPx = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, cornerRadius, resources.displayMetrics)
+            val roundedDrawable = RoundedBitmapDrawableFactory.create(resources, drawable.toBitmap(widthPx, heightPx))
+            roundedDrawable.cornerRadius = radiusPx
+            binding.splashImage.setImageDrawable(roundedDrawable)
+        } else {
+            binding.splashImage.setImageDrawable(drawable)
+        }
+    }
+
+    private fun startSplashTimer() {
+        val duration = properties.getProperty("splashScreen.duration")?.toLongOrNull() ?: 1000
+        Handler(Looper.getMainLooper()).postDelayed({ dismissSplash() }, duration)
+    }
+
+    private fun dismissSplash() {
+        if (isFinishing) return
+        isFinishing = true
+        startActivity(Intent(this, MainActivity::class.java))
+        finish()
+        overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
+    }
+
+    private fun startMainActivity() {
+        startActivity(Intent(this, MainActivity::class.java))
+        finish()
+    }
+}

package/dist/native/androidProject/app/src/main/java/io/yourname/androidproject/utils/NotificationConstants.kt

@@ -0,0 +1,27 @@
+package io.yourname.androidproject.utils
+
+/**
+ * Constants for notification channels
+ */
+object NotificationConstants {
+    // Channel IDs
+    const val DEFAULT_CHANNEL_ID = "default"
+    const val URGENT_CHANNEL_ID = "urgent"
+
+    // Channel names
+    const val DEFAULT_CHANNEL_NAME = "Notifications"
+    const val URGENT_CHANNEL_NAME = "Urgent Notifications"
+
+    // Channel descriptions
+    const val DEFAULT_CHANNEL_DESCRIPTION = "General notifications"
+    const val URGENT_CHANNEL_DESCRIPTION = "Urgent notifications that require immediate attention"
+
+    // Default notification messages
+    const val DEFAULT_NOTIFICATION_TITLE = "Notification"
+    const val DEFAULT_NOTIFICATION_BODY = "You have a new message"
+
+    // Intent extras
+    const val EXTRA_IS_NOTIFICATION = "is_notification"
+    const val EXTRA_ACTION = "action"
+    const val EXTRA_NOTIFICATION_DATA = "notification_data"
+}