expo-app-blocker 0.1.7 → 0.1.9

package/.github/workflows/publish.yml

@@ -7,7 +7,6 @@ on:
 jobs:
   publish:
     runs-on: ubuntu-latest
-    # Skip version bump commits to prevent loops
     if: "!startsWith(github.event.head_commit.message, 'v')"
 
     steps:
@@ -30,8 +29,16 @@ jobs:
             echo "bump=patch" >> $GITHUB_OUTPUT
           fi
 
-      - name: Bump version (no git commit)
-        run: npm version ${{ steps.version.outputs.bump }} --no-git-tag-version
+      - name: Sync version from npm and bump
+        run: |
+          # Get latest version from npm, fallback to package.json
+          NPM_VERSION=$(npm view expo-app-blocker version 2>/dev/null || echo "0.0.0")
+          echo "Current npm version: $NPM_VERSION"
+          # Set package.json to npm version first
+          npm version $NPM_VERSION --no-git-tag-version --allow-same-version
+          # Then bump
+          npm version ${{ steps.version.outputs.bump }} --no-git-tag-version
+          echo "New version: $(node -p 'require("./package.json").version')"
 
       - name: Publish to npm
         run: npm publish --access public

package/expo-module.config.json

@@ -4,6 +4,6 @@
     "modules": ["expo.modules.appblocker.ExpoAppBlockerModule"]
   },
   "apple": {
-    "modules": ["ExpoAppBlockerModule"]
+    "modules": ["ExpoAppBlockerModule", "ExpoAppBlockerPickerModule"]
   }
 }

package/ios/ExpoAppBlockerPickerModule.swift

@@ -0,0 +1,117 @@
+import ExpoModulesCore
+import FamilyControls
+import ManagedSettings
+import SwiftUI
+
+public class ExpoAppBlockerPickerModule: Module {
+  public func definition() -> ModuleDefinition {
+    Name("ExpoAppBlockerPicker")
+
+    View(FamilyActivityPickerNativeView.self) {
+      Events("onSelectionChange")
+
+      Prop("initialSelection") { (view: FamilyActivityPickerNativeView, selectionBase64: String) in
+        guard !selectionBase64.isEmpty,
+              let data = Data(base64Encoded: selectionBase64),
+              let selection = try? JSONDecoder().decode(FamilyActivitySelection.self, from: data)
+        else { return }
+        view.setInitialSelection(selection)
+      }
+    }
+  }
+}
+
+// MARK: - ViewModel
+
+class FamilyActivityPickerViewModel: ObservableObject {
+  @Published var selection = FamilyActivitySelection()
+  var didSetInitial = false
+}
+
+// MARK: - Native View (ExpoView wrapper)
+
+class FamilyActivityPickerNativeView: ExpoView {
+  let onSelectionChange = EventDispatcher()
+  let viewModel = FamilyActivityPickerViewModel()
+  private var hostingController: UIHostingController<InlinePickerContentView>?
+
+  required init(appContext: AppContext? = nil) {
+    super.init(appContext: appContext)
+    clipsToBounds = true
+
+    let contentView = InlinePickerContentView(viewModel: viewModel) { [weak self] selection in
+      self?.handleSelectionChange(selection)
+    }
+    let hc = UIHostingController(rootView: contentView)
+    hc.view.backgroundColor = .clear
+    addSubview(hc.view)
+    hostingController = hc
+  }
+
+  override func layoutSubviews() {
+    super.layoutSubviews()
+    hostingController?.view.frame = bounds
+  }
+
+  func setInitialSelection(_ selection: FamilyActivitySelection) {
+    guard !viewModel.didSetInitial else { return }
+    viewModel.didSetInitial = true
+    viewModel.selection = selection
+  }
+
+  private func handleSelectionChange(_ selection: FamilyActivitySelection) {
+    var appItems: [[String: Any]] = []
+    for token in selection.applicationTokens {
+      if let data = try? JSONEncoder().encode(token) {
+        appItems.append([
+          "type": "app",
+          "token": data.base64EncodedString()
+        ])
+      }
+    }
+
+    var categoryItems: [[String: Any]] = []
+    for token in selection.categoryTokens {
+      if let data = try? JSONEncoder().encode(token) {
+        categoryItems.append([
+          "type": "category",
+          "token": data.base64EncodedString()
+        ])
+      }
+    }
+
+    var selectionBase64 = ""
+    if let selectionData = try? JSONEncoder().encode(selection) {
+      selectionBase64 = selectionData.base64EncodedString()
+    }
+
+    let items = appItems + categoryItems
+    let summary: [String: Any] = [
+      "type": "summary",
+      "totalApps": selection.applicationTokens.count,
+      "totalCategories": selection.categoryTokens.count,
+      "selectionData": selectionBase64
+    ]
+
+    onSelectionChange([
+      "items": items + [summary],
+      "totalApps": selection.applicationTokens.count,
+      "totalCategories": selection.categoryTokens.count,
+      "selectionData": selectionBase64
+    ])
+  }
+}
+
+// MARK: - SwiftUI Content View with inline FamilyActivityPicker
+
+struct InlinePickerContentView: View {
+  @ObservedObject var viewModel: FamilyActivityPickerViewModel
+  var onSelectionChange: (FamilyActivitySelection) -> Void
+
+  var body: some View {
+    FamilyActivityPicker(selection: $viewModel.selection)
+      .onChange(of: viewModel.selection) { newSelection in
+        onSelectionChange(newSelection)
+      }
+  }
+}

package/package.json

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

@@ -61,6 +61,13 @@ export interface RelockResult {
   locked: boolean;
 }
 
+export interface FamilyActivityPickerSelectionEvent {
+  items: IOSBlockedItem[];
+  totalApps: number;
+  totalCategories: number;
+  selectionData: string;
+}
+
 // ──────────────────────────────────────────────────────────────────────────────
 // Plugin configuration types
 // ──────────────────────────────────────────────────────────────────────────────

package/src/index.ts

@@ -15,6 +15,7 @@ import type {
   IOSBlockConfiguration,
   TemporaryUnlockResult,
   RelockResult,
+  FamilyActivityPickerSelectionEvent,
 } from "./ExpoAppBlocker.types";
 
 export type {
@@ -28,6 +29,7 @@ export type {
   RelockResult,
   ShieldConfig,
   PluginConfig,
+  FamilyActivityPickerSelectionEvent,
 } from "./ExpoAppBlocker.types";
 
 // ──────────────────────────────────────────────────────────────────────────────
@@ -223,3 +225,36 @@ export function BlockedAppsNativeList({
     style: [{ minHeight: 50 }, style],
   });
 }
+
+// ──────────────────────────────────────────────────────────────────────────────
+// iOS Native View: inline FamilyActivityPicker (embedded in your UI)
+// ──────────────────────────────────────────────────────────────────────────────
+
+let NativePickerView: any = null;
+if (Platform.OS === "ios") {
+  try {
+    NativePickerView = requireNativeViewManager("ExpoAppBlockerPicker");
+  } catch {}
+}
+
+export function FamilyActivityPickerView({
+  initialSelection,
+  onSelectionChange,
+  style,
+}: {
+  /** Base64-encoded FamilyActivitySelection (from a previous picker result's selectionData) */
+  initialSelection?: string;
+  /** Called when the user changes selection in the picker */
+  onSelectionChange?: (event: FamilyActivityPickerSelectionEvent) => void;
+  style?: any;
+}) {
+  if (!NativePickerView || Platform.OS !== "ios") return null;
+
+  return React.createElement(NativePickerView, {
+    initialSelection: initialSelection || "",
+    onSelectionChange: onSelectionChange
+      ? (e: any) => onSelectionChange(e.nativeEvent)
+      : undefined,
+    style: [{ minHeight: 400 }, style],
+  });
+}

package/targets/ShieldConfiguration/ShieldConfigurationExtension.swift

@@ -59,7 +59,7 @@ class ShieldConfigurationExtension: ShieldConfigurationDataSource {
     let hasSecondary = !shieldSecondaryButtonLabel.isEmpty && shieldSecondaryButtonLabel != "none"
 
     return ShieldConfiguration(
-      backgroundBlurStyle: shieldBackgroundColor == nil ? .systemThickMaterial : nil,
+      backgroundBlurStyle: shieldBlurStyle,
       backgroundColor: shieldBackgroundColor,
       icon: mascotIcon,
       title: ShieldConfiguration.Label(text: shieldTitle, color: shieldTitleColor),