expo-app-blocker 0.1.46 → 0.1.47

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
 
@@ -140,6 +142,25 @@ class OverlayManager(private val context: Context) {
       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 = overlayTitle
         setTextColor(titleColor)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-app-blocker",
-  "version": "0.1.46",
+  "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;
 }