expo-app-blocker 0.1.44 → 0.1.46

package/.github/workflows/publish.yml

@@ -19,8 +19,13 @@ jobs:
 
       - name: Determine version bump
         id: version
+        # Never inline `${{ github.event.head_commit.message }}` into the
+        # script body — GitHub Actions substitutes it BEFORE the shell runs,
+        # so backticks / parens / `${...}` / `{vars}` get evaluated as
+        # commands. Always pass via env: so it lands as a quoted string.
+        env:
+          COMMIT_MSG: ${{ github.event.head_commit.message }}
         run: |
-          COMMIT_MSG="${{ github.event.head_commit.message }}"
           if echo "$COMMIT_MSG" | grep -qw "\[major\]"; then
             echo "bump=major" >> $GITHUB_OUTPUT
           elif echo "$COMMIT_MSG" | grep -qw "\[minor\]"; then

package/android/src/main/java/expo/modules/appblocker/AppBlockerPrefs.kt

@@ -6,7 +6,11 @@ import android.content.SharedPreferences
 object AppBlockerPrefs {
   const val PREFS_NAME = "expo_app_blocker_prefs"
   const val KEY_BLOCKED_PACKAGES = "blocked_packages"
+  private const val KEY_OVERLAY_TITLE = "overlay_title"
   private const val KEY_OVERLAY_TEXT = "overlay_text"
+  private const val KEY_OVERLAY_BG_COLOR = "overlay_bg_color"
+  private const val KEY_OVERLAY_TITLE_COLOR = "overlay_title_color"
+  private const val KEY_OVERLAY_TEXT_COLOR = "overlay_text_color"
   private const val KEY_NOTIFICATION_TITLE = "notification_title"
   private const val KEY_NOTIFICATION_TEXT = "notification_text"
 
@@ -24,20 +28,40 @@ object AppBlockerPrefs {
 
   fun setAndroidConfig(
     context: Context,
+    overlayTitle: String?,
     overlayText: String?,
+    overlayBackgroundColor: String?,
+    overlayTitleColor: String?,
+    overlayTextColor: String?,
     notificationTitle: String?,
     notificationText: String?,
   ) {
     get(context).edit()
+      .putString(KEY_OVERLAY_TITLE, overlayTitle)
       .putString(KEY_OVERLAY_TEXT, overlayText)
+      .putString(KEY_OVERLAY_BG_COLOR, overlayBackgroundColor)
+      .putString(KEY_OVERLAY_TITLE_COLOR, overlayTitleColor)
+      .putString(KEY_OVERLAY_TEXT_COLOR, overlayTextColor)
       .putString(KEY_NOTIFICATION_TITLE, notificationTitle)
       .putString(KEY_NOTIFICATION_TEXT, notificationText)
       .apply()
   }
 
+  fun getOverlayTitle(context: Context): String =
+    get(context).getString(KEY_OVERLAY_TITLE, null) ?: "App Blocked"
+
   fun getOverlayText(context: Context): String =
     get(context).getString(KEY_OVERLAY_TEXT, null) ?: "{appName} is blocked."
 
+  fun getOverlayBackgroundColor(context: Context): String =
+    get(context).getString(KEY_OVERLAY_BG_COLOR, null) ?: "#FFFFFF"
+
+  fun getOverlayTitleColor(context: Context): String =
+    get(context).getString(KEY_OVERLAY_TITLE_COLOR, null) ?: "#111111"
+
+  fun getOverlayTextColor(context: Context): String =
+    get(context).getString(KEY_OVERLAY_TEXT_COLOR, null) ?: "#737373"
+
   fun getNotificationTitle(context: Context): String =
     get(context).getString(KEY_NOTIFICATION_TITLE, null) ?: "App Blocked"
 

package/android/src/main/java/expo/modules/appblocker/ExpoAppBlockerModule.kt

@@ -68,7 +68,11 @@ class ExpoAppBlockerModule : Module() {
     Function("setAndroidConfig") { config: Map<String, Any?> ->
       AppBlockerPrefs.setAndroidConfig(
         context,
+        overlayTitle = config["overlayTitle"] as? String,
         overlayText = config["overlayText"] as? String,
+        overlayBackgroundColor = config["overlayBackgroundColor"] as? String,
+        overlayTitleColor = config["overlayTitleColor"] as? String,
+        overlayTextColor = config["overlayTextColor"] as? String,
         notificationTitle = config["notificationTitle"] as? String,
         notificationText = config["notificationText"] as? String,
       )

package/android/src/main/java/expo/modules/appblocker/OverlayManager.kt

@@ -117,18 +117,32 @@ class OverlayManager(private val context: Context) {
     val density = context.resources.displayMetrics.density
     fun dp(value: Int) = (value * density).toInt()
 
+    val overlayTitle = AppBlockerPrefs.getOverlayTitle(context)
+      .replace("{appName}", appName)
     val overlayText = AppBlockerPrefs.getOverlayText(context)
       .replace("{appName}", appName)
+    val backgroundColor = parseColorOrDefault(
+      AppBlockerPrefs.getOverlayBackgroundColor(context),
+      Color.WHITE,
+    )
+    val titleColor = parseColorOrDefault(
+      AppBlockerPrefs.getOverlayTitleColor(context),
+      Color.parseColor("#111111"),
+    )
+    val textColor = parseColorOrDefault(
+      AppBlockerPrefs.getOverlayTextColor(context),
+      Color.parseColor("#737373"),
+    )
 
     return LinearLayout(context).apply {
       orientation = LinearLayout.VERTICAL
       gravity = Gravity.CENTER
-      setBackgroundColor(Color.WHITE)
+      setBackgroundColor(backgroundColor)
       setPadding(dp(32), dp(32), dp(32), dp(32))
 
       addView(TextView(context).apply {
-        text = "App Blocked"
-        setTextColor(Color.parseColor("#111111"))
+        text = overlayTitle
+        setTextColor(titleColor)
         setTextSize(TypedValue.COMPLEX_UNIT_SP, 24f)
         setTypeface(typeface, Typeface.BOLD)
         gravity = Gravity.CENTER
@@ -137,13 +151,19 @@ class OverlayManager(private val context: Context) {
 
       addView(TextView(context).apply {
         text = overlayText
-        setTextColor(Color.parseColor("#737373"))
+        setTextColor(textColor)
         setTextSize(TypedValue.COMPLEX_UNIT_SP, 16f)
         gravity = Gravity.CENTER
       })
     }
   }
 
+  private fun parseColorOrDefault(hex: String, fallback: Int): Int = try {
+    Color.parseColor(hex)
+  } catch (_: IllegalArgumentException) {
+    fallback
+  }
+
   private fun buildLayoutParams(): WindowManager.LayoutParams {
     @Suppress("DEPRECATION")
     val type = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-app-blocker",
-  "version": "0.1.44",
+  "version": "0.1.46",
   "description": "Expo module for cross-platform app blocking. Android: UsageStatsManager + Overlay. iOS: Screen Time API (FamilyControls + ManagedSettings + DeviceActivity).",
   "main": "src/index.ts",
   "types": "src/index.ts",

package/src/ExpoAppBlocker.types.ts

@@ -149,8 +149,16 @@ export interface ShieldConfig {
 }
 
 export interface AndroidConfig {
-  /** Text shown on the blocking overlay. Use {appName} as placeholder. Default: "{appName} is blocked." */
+  /** Bold title rendered on the blocking overlay. Use {appName} as placeholder. Default: "App Blocked" */
+  overlayTitle?: string;
+  /** Body text shown under the overlay title. Use {appName} as placeholder. Default: "{appName} is blocked." */
   overlayText?: string;
+  /** Hex color (e.g. "#f6f6f6") for the overlay background. Default: "#FFFFFF". */
+  overlayBackgroundColor?: string;
+  /** Hex color (e.g. "#111111") for the overlay title text. Default: "#111111". */
+  overlayTitleColor?: string;
+  /** Hex color (e.g. "#737373") for the overlay body text. Default: "#737373". */
+  overlayTextColor?: string;
   /** Notification title when app is blocked. Use {appName} as placeholder. Default: "App Blocked" */
   notificationTitle?: string;
   /** Notification text when app is blocked. Use {appName} as placeholder. */