expo-app-blocker 0.1.45 → 0.1.47

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

@@ -2,6 +2,7 @@ package expo.modules.appblocker
 
 import android.content.Context
 import android.content.Intent
+import android.graphics.BitmapFactory
 import android.graphics.Color
 import android.graphics.PixelFormat
 import android.graphics.Typeface
@@ -12,6 +13,7 @@ import android.util.TypedValue
 import android.view.Gravity
 import android.view.View
 import android.view.WindowManager
+import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 
@@ -117,18 +119,51 @@ 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))
 
+      // Optional brand icon — drawable named `expo_app_blocker_overlay_icon`
+      // is copied by the config plugin from `pluginConfig.android.overlay.icon`.
+      // Skip silently if missing so apps that don't ship one still get a clean overlay.
+      val iconResId = context.resources.getIdentifier(
+        "expo_app_blocker_overlay_icon",
+        "drawable",
+        context.packageName,
+      )
+      if (iconResId != 0) {
+        addView(ImageView(context).apply {
+          val bitmap = BitmapFactory.decodeResource(context.resources, iconResId)
+          if (bitmap != null) setImageBitmap(bitmap)
+          val size = dp(96)
+          layoutParams = LinearLayout.LayoutParams(size, size).apply {
+            bottomMargin = dp(20)
+          }
+        })
+      }
+
       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 +172,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.45",
+  "version": "0.1.47",
   "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/plugin/src/index.js

@@ -144,6 +144,39 @@ function withAppBlockerAndroid(config, pluginConfig) {
     ]);
   }
 
+  // Copy the overlay icon (PNG) to `res/drawable/expo_app_blocker_overlay_icon.png`
+  // so `OverlayManager.kt` can resolve it via Resources.getIdentifier(...).
+  // The icon is rendered above the title in the SYSTEM_ALERT_WINDOW overlay.
+  // Path is resolved relative to the project root for consistency with the
+  // top-level `icon` config field.
+  const overlayIconRel = pluginConfig?.android?.overlay?.icon;
+  if (overlayIconRel) {
+    config = withDangerousMod(config, [
+      "android",
+      (config) => {
+        const platformRoot = config.modRequest.platformProjectRoot;
+        const projectRoot = config.modRequest.projectRoot;
+        const drawableDir = path.join(platformRoot, "app", "src", "main", "res", "drawable");
+        const iconSrc = path.isAbsolute(overlayIconRel)
+          ? overlayIconRel
+          : path.join(projectRoot, overlayIconRel);
+
+        if (!fs.existsSync(iconSrc)) {
+          throw new Error(
+            `[expo-app-blocker] android.overlay.icon points to a missing file: ${iconSrc}`,
+          );
+        }
+
+        if (!fs.existsSync(drawableDir)) {
+          fs.mkdirSync(drawableDir, { recursive: true });
+        }
+
+        fs.copyFileSync(iconSrc, path.join(drawableDir, "expo_app_blocker_overlay_icon.png"));
+        return config;
+      },
+    ]);
+  }
+
   return config;
 }
 

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. */