catalyst-core 0.1.0-canary.2 → 0.1.0-canary.4

package/changelog.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [0.1.0-canary.4] - 2026-02-12
+
+- Added Google Sign-In support for both Android and iOS in Catalyst, enabling a unified native authentication experience for apps built on the framework.
+- Improved release/build reliability with related bridge and CI updates, making integration smoother and more consistent across platforms.
+
+## [0.1.0-canary.3] - 2026-02-04
+
+- Android device security: added root, emulator, and Frida detection with launch-time checks and a Material Design 3 bottom sheet threat alert UI
+
 ## [0.1.0-canary.2] - 2026-01-28
 
 - Adds mono-repository support for catalyst

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

@@ -114,12 +114,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 
     buildFeatures {
@@ -136,6 +136,10 @@ android {
             excludes.add("META-INF/INDEX.LIST")
             excludes.add("META-INF/io.netty.versions.properties")
         }
+        jniLibs {
+            // Enable 16KB page size alignment for all native libraries
+            useLegacyPackaging = false
+        }
     }
 
     // Configure lint options
@@ -167,14 +171,20 @@ dependencies {
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
     implementation(libs.androidx.webkit)
+    implementation(libs.androidx.credentials)
+    implementation(libs.androidx.credentials.play.services.auth)
+    implementation(libs.googleid)
     implementation("org.json:json:20231013")
-    
     // Ktor Server dependencies for FrameworkServer (~200KB total)
     implementation("io.ktor:ktor-server-core:3.0.3")
     implementation("io.ktor:ktor-server-netty:3.0.3")
     implementation("io.ktor:ktor-server-content-negotiation:3.0.3")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
 
+    // Security detection dependencies
+    implementation("com.scottyab:rootbeer-lib:0.1.1")  // Root detection
+    implementation("com.google.android.play:integrity:1.3.0")  // Play Integrity API
+
     // SLF4J simple logger for Ktor (optional, can be excluded if needed)
     implementation("org.slf4j:slf4j-simple:2.0.9")
 

package/dist/native/androidProject/app/proguard-rules.pro

@@ -59,6 +59,31 @@
 -keep class io.yourname.androidproject.WebCacheManager$CacheEntry { *; }
 -keep class io.yourname.androidproject.WebCacheManager$CacheMetadata { *; }
 
+# Keep RootBeer library for root detection
+-keep class com.scottyab.rootbeer.** { *; }
+-dontwarn com.scottyab.rootbeer.**
+
+# Security: keep only the public API surface that MainActivity wires up.
+# Detection internals (EmulatorDetector, FridaDetector) and UI classes
+# (SecurityBottomSheet, SecurityAlertUI) are intentionally obfuscated.
+-keep class io.yourname.androidproject.security.SecurityCheckScheduler {
+    public static void initialize(android.content.Context, kotlinx.coroutines.CoroutineScope, io.yourname.androidproject.security.SecurityCheckScheduler$SecurityCheckCallback);
+}
+-keep interface io.yourname.androidproject.security.SecurityCheckScheduler$SecurityCheckCallback {
+    public void onSecurityCheckComplete(org.json.JSONObject);
+}
+-keep class io.yourname.androidproject.security.SecurityCheckManager {
+    public static org.json.JSONObject getLatestSecurityResults(android.content.Context);
+    public static java.lang.String getSecurityMode(android.content.Context);
+}
+-keep class io.yourname.androidproject.security.SecurityAlertHandler {
+    public static void handleSecurityCheckResults(android.app.Activity, org.json.JSONObject);
+}
+
+# Keep Play Integrity API
+-keep class com.google.android.play.core.integrity.** { *; }
+-dontwarn com.google.android.play.core.integrity.**
+
 # Remove debug logging in release builds
 -assumenosideeffects class android.util.Log {
     public static *** d(...);

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

@@ -20,6 +20,7 @@ import io.yourname.androidproject.utils.NetworkUtils
 import io.yourname.androidproject.utils.NotificationConstants
 import io.yourname.androidproject.utils.SafeAreaInsets
 import io.yourname.androidproject.utils.SafeAreaUtils
+import io.yourname.androidproject.security.SecurityCheckScheduler
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.cancelChildren
@@ -253,6 +254,15 @@ class MainActivity : AppCompatActivity(), CoroutineScope by MainScope() {
 
         configureEdgeToEdge()
 
+        // Initialize security checks (release builds only)
+        if (!BuildConfig.DEBUG) {
+            SecurityCheckScheduler.initialize(this, this, object : SecurityCheckScheduler.SecurityCheckCallback {
+                override fun onSecurityCheckComplete(results: JSONObject) {
+                    io.yourname.androidproject.security.SecurityAlertHandler.handleSecurityCheckResults(this@MainActivity, results)
+                }
+            })
+        }
+
         // Initialize MetricsMonitor
         metricsMonitor = MetricsMonitor.getInstance(this)
 

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

@@ -10,12 +10,19 @@ import android.webkit.WebView
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.app.NotificationCompat
+import androidx.credentials.CredentialManager
+import androidx.credentials.GetCredentialRequest
+import androidx.credentials.exceptions.GetCredentialCancellationException
+import androidx.credentials.exceptions.GetCredentialException
+import com.google.android.libraries.identity.googleid.GetSignInWithGoogleOption
+import com.google.android.libraries.identity.googleid.GoogleIdTokenCredential
 import io.yourname.androidproject.MainActivity
 import io.yourname.androidproject.utils.*
 import kotlinx.coroutines.*
 import org.json.JSONArray
 import org.json.JSONObject
 import java.util.Properties
+import java.util.concurrent.atomic.AtomicBoolean
 
 private data class FilePickerOptions(
     val mimeType: String = "*/*",
@@ -86,6 +93,38 @@ private fun JSONObject.optIntNullable(key: String): Int? =
 private fun JSONObject.optLongNullable(key: String): Long? =
     if (has(key) && !isNull(key)) getLong(key) else null
 
+private data class GoogleSignInOptions(
+    val clientId: String,
+    val nonce: String? = null,
+    val autoSelect: Boolean = false,
+    val filterByAuthorizedAccounts: Boolean = false
+) {
+    companion object {
+        fun fromRaw(raw: String?): GoogleSignInOptions {
+            if (raw.isNullOrBlank()) {
+                // Allow fallback to config-supplied clientId
+                return GoogleSignInOptions(clientId = "")
+            }
+
+            return try {
+                val json = JSONObject(raw)
+                val resolvedClientId = json.optString("clientId")
+                    .ifBlank { json.optString("webClientId") }
+
+                GoogleSignInOptions(
+                    clientId = resolvedClientId,
+                    nonce = json.optString("nonce").takeIf { it.isNotBlank() },
+                    autoSelect = json.optBoolean("autoSelect", false),
+                    filterByAuthorizedAccounts = json.optBoolean("filterByAuthorizedAccounts", false)
+                )
+            } catch (e: Exception) {
+                BridgeUtils.logDebug("NativeBridge", "Failed to parse options JSON: ${e.message}")
+                GoogleSignInOptions(clientId = raw.trim())
+            }
+        }
+    }
+}
+
 class NativeBridge(
     private val mainActivity: MainActivity,
     private val webView: WebView,
@@ -104,6 +143,12 @@ class NativeBridge(
     private lateinit var permissionLauncher: ActivityResultLauncher<String>
     private lateinit var filePickerLauncher: ActivityResultLauncher<Intent>
     private var currentFilePickerOptions: FilePickerOptions = FilePickerOptions()
+    private val isGoogleSignInInProgress = AtomicBoolean(false)
+    private val credentialManager: CredentialManager by lazy { CredentialManager.create(mainActivity) }
+    private val isGoogleSignInEnabled: Boolean by lazy {
+        properties.getProperty("googleSignIn.enabled", "false").toBoolean()
+    }
+    
     private var networkMonitor: NetworkMonitor? = null
 
     // Unified notification manager
@@ -111,6 +156,7 @@ class NativeBridge(
 
     companion object {
         private const val TAG = "NativeBridge"
+        private const val GOOGLE_SIGN_IN_SAFE_EXECUTE_ACTION = "start Google Sign-In"
 
         /**
          * Parse and validate bridge message
@@ -237,6 +283,55 @@ class NativeBridge(
         }
     }
 
+    @JavascriptInterface
+    fun googleSignIn(optionsRaw: String?) {
+        BridgeUtils.safeExecute(
+            webView,
+            BridgeUtils.WebEvents.ON_GOOGLE_SIGN_IN_ERROR,
+            GOOGLE_SIGN_IN_SAFE_EXECUTE_ACTION
+        ) {
+            if (!isGoogleSignInEnabled) {
+                BridgeUtils.notifyWebError(
+                    webView,
+                    BridgeUtils.WebEvents.ON_GOOGLE_SIGN_IN_ERROR,
+                    "Google Sign-In is disabled in config"
+                )
+                return@safeExecute
+            }
+
+            val options = GoogleSignInOptions.fromRaw(optionsRaw)
+
+            val resolvedClientId = when {
+                options.clientId.isNotBlank() -> options.clientId
+                !properties.getProperty("googleSignIn.clientId", "").isNullOrBlank() ->
+                    properties.getProperty("googleSignIn.clientId", "")
+                else -> ""
+            }
+
+            if (resolvedClientId.isBlank()) {
+                BridgeUtils.notifyWebError(
+                    webView,
+                    BridgeUtils.WebEvents.ON_GOOGLE_SIGN_IN_ERROR,
+                    "clientId is required for Google Sign-In"
+                )
+                return@safeExecute
+            }
+
+            if (!isGoogleSignInInProgress.compareAndSet(false, true)) {
+                BridgeUtils.notifyWebError(
+                    webView,
+                    BridgeUtils.WebEvents.ON_GOOGLE_SIGN_IN_ERROR,
+                    "A Google Sign-In request is already in progress"
+                )
+                return@safeExecute
+            }
+
+            BridgeUtils.logDebug(TAG, "Google Sign-In using clientId prefix: ${resolvedClientId.take(12)}...")
+
+            launchGoogleSignIn(options.copy(clientId = resolvedClientId))
+        }
+    }
+
     @JavascriptInterface
     fun openFileWithIntent(params: String?) {
         BridgeUtils.safeExecute(webView, BridgeUtils.WebEvents.ON_INTENT_ERROR, "open file with intent") {
@@ -626,6 +721,115 @@ class NativeBridge(
             }
         }
     }
+
+    private fun launchGoogleSignIn(options: GoogleSignInOptions) {
+        launch {
+            try {
+                val googleOptionBuilder = GetSignInWithGoogleOption.Builder(options.clientId)
+                options.nonce?.let { googleOptionBuilder.setNonce(it) }
+                val googleOption = googleOptionBuilder.build()
+
+                val request = GetCredentialRequest.Builder()
+                    .addCredentialOption(googleOption)
+                    .build()
+
+                BridgeUtils.logDebug(
+                    TAG,
+                    "Starting Google Sign-In via CredentialManager (hasNonce=${options.nonce != null})"
+                )
+
+                val response = credentialManager.getCredential(mainActivity, request)
+                handleCredentialResponse(response)
+            } catch (e: GetCredentialCancellationException) {
+                isGoogleSignInInProgress.set(false)
+                BridgeUtils.logDebug(
+                    TAG,
+                    "Google Sign-In cancelled: ${e.message} :: ${e.javaClass.simpleName}"
+                )
+                BridgeUtils.notifyWeb(
+                    webView,
+                    BridgeUtils.WebEvents.ON_GOOGLE_SIGN_IN_CANCELLED,
+                    "User cancelled Google sign-in"
+                )
+            } catch (e: GetCredentialException) {
+                isGoogleSignInInProgress.set(false)
+                val message = e.errorMessage?.toString() ?: e.message ?: "Credential request failed"
+                BridgeUtils.logError(
+                    TAG,
+                    "Google Sign-In credential error: $message :: ${e.javaClass.simpleName}",
+                    e
+                )
+                BridgeUtils.notifyWebError(
+                    webView,
+                    BridgeUtils.WebEvents.ON_GOOGLE_SIGN_IN_ERROR,
+                    message
+                )
+            } catch (e: Exception) {
+                isGoogleSignInInProgress.set(false)
+                BridgeUtils.logError(
+                    TAG,
+                    "Google Sign-In unexpected error: ${e.message} :: ${e.javaClass.simpleName}",
+                    e
+                )
+                BridgeUtils.notifyWebError(
+                    webView,
+                    BridgeUtils.WebEvents.ON_GOOGLE_SIGN_IN_ERROR,
+                    "Error preparing Google sign-in: ${e.message}"
+                )
+            }
+        }
+    }
+
+    private fun handleCredentialResponse(response: androidx.credentials.GetCredentialResponse) {
+        try {
+            val credential = response.credential
+            if (credential.type != GoogleIdTokenCredential.TYPE_GOOGLE_ID_TOKEN_CREDENTIAL) {
+                BridgeUtils.logError(TAG, "Unexpected credential type: ${credential.type}")
+                isGoogleSignInInProgress.set(false)
+                BridgeUtils.notifyWebError(
+                    webView,
+                    BridgeUtils.WebEvents.ON_GOOGLE_SIGN_IN_ERROR,
+                    "Unsupported credential type returned"
+                )
+                return
+            }
+
+            val googleCredential = GoogleIdTokenCredential.createFrom(credential.data)
+            val idToken = googleCredential.idToken
+
+            if (idToken.isNullOrBlank()) {
+                isGoogleSignInInProgress.set(false)
+                BridgeUtils.notifyWebError(
+                    webView,
+                    BridgeUtils.WebEvents.ON_GOOGLE_SIGN_IN_ERROR,
+                    "No ID token returned from Google sign-in"
+                )
+                return
+            }
+
+            val payload = JSONObject().apply {
+                put("idToken", idToken)
+                googleCredential.id?.let { put("email", it) }
+                googleCredential.displayName?.let { put("name", it) }
+                googleCredential.profilePictureUri?.toString()?.let { put("photoUrl", it) }
+                put("provider", "google")
+            }
+
+            isGoogleSignInInProgress.set(false)
+            BridgeUtils.notifyWebJson(
+                webView,
+                BridgeUtils.WebEvents.ON_GOOGLE_SIGN_IN_SUCCESS,
+                payload
+            )
+        } catch (e: Exception) {
+            isGoogleSignInInProgress.set(false)
+            BridgeUtils.notifyWebError(
+                webView,
+                BridgeUtils.WebEvents.ON_GOOGLE_SIGN_IN_ERROR,
+                "Error handling Google credential: ${e.message}"
+            )
+        }
+    }
     
     private fun processSelectedFiles(uris: List<Uri>, options: FilePickerOptions) {
         launch {

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

@@ -0,0 +1,307 @@
+package io.yourname.androidproject.design
+
+import android.content.Context
+import android.content.res.Configuration
+import androidx.annotation.ColorInt
+
+/**
+ * Global design tokens for the application.
+ * Follows Material Design 3 principles with support for light/dark themes.
+ *
+ * All spacing follows 8dp grid system.
+ * Color system supports dynamic theming based on system configuration.
+ */
+object DesignTokens {
+
+    // ============================================================
+    // COLORS - Light Theme
+    // ============================================================
+    object LightColors {
+        // Surface colors
+        @ColorInt const val SURFACE = 0xFFFFFFFF.toInt()           // Pure white
+        @ColorInt const val SURFACE_VARIANT = 0xFFF5F5F5.toInt()   // Light gray background
+
+        // Error colors (for alerts, warnings)
+        @ColorInt const val ERROR = 0xFFB3261E.toInt()             // Material error red
+        @ColorInt const val ERROR_CONTAINER = 0xFFF9DEDC.toInt()   // Light red background
+        @ColorInt const val ON_ERROR = 0xFFFFFFFF.toInt()          // White text on error
+        @ColorInt const val ON_ERROR_CONTAINER = 0xFF410E0B.toInt() // Dark red text
+
+        // Text colors
+        @ColorInt const val ON_SURFACE = 0xFF1C1B1F.toInt()        // Primary text (near black)
+        @ColorInt const val ON_SURFACE_VARIANT = 0xFF49454F.toInt() // Secondary text (gray)
+        @ColorInt const val OUTLINE = 0xFF79747E.toInt()           // Dividers, borders
+
+        // Accent colors
+        @ColorInt const val PRIMARY = 0xFF6750A4.toInt()           // Material purple
+        @ColorInt const val ON_PRIMARY = 0xFFFFFFFF.toInt()        // White text on primary
+        @ColorInt const val PRIMARY_CONTAINER = 0xFFEADDFF.toInt() // Light purple background
+        @ColorInt const val ON_PRIMARY_CONTAINER = 0xFF21005D.toInt() // Dark purple text
+
+        // Secondary colors
+        @ColorInt const val SECONDARY = 0xFF625B71.toInt()         // Material gray-purple
+        @ColorInt const val ON_SECONDARY = 0xFFFFFFFF.toInt()      // White text on secondary
+        @ColorInt const val SECONDARY_CONTAINER = 0xFFE8DEF8.toInt() // Light secondary background
+        @ColorInt const val ON_SECONDARY_CONTAINER = 0xFF1D192B.toInt() // Dark text
+    }
+
+    // ============================================================
+    // COLORS - Dark Theme
+    // ============================================================
+    object DarkColors {
+        // Surface colors
+        @ColorInt const val SURFACE = 0xFF1C1B1F.toInt()           // Dark surface
+        @ColorInt const val SURFACE_VARIANT = 0xFF2B2930.toInt()   // Darker variant
+
+        // Error colors (for alerts, warnings)
+        @ColorInt const val ERROR = 0xFFF2B8B5.toInt()             // Light red for dark mode
+        @ColorInt const val ERROR_CONTAINER = 0xFF8C1D18.toInt()   // Dark red background
+        @ColorInt const val ON_ERROR = 0xFF601410.toInt()          // Dark text on light error
+        @ColorInt const val ON_ERROR_CONTAINER = 0xFFF2B8B5.toInt() // Light text on dark error
+
+        // Text colors
+        @ColorInt const val ON_SURFACE = 0xFFE6E1E5.toInt()        // Light text
+        @ColorInt const val ON_SURFACE_VARIANT = 0xFFCAC4D0.toInt() // Secondary light text
+        @ColorInt const val OUTLINE = 0xFF938F99.toInt()           // Light dividers, borders
+
+        // Accent colors
+        @ColorInt const val PRIMARY = 0xFFD0BCFF.toInt()           // Light purple for dark mode
+        @ColorInt const val ON_PRIMARY = 0xFF381E72.toInt()        // Dark text on light primary
+        @ColorInt const val PRIMARY_CONTAINER = 0xFF4F378B.toInt() // Dark purple background
+        @ColorInt const val ON_PRIMARY_CONTAINER = 0xFFEADDFF.toInt() // Light text
+
+        // Secondary colors
+        @ColorInt const val SECONDARY = 0xFFCCC2DC.toInt()         // Light gray-purple for dark
+        @ColorInt const val ON_SECONDARY = 0xFF332D41.toInt()      // Dark text on light secondary
+        @ColorInt const val SECONDARY_CONTAINER = 0xFF4A4458.toInt() // Dark secondary background
+        @ColorInt const val ON_SECONDARY_CONTAINER = 0xFFE8DEF8.toInt() // Light text
+    }
+
+    // ============================================================
+    // SPACING - Following 8dp Grid System
+    // ============================================================
+    object Spacing {
+        const val SPACE_XXS = 4   // 4dp - Minimal spacing
+        const val SPACE_XS = 8    // 8dp - Tight spacing
+        const val SPACE_SM = 12   // 12dp - Small spacing
+        const val SPACE_MD = 16   // 16dp - Medium spacing (default)
+        const val SPACE_LG = 24   // 24dp - Large spacing
+        const val SPACE_XL = 32   // 32dp - Extra large spacing
+        const val SPACE_XXL = 48  // 48dp - Maximum spacing
+    }
+
+    // ============================================================
+    // DIMENSIONS
+    // ============================================================
+    object Dimensions {
+        // Corner radius
+        const val CORNER_RADIUS_SM = 8   // Small corners (buttons, chips)
+        const val CORNER_RADIUS_MD = 16  // Medium corners (cards)
+        const val CORNER_RADIUS_LG = 24  // Large corners (bottom sheet top)
+        const val CORNER_RADIUS_XL = 28  // Extra large (full rounded)
+
+        // Icon sizes
+        const val ICON_SIZE_SM = 24      // Small icons
+        const val ICON_SIZE_MD = 48      // Medium icons
+        const val ICON_SIZE_LG = 64      // Large icons (hero icon)
+        const val ICON_SIZE_XL = 96      // Extra large icons
+
+        // Minimum touch target (Material Design)
+        const val MIN_TOUCH_TARGET = 48  // 48dp minimum for accessibility
+
+        // Elevation (for shadows/depth)
+        const val ELEVATION_NONE = 0f
+        const val ELEVATION_SM = 2f      // Small elevation
+        const val ELEVATION_MD = 4f      // Medium elevation
+        const val ELEVATION_LG = 8f      // Large elevation
+    }
+
+    // ============================================================
+    // TYPOGRAPHY
+    // ============================================================
+    object Typography {
+        // Text sizes (SP - scalable pixels)
+        const val TEXT_SIZE_DISPLAY = 32f    // Large headlines
+        const val TEXT_SIZE_HEADLINE = 24f   // Section headlines
+        const val TEXT_SIZE_TITLE = 20f      // Card titles
+        const val TEXT_SIZE_BODY_LG = 16f    // Large body text
+        const val TEXT_SIZE_BODY = 14f       // Default body text
+        const val TEXT_SIZE_LABEL = 12f      // Small labels, captions
+
+        // Line height multipliers
+        const val LINE_HEIGHT_TIGHT = 1.2f   // Tight line height
+        const val LINE_HEIGHT_NORMAL = 1.5f  // Normal line height
+        const val LINE_HEIGHT_RELAXED = 1.7f // Relaxed line height
+
+        // Font weights (Android Typeface)
+        const val FONT_WEIGHT_NORMAL = android.graphics.Typeface.NORMAL
+        const val FONT_WEIGHT_BOLD = android.graphics.Typeface.BOLD
+    }
+
+    // ============================================================
+    // ANIMATION DURATIONS (milliseconds)
+    // ============================================================
+    object Animation {
+        const val DURATION_SHORT = 200L      // Quick transitions
+        const val DURATION_MEDIUM = 300L     // Standard transitions
+        const val DURATION_LONG = 500L       // Emphasized transitions
+        const val DURATION_EXTRA_LONG = 700L // Hero transitions
+    }
+
+    // ============================================================
+    // OPACITY/ALPHA VALUES
+    // ============================================================
+    object Opacity {
+        const val DISABLED = 0.38f           // Disabled state
+        const val MEDIUM = 0.60f             // Medium emphasis
+        const val HIGH = 0.87f               // High emphasis
+        const val FULL = 1.0f                // Full opacity
+    }
+
+    // ============================================================
+    // HELPER FUNCTIONS
+    // ============================================================
+
+    /**
+     * Check if the device is in dark mode.
+     *
+     * @param context Android context
+     * @return true if dark mode is enabled
+     */
+    fun isDarkMode(context: Context): Boolean {
+        val nightModeFlags = context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
+        return nightModeFlags == Configuration.UI_MODE_NIGHT_YES
+    }
+
+    /**
+     * Get surface color based on current theme.
+     */
+    @ColorInt
+    fun getSurfaceColor(context: Context): Int {
+        return if (isDarkMode(context)) DarkColors.SURFACE else LightColors.SURFACE
+    }
+
+    /**
+     * Get surface variant color based on current theme.
+     */
+    @ColorInt
+    fun getSurfaceVariantColor(context: Context): Int {
+        return if (isDarkMode(context)) DarkColors.SURFACE_VARIANT else LightColors.SURFACE_VARIANT
+    }
+
+    /**
+     * Get error color based on current theme.
+     */
+    @ColorInt
+    fun getErrorColor(context: Context): Int {
+        return if (isDarkMode(context)) DarkColors.ERROR else LightColors.ERROR
+    }
+
+    /**
+     * Get error container color based on current theme.
+     */
+    @ColorInt
+    fun getErrorContainerColor(context: Context): Int {
+        return if (isDarkMode(context)) DarkColors.ERROR_CONTAINER else LightColors.ERROR_CONTAINER
+    }
+
+    /**
+     * Get on-error color (text on error background) based on current theme.
+     */
+    @ColorInt
+    fun getOnErrorColor(context: Context): Int {
+        return if (isDarkMode(context)) DarkColors.ON_ERROR else LightColors.ON_ERROR
+    }
+
+    /**
+     * Get on-error-container color based on current theme.
+     */
+    @ColorInt
+    fun getOnErrorContainerColor(context: Context): Int {
+        return if (isDarkMode(context)) DarkColors.ON_ERROR_CONTAINER else LightColors.ON_ERROR_CONTAINER
+    }
+
+    /**
+     * Get primary text color based on current theme.
+     */
+    @ColorInt
+    fun getOnSurfaceColor(context: Context): Int {
+        return if (isDarkMode(context)) DarkColors.ON_SURFACE else LightColors.ON_SURFACE
+    }
+
+    /**
+     * Get secondary text color based on current theme.
+     */
+    @ColorInt
+    fun getOnSurfaceVariantColor(context: Context): Int {
+        return if (isDarkMode(context)) DarkColors.ON_SURFACE_VARIANT else LightColors.ON_SURFACE_VARIANT
+    }
+
+    /**
+     * Get outline color (dividers, borders) based on current theme.
+     */
+    @ColorInt
+    fun getOutlineColor(context: Context): Int {
+        return if (isDarkMode(context)) DarkColors.OUTLINE else LightColors.OUTLINE
+    }
+
+    /**
+     * Get primary color based on current theme.
+     */
+    @ColorInt
+    fun getPrimaryColor(context: Context): Int {
+        return if (isDarkMode(context)) DarkColors.PRIMARY else LightColors.PRIMARY
+    }
+
+    /**
+     * Get on-primary color (text on primary background) based on current theme.
+     */
+    @ColorInt
+    fun getOnPrimaryColor(context: Context): Int {
+        return if (isDarkMode(context)) DarkColors.ON_PRIMARY else LightColors.ON_PRIMARY
+    }
+
+    /**
+     * Get primary container color based on current theme.
+     */
+    @ColorInt
+    fun getPrimaryContainerColor(context: Context): Int {
+        return if (isDarkMode(context)) DarkColors.PRIMARY_CONTAINER else LightColors.PRIMARY_CONTAINER
+    }
+
+    /**
+     * Get on-primary-container color based on current theme.
+     */
+    @ColorInt
+    fun getOnPrimaryContainerColor(context: Context): Int {
+        return if (isDarkMode(context)) DarkColors.ON_PRIMARY_CONTAINER else LightColors.ON_PRIMARY_CONTAINER
+    }
+
+    /**
+     * Get secondary color based on current theme.
+     */
+    @ColorInt
+    fun getSecondaryColor(context: Context): Int {
+        return if (isDarkMode(context)) DarkColors.SECONDARY else LightColors.SECONDARY
+    }
+
+    /**
+     * Get on-secondary color based on current theme.
+     */
+    @ColorInt
+    fun getOnSecondaryColor(context: Context): Int {
+        return if (isDarkMode(context)) DarkColors.ON_SECONDARY else LightColors.ON_SECONDARY
+    }
+
+    /**
+     * Convert DP to pixels.
+     *
+     * @param context Android context
+     * @param dp Value in density-independent pixels
+     * @return Value in pixels
+     */
+    fun dpToPx(context: Context, dp: Int): Int {
+        return (dp * context.resources.displayMetrics.density).toInt()
+    }
+
+}