expo-app-blocker 0.1.3 → 0.1.4

package/README.md

@@ -87,18 +87,13 @@ Add the plugin to your `app.json`:
 | Option | Type | Default | Description |
 |---|---|---|---|
 | `ios.appGroup` | `string` | Required | App Group identifier for shared data |
-| `ios.shield.title` | `string` | `"Hold on!"` | Shield title. `{appName}` replaced with blocked app name |
-| `ios.shield.titleColor` | `string` | `"#111111"` | Title text color (hex) |
-| `ios.shield.subtitle` | `string` | `"{appName} is blocked."` | Shield subtitle. `{appName}` replaced with blocked app name |
-| `ios.shield.subtitleColor` | `string` | `"#8c8c8c"` | Subtitle text color (hex) |
+| `ios.shield.title` | `string` | `"Hold on!"` | Shield overlay title |
+| `ios.shield.subtitle` | `string` | `"{appName} is blocked."` | Shield subtitle. `{appName}` is replaced with the blocked app name |
 | `ios.shield.primaryButtonLabel` | `string` | `"Earn Free Time"` | Primary button text |
-| `ios.shield.primaryButtonLabelColor` | `string` | `"#ffffff"` | Primary button text color (hex) |
-| `ios.shield.primaryButtonBackgroundColor` | `string` | `"#7cb518"` | Primary button background color (hex) |
 | `ios.shield.secondaryButtonLabel` | `string\|null` | `"Not now"` | Secondary button text. Set to `null` to hide |
-| `ios.shield.secondaryButtonLabelColor` | `string` | `"#8c8c8c"` | Secondary button text color (hex) |
-| `ios.shield.backgroundColor` | `string\|null` | `null` | Background tint color over blur (hex, supports alpha e.g. `"#FF000033"`) |
-| `ios.shield.backgroundBlurStyle` | `string` | `"systemThickMaterial"` | Blur style. Options: `extraLight`, `light`, `dark`, `regular`, `prominent`, `systemUltraThinMaterial`, `systemThinMaterial`, `systemMaterial`, `systemThickMaterial`, `systemChromeMaterial`, and light/dark forced variants |
-| `ios.shield.icon` | `string` | SF Symbol | Path to custom shield icon PNG (relative to project root) |
+| `ios.shield.primaryButtonColor` | `string` | `"#7cb518"` | Primary button background color (hex) |
+| `ios.shield.backgroundBlurStyle` | `string` | `"systemThickMaterial"` | iOS blur style |
+| `ios.shield.icon` | `string` | SF Symbol | Path to custom shield icon PNG (relative to project root, e.g. `"./assets/shield-icon.png"`) |
 | `android.notificationTitle` | `string` | `"App Blocked"` | Notification title |
 | `android.notificationText` | `string` | `"{appName} is blocked."` | Notification text |
 

package/package.json

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

@@ -141,23 +141,45 @@ function withAppBlockerIOS(config, pluginConfig) {
         }
       }
 
-      // Inject config values into extension Swift files
+      // Helper: hex to RGB floats
+      function hexToRgb(hex) {
+        const h = hex.replace("#", "");
+        return {
+          r: (parseInt(h.substring(0, 2), 16) / 255).toFixed(3),
+          g: (parseInt(h.substring(2, 4), 16) / 255).toFixed(3),
+          b: (parseInt(h.substring(4, 6), 16) / 255).toFixed(3),
+        };
+      }
+
+      // Shield config defaults
       const shield = pluginConfig?.ios?.shield || {};
+      const primaryColor = hexToRgb(shield.primaryButtonColor || "#fb6107");
+      const titleColor = hexToRgb(shield.titleColor || "#111111");
+      const subtitleColor = hexToRgb(shield.subtitleColor || "#737373");
+      const bgColor = shield.backgroundColor ? hexToRgb(shield.backgroundColor) : null;
+
+      // All placeholder replacements
       const replacements = {
         "APP_GROUP_PLACEHOLDER": appGroup,
         "SHIELD_TITLE_PLACEHOLDER": shield.title || "Hold on!",
-        "SHIELD_TITLE_COLOR_PLACEHOLDER": shield.titleColor || "#111111",
         "SHIELD_SUBTITLE_PLACEHOLDER": shield.subtitle || "{appName} is blocked.",
-        "SHIELD_SUBTITLE_COLOR_PLACEHOLDER": shield.subtitleColor || "#8c8c8c",
-        "SHIELD_PRIMARY_LABEL_PLACEHOLDER": shield.primaryButtonLabel || "Earn Free Time",
-        "SHIELD_PRIMARY_LABEL_COLOR_PLACEHOLDER": shield.primaryButtonLabelColor || "#ffffff",
-        "SHIELD_PRIMARY_BG_COLOR_PLACEHOLDER": shield.primaryButtonBackgroundColor || shield.primaryButtonColor || "#7cb518",
-        "SHIELD_SECONDARY_LABEL_PLACEHOLDER": shield.secondaryButtonLabel === null ? "NONE" : (shield.secondaryButtonLabel || "Not now"),
-        "SHIELD_SECONDARY_LABEL_COLOR_PLACEHOLDER": shield.secondaryButtonLabelColor || "#8c8c8c",
-        "SHIELD_BG_COLOR_PLACEHOLDER": shield.backgroundColor || "NONE",
-        "SHIELD_BLUR_STYLE_PLACEHOLDER": shield.backgroundBlurStyle || "systemThickMaterial",
+        "SHIELD_PRIMARY_BUTTON_PLACEHOLDER": shield.primaryButtonLabel || "Earn Free Time",
+        "SHIELD_SECONDARY_BUTTON_PLACEHOLDER": shield.secondaryButtonLabel === null ? "none" : (shield.secondaryButtonLabel || "Not now"),
+        "SHIELD_PRIMARY_R_PLACEHOLDER": primaryColor.r,
+        "SHIELD_PRIMARY_G_PLACEHOLDER": primaryColor.g,
+        "SHIELD_PRIMARY_B_PLACEHOLDER": primaryColor.b,
+        "SHIELD_TITLE_R_PLACEHOLDER": titleColor.r,
+        "SHIELD_TITLE_G_PLACEHOLDER": titleColor.g,
+        "SHIELD_TITLE_B_PLACEHOLDER": titleColor.b,
+        "SHIELD_SUBTITLE_R_PLACEHOLDER": subtitleColor.r,
+        "SHIELD_SUBTITLE_G_PLACEHOLDER": subtitleColor.g,
+        "SHIELD_SUBTITLE_B_PLACEHOLDER": subtitleColor.b,
+        "SHIELD_BG_PLACEHOLDER": bgColor
+          ? `UIColor(red: ${bgColor.r}, green: ${bgColor.g}, blue: ${bgColor.b}, alpha: 1.0)`
+          : "nil",
       };
 
+      // Inject all placeholders into extension Swift files
       const targetsDir = path.join(path.dirname(platformRoot), "targets");
       if (fs.existsSync(targetsDir)) {
         const dirs = fs.readdirSync(targetsDir);
@@ -169,20 +191,16 @@ function withAppBlockerIOS(config, pluginConfig) {
             if (!file.endsWith(".swift")) continue;
             const filePath = path.join(dirPath, file);
             let content = fs.readFileSync(filePath, "utf-8");
-            let changed = false;
-            for (const [placeholder, value] of Object.entries(replacements)) {
-              if (content.includes(placeholder)) {
-                content = content.replace(new RegExp(placeholder, "g"), value);
-                changed = true;
-              }
+            for (const [key, value] of Object.entries(replacements)) {
+              content = content.replace(new RegExp(key, "g"), value);
             }
-            if (changed) fs.writeFileSync(filePath, content);
+            fs.writeFileSync(filePath, content);
           }
         }
       }
 
       // Copy shield icon to ShieldConfiguration target assets
-      const shieldIcon = shield.icon;
+      const shieldIcon = pluginConfig?.ios?.shield?.icon;
       if (shieldIcon) {
         const projectRoot = path.dirname(platformRoot);
         const iconSrc = path.resolve(projectRoot, shieldIcon);

package/src/ExpoAppBlocker.types.ts

@@ -66,39 +66,23 @@ export interface RelockResult {
 // ──────────────────────────────────────────────────────────────────────────────
 
 export interface ShieldConfig {
-  /** Title text. Use {appName} as placeholder for the blocked app name. Default: "Hold on!" */
+  /** Title shown on the shield. Default: "Hold on!" */
   title?: string;
-  /** Title text color (hex). Default: "#111111" */
-  titleColor?: string;
-  /** Subtitle text. Use {appName} as placeholder. Default: "{appName} is blocked." */
+  /** Subtitle shown on the shield. Use {appName} as placeholder. Default: "{appName} is blocked." */
   subtitle?: string;
-  /** Subtitle text color (hex). Default: "#8c8c8c" */
-  subtitleColor?: string;
-  /** Primary button label text. Default: "Earn Free Time" */
+  /** Primary button label. Default: "Earn Free Time" */
   primaryButtonLabel?: string;
-  /** Primary button label text color (hex). Default: "#ffffff" */
-  primaryButtonLabelColor?: string;
-  /** Primary button background color (hex). Default: "#7cb518" */
-  primaryButtonBackgroundColor?: string;
-  /** Secondary button label text. Set to null to hide the button. Default: "Not now" */
+  /** Secondary button label. Set to null to hide. Default: "Not now" */
   secondaryButtonLabel?: string | null;
-  /** Secondary button label text color (hex). Default: "#8c8c8c" */
-  secondaryButtonLabelColor?: string;
-  /**
-   * Background tint color (hex, supports alpha e.g. "#FF000033").
-   * Applied as overlay on top of the blur. Default: null (no tint)
-   */
+  /** Primary button background color (hex). Default: "#fb6107" */
+  primaryButtonColor?: string;
+  /** Title text color (hex). Default: "#111111" */
+  titleColor?: string;
+  /** Subtitle text color (hex). Default: "#737373" */
+  subtitleColor?: string;
+  /** Background color (hex). Default: null (uses system blur). Set to a color like "#f6f6f6" for a solid light background. */
   backgroundColor?: string | null;
-  /**
-   * Background blur style. Default: "systemThickMaterial"
-   *
-   * Options: "extraLight", "light", "dark", "regular", "prominent",
-   * "systemUltraThinMaterial", "systemThinMaterial", "systemMaterial",
-   * "systemThickMaterial", "systemChromeMaterial",
-   * and light/dark forced variants (e.g. "systemMaterialDark")
-   */
-  backgroundBlurStyle?: string;
-  /** Path to custom shield icon PNG (relative to project root). Optional. */
+  /** Path to shield icon image (PNG). Optional. */
   icon?: string;
 }
 

package/targets/ShieldConfiguration/ShieldConfigurationExtension.swift

@@ -6,69 +6,15 @@ class ShieldConfigurationExtension: ShieldConfigurationDataSource {
 
   private let appGroupIdentifier = "APP_GROUP_PLACEHOLDER"
 
-  // ── Configurable values (injected by plugin at prebuild) ──────────────
-  private let cfgTitle = "SHIELD_TITLE_PLACEHOLDER"                           // default: "Hold on!"
-  private let cfgTitleColor = "SHIELD_TITLE_COLOR_PLACEHOLDER"                // default: "#111111"
-  private let cfgSubtitle = "SHIELD_SUBTITLE_PLACEHOLDER"                     // default: "{appName} is blocked."
-  private let cfgSubtitleColor = "SHIELD_SUBTITLE_COLOR_PLACEHOLDER"          // default: "#8c8c8c"
-  private let cfgPrimaryLabel = "SHIELD_PRIMARY_LABEL_PLACEHOLDER"            // default: "Earn Free Time"
-  private let cfgPrimaryLabelColor = "SHIELD_PRIMARY_LABEL_COLOR_PLACEHOLDER" // default: "#ffffff"
-  private let cfgPrimaryBgColor = "SHIELD_PRIMARY_BG_COLOR_PLACEHOLDER"       // default: "#7cb518"
-  private let cfgSecondaryLabel = "SHIELD_SECONDARY_LABEL_PLACEHOLDER"        // default: "Not now", "NONE" to hide
-  private let cfgSecondaryLabelColor = "SHIELD_SECONDARY_LABEL_COLOR_PLACEHOLDER" // default: "#8c8c8c"
-  private let cfgBgColor = "SHIELD_BG_COLOR_PLACEHOLDER"                      // default: "NONE" (no tint)
-  private let cfgBlurStyle = "SHIELD_BLUR_STYLE_PLACEHOLDER"                  // default: "systemThickMaterial"
-
-  // ── Helpers ───────────────────────────────────────────────────────────
-
-  private func hexColor(_ hex: String) -> UIColor {
-    var h = hex.trimmingCharacters(in: .whitespacesAndNewlines)
-    if h.hasPrefix("#") { h.removeFirst() }
-
-    var rgb: UInt64 = 0
-    Scanner(string: h).scanHexInt64(&rgb)
-
-    if h.count == 8 { // RRGGBBAA
-      return UIColor(
-        red: CGFloat((rgb >> 24) & 0xFF) / 255,
-        green: CGFloat((rgb >> 16) & 0xFF) / 255,
-        blue: CGFloat((rgb >> 8) & 0xFF) / 255,
-        alpha: CGFloat(rgb & 0xFF) / 255
-      )
-    }
-    return UIColor(
-      red: CGFloat((rgb >> 16) & 0xFF) / 255,
-      green: CGFloat((rgb >> 8) & 0xFF) / 255,
-      blue: CGFloat(rgb & 0xFF) / 255,
-      alpha: 1.0
-    )
-  }
-
-  private func resolveBlurStyle(_ name: String) -> UIBlurEffect.Style {
-    switch name {
-    case "extraLight": return .extraLight
-    case "light": return .light
-    case "dark": return .dark
-    case "regular": return .regular
-    case "prominent": return .prominent
-    case "systemUltraThinMaterial": return .systemUltraThinMaterial
-    case "systemThinMaterial": return .systemThinMaterial
-    case "systemMaterial": return .systemMaterial
-    case "systemThickMaterial": return .systemThickMaterial
-    case "systemChromeMaterial": return .systemChromeMaterial
-    case "systemUltraThinMaterialLight": return .systemUltraThinMaterialLight
-    case "systemThinMaterialLight": return .systemThinMaterialLight
-    case "systemMaterialLight": return .systemMaterialLight
-    case "systemThickMaterialLight": return .systemThickMaterialLight
-    case "systemChromeMaterialLight": return .systemChromeMaterialLight
-    case "systemUltraThinMaterialDark": return .systemUltraThinMaterialDark
-    case "systemThinMaterialDark": return .systemThinMaterialDark
-    case "systemMaterialDark": return .systemMaterialDark
-    case "systemThickMaterialDark": return .systemThickMaterialDark
-    case "systemChromeMaterialDark": return .systemChromeMaterialDark
-    default: return .systemThickMaterial
-    }
-  }
+  // All values below are replaced by the config plugin at prebuild time
+  private let shieldTitle = "SHIELD_TITLE_PLACEHOLDER"
+  private let shieldSubtitle = "SHIELD_SUBTITLE_PLACEHOLDER"
+  private let shieldPrimaryButtonLabel = "SHIELD_PRIMARY_BUTTON_PLACEHOLDER"
+  private let shieldSecondaryButtonLabel = "SHIELD_SECONDARY_BUTTON_PLACEHOLDER"
+  private let shieldPrimaryButtonColor = UIColor(red: SHIELD_PRIMARY_R_PLACEHOLDER, green: SHIELD_PRIMARY_G_PLACEHOLDER, blue: SHIELD_PRIMARY_B_PLACEHOLDER, alpha: 1.0)
+  private let shieldBackgroundColor: UIColor? = SHIELD_BG_PLACEHOLDER
+  private let shieldTitleColor = UIColor(red: SHIELD_TITLE_R_PLACEHOLDER, green: SHIELD_TITLE_G_PLACEHOLDER, blue: SHIELD_TITLE_B_PLACEHOLDER, alpha: 1.0)
+  private let shieldSubtitleColor = UIColor(red: SHIELD_SUBTITLE_R_PLACEHOLDER, green: SHIELD_SUBTITLE_G_PLACEHOLDER, blue: SHIELD_SUBTITLE_B_PLACEHOLDER, alpha: 1.0)
 
   private var mascotIcon: UIImage? {
     let bundle = Bundle(for: type(of: self))
@@ -79,68 +25,63 @@ class ShieldConfigurationExtension: ShieldConfigurationDataSource {
   private func getBlockedAppCount() -> Int {
     guard let defaults = UserDefaults(suiteName: appGroupIdentifier) else { return 0 }
     guard let config = defaults.dictionary(forKey: "appBlocker.blockConfiguration.v1") else { return 0 }
-    if let items = config["blockedItems"] as? [[String: Any]] { return items.count }
+    if let items = config["blockedItems"] as? [[String: Any]] {
+      return items.count
+    }
     return 0
   }
 
   private func isTemporarilyUnlocked() -> Bool {
     guard let defaults = UserDefaults(suiteName: appGroupIdentifier) else { return false }
-    guard let exp = defaults.object(forKey: "appBlocker.temporaryUnlock.v1") as? Date else { return false }
-    return Date() < exp
+    guard let expiration = defaults.object(forKey: "appBlocker.temporaryUnlock.v1") as? Date else { return false }
+    return Date() < expiration
   }
 
-  private func buildConfig(appName: String) -> ShieldConfiguration {
+  private func makeConfig(appName: String) -> ShieldConfiguration {
     if isTemporarilyUnlocked() {
       return ShieldConfiguration(
-        backgroundBlurStyle: resolveBlurStyle(cfgBlurStyle),
-        backgroundColor: cfgBgColor == "NONE" ? nil : hexColor(cfgBgColor),
+        backgroundBlurStyle: shieldBackgroundColor == nil ? .systemThickMaterial : nil,
+        backgroundColor: shieldBackgroundColor,
         icon: mascotIcon,
-        title: ShieldConfiguration.Label(text: "Almost there!", color: hexColor(cfgTitleColor)),
-        subtitle: ShieldConfiguration.Label(text: "Your free time is loading. Try again in a moment.", color: hexColor(cfgSubtitleColor)),
+        title: ShieldConfiguration.Label(text: "Almost there!", color: shieldTitleColor),
+        subtitle: ShieldConfiguration.Label(text: "Your free time is loading. Try again in a moment.", color: shieldSubtitleColor),
         primaryButtonLabel: ShieldConfiguration.Label(text: "OK", color: .white),
-        primaryButtonBackgroundColor: hexColor(cfgPrimaryBgColor),
+        primaryButtonBackgroundColor: shieldPrimaryButtonColor,
         secondaryButtonLabel: nil
       )
     }
 
-    let title = cfgTitle.replacingOccurrences(of: "{appName}", with: appName)
-    let subtitle = cfgSubtitle.replacingOccurrences(of: "{appName}", with: appName)
     let count = getBlockedAppCount()
-    let fullSubtitle = count > 1
-      ? "\(subtitle) You have \(count) apps blocked."
-      : subtitle
+    let context = count > 1 ? " You have \(count) apps blocked." : ""
+    let subtitle = shieldSubtitle.replacingOccurrences(of: "{appName}", with: appName) + context
 
-    let secondaryLabel: ShieldConfiguration.Label? =
-      cfgSecondaryLabel == "NONE" ? nil :
-      ShieldConfiguration.Label(text: cfgSecondaryLabel, color: hexColor(cfgSecondaryLabelColor))
+    let hasSecondary = !shieldSecondaryButtonLabel.isEmpty && shieldSecondaryButtonLabel != "none"
 
     return ShieldConfiguration(
-      backgroundBlurStyle: resolveBlurStyle(cfgBlurStyle),
-      backgroundColor: cfgBgColor == "NONE" ? nil : hexColor(cfgBgColor),
+      backgroundBlurStyle: shieldBackgroundColor == nil ? .systemThickMaterial : nil,
+      backgroundColor: shieldBackgroundColor,
       icon: mascotIcon,
-      title: ShieldConfiguration.Label(text: title, color: hexColor(cfgTitleColor)),
-      subtitle: ShieldConfiguration.Label(text: fullSubtitle, color: hexColor(cfgSubtitleColor)),
-      primaryButtonLabel: ShieldConfiguration.Label(text: cfgPrimaryLabel, color: hexColor(cfgPrimaryLabelColor)),
-      primaryButtonBackgroundColor: hexColor(cfgPrimaryBgColor),
-      secondaryButtonLabel: secondaryLabel
+      title: ShieldConfiguration.Label(text: shieldTitle, color: shieldTitleColor),
+      subtitle: ShieldConfiguration.Label(text: subtitle, color: shieldSubtitleColor),
+      primaryButtonLabel: ShieldConfiguration.Label(text: shieldPrimaryButtonLabel, color: .white),
+      primaryButtonBackgroundColor: shieldPrimaryButtonColor,
+      secondaryButtonLabel: hasSecondary ? ShieldConfiguration.Label(text: shieldSecondaryButtonLabel, color: shieldSubtitleColor) : nil
     )
   }
 
-  // ── Overrides ─────────────────────────────────────────────────────────
-
   override func configuration(shielding application: Application) -> ShieldConfiguration {
-    buildConfig(appName: application.localizedDisplayName ?? "This app")
+    makeConfig(appName: application.localizedDisplayName ?? "This app")
   }
 
   override func configuration(shielding application: Application, in category: ActivityCategory) -> ShieldConfiguration {
-    buildConfig(appName: category.localizedDisplayName ?? "This category")
+    makeConfig(appName: category.localizedDisplayName ?? "This category")
   }
 
   override func configuration(shielding webDomain: WebDomain) -> ShieldConfiguration {
-    buildConfig(appName: webDomain.domain ?? "This website")
+    makeConfig(appName: webDomain.domain ?? "This website")
   }
 
   override func configuration(shielding webDomain: WebDomain, in category: ActivityCategory) -> ShieldConfiguration {
-    buildConfig(appName: webDomain.domain ?? "This website")
+    makeConfig(appName: webDomain.domain ?? "This website")
   }
 }