@livx.cc/appwrap 0.54.0 → 0.55.0

package/runtime/app/shell/handlers-health.ts

@@ -1,178 +0,0 @@
-import { Utils, isAndroid, isIOS } from '@nativescript/core';
-import { bridge } from './bridge';
-import { requestPermissions, startActivityForResult } from './android-helpers';
-
-declare const cc: any; // no NS types: generated Kotlin HealthConnectBridge (HealthConnectBridge.kt shim, overrides/)
-
-const err = (code: string, message: string) => Object.assign(new Error(message), { code });
-
-/** Step counting from the platform health store — today's total, global, survives an app kill.
- * iOS: HealthKit. Android: Health Connect (via the HealthConnectBridge.kt shim) with a
- * SensorManager TYPE_STEP_COUNTER fallback when Health Connect isn't available. */
-export function registerHealthHandlers(): void {
-  if (isIOS) registerIos();
-  else if (isAndroid) registerAndroid();
-}
-
-/** NSNumber/JS-number tolerant read. */
-function num(v: any): number {
-  if (typeof v === 'number') return v;
-  if (v && typeof v.doubleValue === 'number') return v.doubleValue; // NSNumber
-  const n = Number(v);
-  return Number.isFinite(n) ? n : 0;
-}
-
-function registerIos(): void {
-  // HealthKit reads the Health app's AGGREGATED step total (iPhone + Apple Watch + other sources) —
-  // recorded by the OS regardless of the app, so it's global and survives kill. Count = today's sum.
-  const store = HKHealthStore.new();
-  const stepType = HKObjectType.quantityTypeForIdentifier('HKQuantityTypeIdentifierStepCount');
-  const startOfToday = () => {
-    const d = new Date();
-    d.setHours(0, 0, 0, 0); // local midnight
-    return NSDate.dateWithTimeIntervalSince1970(d.getTime() / 1000);
-  };
-
-  bridge.register('health.requestAccess', () =>
-    new Promise((resolve) => {
-      if (!HKHealthStore.isHealthDataAvailable()) { resolve(false); return; }
-      const readSet = NSSet.setWithObject(stepType);
-      // null typesToShare (read-only request) — SDK types the param as a non-nullable NSSet.
-      store.requestAuthorizationToShareTypesReadTypesCompletion(null as any, readSet, (ok: boolean, e: NSError) => {
-        Utils.dispatchToMainThread(() => resolve(!!ok && !e));
-      });
-    })
-  );
-
-  bridge.register('health.start', () => {
-    if (!HKHealthStore.isHealthDataAvailable()) throw err('UNSUPPORTED', 'HealthKit unavailable on this device');
-  });
-  bridge.register('health.stop', () => {});
-
-  // HKStatisticsQuery completion fires off-main — settle the bridge promise on the main thread so the
-  // WKWebView response delivery (evaluateJavaScript) is main-thread.
-  bridge.register('health.count', () =>
-    new Promise((resolve, reject) => {
-      // NS marshals NSDate→the SDK's `Date` param type; options 0 = HKQueryOptions.None.
-      const predicate = HKQuery.predicateForSamplesWithStartDateEndDateOptions(
-        startOfToday() as unknown as Date, NSDate.date() as unknown as Date, HKQueryOptions.None
-      );
-      const q = HKStatisticsQuery.alloc().initWithQuantityTypeQuantitySamplePredicateOptionsCompletionHandler(
-        stepType, predicate, HKStatisticsOptions.CumulativeSum, (_q: HKStatisticsQuery, stats: HKStatistics, e: NSError) => {
-          Utils.dispatchToMainThread(() => {
-            if (e) { reject(err('NATIVE_ERROR', e.localizedDescription ?? 'health query failed')); return; }
-            const sum = stats && stats.sumQuantity ? stats.sumQuantity() : null;
-            resolve({ steps: sum ? Math.round(sum.doubleValueForUnit(HKUnit.countUnit())) : 0 });
-          });
-        }
-      );
-      store.executeQuery(q);
-    })
-  );
-
-  // ── Live steps (CMPedometer) — low-latency "as you walk" count, distinct from the laggy HealthKit
-  // aggregate. Caller uses HealthKit as the periodic source-of-truth and these live deltas in between.
-  // Emits `health.liveStep` { steps } (today's pedometer total since local midnight). iPhone-only
-  // (no Watch), which is fine: it's the live driver; HealthKit re-anchors the authoritative total.
-  let pedometer: CMPedometer | null = null;
-  let anchorDay = -1; // local day-of-month the current stream is anchored to (for midnight re-anchor)
-  const localDay = () => new Date().getDate();
-  const startStream = () => {
-    if (!pedometer) return;
-    anchorDay = localDay();
-    // startOfToday() returns an NSDate; the SDK types `start` as JS Date but NativeScript marshals it.
-    pedometer.startPedometerUpdatesFromDateWithHandler(startOfToday() as unknown as Date, (data: CMPedometerData, e: NSError) => {
-      if (e || !data) return;
-      // Midnight self-heal: CMPedometer counts since the FIXED anchor date, so after local midnight
-      // numberOfSteps still includes yesterday. When the day rolls over, restart from the new
-      // midnight (re-anchors to 0) so the live count stays "today only".
-      if (localDay() !== anchorDay) { Utils.dispatchToMainThread(() => { pedometer?.stopPedometerUpdates(); startStream(); bridge.emit('health.liveStep', { steps: 0 }); }); return; }
-      const steps = Math.round(num(data.numberOfSteps));
-      Utils.dispatchToMainThread(() => bridge.emit('health.liveStep', { steps }));
-    });
-  };
-  bridge.register('health.liveSteps.start', () => {
-    if (typeof CMPedometer === 'undefined' || !CMPedometer.isStepCountingAvailable())
-      throw err('UNSUPPORTED', 'Pedometer (live step counting) unavailable on this device');
-    // Motion & Fitness denied/restricted → surface it so the caller can fall back to HealthKit instead
-    // of silently receiving no events.
-    const auth = typeof CMPedometer.authorizationStatus === 'function'
-      ? CMPedometer.authorizationStatus()
-      : CMAuthorizationStatus.NotDetermined;
-    if (auth === CMAuthorizationStatus.Denied || auth === CMAuthorizationStatus.Restricted)
-      throw err('DENIED', 'Motion & Fitness access is off for live step counting');
-    if (pedometer) return; // already streaming
-    pedometer = CMPedometer.new();
-    startStream();
-  });
-  bridge.register('health.liveSteps.stop', () => {
-    pedometer?.stopPedometerUpdates();
-    pedometer = null;
-  });
-}
-
-function registerAndroid(): void {
-  const ctx = () => Utils.android.getApplicationContext();
-  const HCB = () => cc.livx.appwrap.HealthConnectBridge;
-  // Primary path = Health Connect (system store, Wear-inclusive, survives kill). Cached once.
-  let hc: boolean | null = null;
-  const hcAvailable = () => {
-    if (hc == null) {
-      try { hc = !!HCB().isAvailable(ctx()); } catch (e) { hc = false; }
-    }
-    return hc;
-  };
-
-  // ── sensor fallback (TYPE_STEP_COUNTER) — when Health Connect isn't available ──
-  let sensorManager: android.hardware.SensorManager | null = null;
-  let listener: android.hardware.SensorEventListener | null = null;
-  let baseline: number | null = null;
-  let latest: number | null = null;
-  let registered = false;
-  const ensureSensor = () => {
-    // getSystemService is typed `any` by the SDK; narrow to the concrete manager.
-    if (!sensorManager) sensorManager = ctx().getSystemService(android.content.Context.SENSOR_SERVICE) as android.hardware.SensorManager;
-  };
-  const stopSensor = () => {
-    if (registered && sensorManager && listener) { sensorManager.unregisterListener(listener); registered = false; }
-  };
-  const startSensor = () => {
-    ensureSensor();
-    const sensor = sensorManager!.getDefaultSensor(android.hardware.Sensor.TYPE_STEP_COUNTER);
-    if (!sensor) throw err('UNSUPPORTED', 'No step-counter sensor on this device');
-    stopSensor();
-    baseline = null;
-    latest = null;
-    listener = new android.hardware.SensorEventListener({
-      onSensorChanged: (ev: android.hardware.SensorEvent) => { const v = num(ev.values[0]); latest = v; if (baseline == null) baseline = v; },
-      onAccuracyChanged: () => {},
-    });
-    sensorManager!.registerListener(listener, sensor, android.hardware.SensorManager.SENSOR_DELAY_NORMAL);
-    registered = true;
-  };
-  const sensorCount = () => ({ steps: baseline != null && latest != null ? Math.max(0, Math.round(latest - baseline)) : 0 });
-
-  bridge.register('health.requestAccess', async () => {
-    if (hcAvailable()) {
-      // Launch the Health Connect permission UI, then re-check what was granted.
-      await startActivityForResult(HCB().permissionIntent(ctx())).catch((e) => console.warn('[health] HC permission intent failed', e));
-      return new Promise((resolve) =>
-        HCB().hasPermission(ctx(), new (HCB().BoolCallback)({ onResult: (g: boolean) => resolve(!!g) }))
-      );
-    }
-    return requestPermissions(['android.permission.ACTIVITY_RECOGNITION']);
-  });
-
-  bridge.register('health.start', () => { if (!hcAvailable()) startSensor(); });
-  bridge.register('health.stop', () => { if (!hcAvailable()) stopSensor(); });
-
-  bridge.register('health.count', () => {
-    if (hcAvailable()) {
-      // Health Connect: today's aggregated total (dedupes across sources incl. Wear).
-      return new Promise((resolve) =>
-        HCB().readTodaySteps(ctx(), new (HCB().LongCallback)({ onResult: (v: any) => { const n = Number(v); resolve({ steps: n > 0 ? n : 0 }); } }))
-      );
-    }
-    return sensorCount();
-  });
-}

package/runtime/app/shell/handlers-widget.ts

@@ -1,97 +0,0 @@
-import { Application, ImageSource, Utils, isAndroid, isIOS } from '@nativescript/core';
-import { bridge } from './bridge';
-
-// WidgetKit's WidgetCenter is Swift-only (no ObjC API) → unreachable from NS directly. The widget
-// module ships an @objc shim (AppwrapWidgetReload) in the app to bridge reloadAllTimelines():
-declare const AppwrapWidgetReload: any;
-
-const err = (code: string, message: string) => Object.assign(new Error(message), { code });
-
-// Shared-store key per widget kind, so a `data` publish never clobbers the `launcher` grid.
-const payloadKeyFor = (slot?: string) => (slot === 'data' ? 'appwrap.widget.data' : 'appwrap.widget');
-const PREFS_NAME = 'appwrap.widget';         // Android SharedPreferences file (keyed per slot inside)
-
-/** iOS App Group id — `group.<bundleId>`, matching what the CLI stamps onto both targets. */
-function iosAppGroup(): string {
-  return 'group.' + NSBundle.mainBundle.bundleIdentifier;
-}
-
-/** Download an image to a PNG file, returning the saved filename (or null on failure). Reused for
- *  iOS (App Group container) and Android (files dir). */
-async function saveIcon(url: string, dir: string, filename: string): Promise<string | null> {
-  try {
-    const img = await ImageSource.fromUrl(url);
-    const dest = dir.replace(/\/$/, '') + '/' + filename;
-    if (img?.saveToFile(dest, 'png')) return filename;
-  } catch (e) {
-    console.log('widget: icon fetch failed (' + url + '): ' + e);
-  }
-  return null;
-}
-
-type PublishEntry = { label: string; sublabel?: string; deepLink?: string; iconUrl?: string; icon?: string; badge?: number };
-type PublishPayload = {
-  template?: 'icon-grid' | 'stat' | 'list';
-  title?: string;
-  entries?: PublishEntry[];
-  stat?: { value: string; label?: string; sublabel?: string };
-  deepLink?: string;
-  slot?: 'launcher' | 'data';
-};
-
-export function registerWidgetHandlers(): void {
-  // Publish a payload the home-screen widget renders. Downloads any entry.iconUrl into the shared
-  // container (→ entry.icon filename) and writes the JSON to the App Group (iOS) / SharedPreferences
-  // (Android), then asks the OS to reload the widget. Pass `{}`/no entries to clear.
-  bridge.register('widget.publish', async (payload: PublishPayload) => {
-    const template = payload?.template ?? 'icon-grid';
-    const entries = (payload?.entries ?? []).filter((e) => e && e.label);
-    const key = payloadKeyFor(payload?.slot);
-
-    if (isIOS) {
-      const group = iosAppGroup();
-      const containerDir = NSFileManager.defaultManager
-        .containerURLForSecurityApplicationGroupIdentifier(group)?.path;
-      // fetch icons into the container (in parallel), rewriting iconUrl → icon filename (slot-scoped
-      // so a launcher/data publish never overwrites the other's tiles)
-      const prefix = payload?.slot === 'data' ? 'd' : 'l';
-      if (containerDir) {
-        await Promise.all(entries.map(async (e, i) => {
-          if (e.iconUrl) e.icon = (await saveIcon(e.iconUrl, containerDir, `${prefix}_${i}.png`)) ?? undefined;
-          delete e.iconUrl;
-        }));
-      }
-      const json = JSON.stringify({ template, title: payload.title, entries, stat: payload.stat, deepLink: payload.deepLink });
-      const defaults = NSUserDefaults.alloc().initWithSuiteName(group);
-      defaults?.setObjectForKey(json, key);
-      if (typeof AppwrapWidgetReload !== 'undefined') AppwrapWidgetReload.reloadAll();
-      return { published: true };
-    }
-
-    if (isAndroid) {
-      // Android ships the launcher widget only; a `data`-slot publish still persists (for a future
-      // data provider) but there's no receiver to refresh, so it's a no-op render-wise today.
-      const ctx = Utils.android.getApplicationContext();
-      const filesDir = ctx.getFilesDir().getAbsolutePath();
-      const prefix = payload?.slot === 'data' ? 'd' : 'l';
-      await Promise.all(entries.map(async (e, i) => {
-        if (e.iconUrl) e.icon = (await saveIcon(e.iconUrl, filesDir, `${prefix}_${i}.png`)) ?? undefined;
-        delete e.iconUrl;
-      }));
-      const json = JSON.stringify({ template, title: payload.title, entries, stat: payload.stat, deepLink: payload.deepLink });
-      ctx.getSharedPreferences(PREFS_NAME, 0).edit().putString(key, json).apply();
-      if (payload?.slot === 'data') return { published: true };
-      // Kick the provider to re-render: broadcast an APPWIDGET_UPDATE to our widget ids.
-      const mgr = android.appwidget.AppWidgetManager.getInstance(ctx);
-      const cn = new android.content.ComponentName(ctx, 'cc.livx.appwrap.AppwrapWidgetProvider');
-      const ids = mgr.getAppWidgetIds(cn);
-      const intent = new android.content.Intent(android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE);
-      intent.setComponent(cn);
-      intent.putExtra(android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_IDS, ids);
-      ctx.sendBroadcast(intent);
-      return { published: true };
-    }
-
-    return { published: false, reason: 'unsupported' as const };
-  });
-}

package/runtime/modules-native/billing/App_Resources/iOS/src/AppwrapManageSubscriptions.swift

@@ -1,44 +0,0 @@
-import Foundation
-import StoreKit
-import UIKit
-
-// StoreKit 2's `AppStore.showManageSubscriptions(in:)` is Swift-only + async, so it can't be reached
-// from the ObjC bridge NativeScript uses. This @objc wrapper bridges the async call to a completion
-// callback (NativeScript can't await Swift async) and runs it on the main actor against the active
-// foreground UIWindowScene. Shipped via the billing module's nativeSrc → compiled only when `billing`
-// is active. iOS 15+ (StoreKit 2); the JS layer guards the deep-link fallback.
-//
-// NOTE: this sheet presents/dismisses WITHOUT the app scene leaving foregroundActive, so iOS fires no
-// resumeEvent and leaves an orphaned interactive tracking-window above ours that swallows touches. The
-// JS handler recovers from THIS completion via `CustomWebView.recoverAfterNativeSurface()` (shared with
-// every other native surface) — so this shim only needs to present + report success/failure.
-@objc(AppwrapManageSubscriptions)
-public final class AppwrapManageSubscriptions: NSObject {
-  // completion(nil) on success; completion(message) on failure. Always invoked on the main thread so
-  // the NS JS continuation (which then drives the WebView recovery) resumes on the UI thread.
-  @objc public static func present(_ completion: @escaping (String?) -> Void) {
-    guard #available(iOS 15.0, *) else {
-      completion("StoreKit 2 manage-subscriptions sheet requires iOS 15+")
-      return
-    }
-    Task { @MainActor in
-      guard let scene = AppwrapManageSubscriptions.activeWindowScene() else {
-        completion("No active UIWindowScene to present the subscriptions sheet")
-        return
-      }
-      do {
-        try await AppStore.showManageSubscriptions(in: scene)
-        completion(nil)
-      } catch {
-        completion(error.localizedDescription)
-      }
-    }
-  }
-
-  // The foreground-active window scene (the one allowed to present UI). Falls back to any connected
-  // window scene so a not-yet-foreground launch still finds a presenter.
-  @MainActor private static func activeWindowScene() -> UIWindowScene? {
-    let scenes = UIApplication.shared.connectedScenes.compactMap { $0 as? UIWindowScene }
-    return scenes.first { $0.activationState == .foregroundActive } ?? scenes.first
-  }
-}

package/runtime/modules-native/health/App_Resources/Android/src/main/java/cc/livx/appwrap/HealthConnectBridge.kt

@@ -1,74 +0,0 @@
-package cc.livx.appwrap
-
-import android.content.Context
-import android.content.Intent
-import androidx.health.connect.client.HealthConnectClient
-import androidx.health.connect.client.PermissionController
-import androidx.health.connect.client.permission.HealthPermission
-import androidx.health.connect.client.records.StepsRecord
-import androidx.health.connect.client.request.AggregateRequest
-import androidx.health.connect.client.time.TimeRangeFilter
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.time.Instant
-import java.time.LocalDate
-import java.time.ZoneId
-
-/**
- * NS-callable bridge over Health Connect (whose client API is Kotlin-`suspend`-only). Wraps each
- * suspend call in a coroutine and delivers the result through a plain callback ON THE MAIN THREAD —
- * so the JS continuation (and the WebView response delivery) runs on the UI thread. Shipped via the
- * app's overrides/ until the framework grows first-class Health Connect support.
- */
-object HealthConnectBridge {
-    interface LongCallback { fun onResult(value: Long) }
-    interface BoolCallback { fun onResult(value: Boolean) }
-
-    private val READ_STEPS = HealthPermission.getReadPermission(StepsRecord::class)
-
-    @JvmStatic
-    fun isAvailable(context: Context): Boolean =
-        HealthConnectClient.getSdkStatus(context) == HealthConnectClient.SDK_AVAILABLE
-
-    /** Intent that launches the Health Connect permission UI (for startActivityForResult). */
-    @JvmStatic
-    fun permissionIntent(context: Context): Intent =
-        PermissionController.createRequestPermissionResultContract().createIntent(context, setOf(READ_STEPS))
-
-    @JvmStatic
-    fun hasPermission(context: Context, cb: BoolCallback) {
-        val client = HealthConnectClient.getOrCreate(context)
-        CoroutineScope(Dispatchers.IO).launch {
-            val granted = try {
-                client.permissionController.getGrantedPermissions().contains(READ_STEPS)
-            } catch (e: Exception) { false }
-            withContext(Dispatchers.Main) { cb.onResult(granted) }
-        }
-    }
-
-    /** Today's total steps. Prefers `aggregate` (dedupes across sources incl. Wear on real devices);
-     * falls back to summing raw records when aggregate yields null (a known HC quirk — e.g. the
-     * emulator provider / a single app's manual records). Returns -1 when permission isn't granted. */
-    private suspend fun todayTotal(client: HealthConnectClient): Long {
-        val zone = ZoneId.systemDefault()
-        val range = TimeRangeFilter.between(LocalDate.now(zone).atStartOfDay(zone).toInstant(), Instant.now())
-        val agg = client.aggregate(AggregateRequest(setOf(StepsRecord.COUNT_TOTAL), range))[StepsRecord.COUNT_TOTAL]
-        if (agg != null) return agg
-        val read = client.readRecords(androidx.health.connect.client.request.ReadRecordsRequest(StepsRecord::class, range))
-        return read.records.sumOf { it.count }
-    }
-
-    @JvmStatic
-    fun readTodaySteps(context: Context, cb: LongCallback) {
-        val client = HealthConnectClient.getOrCreate(context)
-        CoroutineScope(Dispatchers.IO).launch {
-            val result: Long = try {
-                if (!client.permissionController.getGrantedPermissions().contains(READ_STEPS)) -1L
-                else todayTotal(client)
-            } catch (e: Exception) { -2L }
-            withContext(Dispatchers.Main) { cb.onResult(result) }
-        }
-    }
-}

package/runtime/modules-native/widget/App_Resources/Android/src/main/java/cc/livx/appwrap/AppwrapWidgetProvider.kt

@@ -1,118 +0,0 @@
-package cc.livx.appwrap
-
-import android.app.PendingIntent
-import android.appwidget.AppWidgetManager
-import android.appwidget.AppWidgetProvider
-import android.content.Context
-import android.content.Intent
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.graphics.BitmapShader
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.graphics.RectF
-import android.graphics.Shader
-import android.net.Uri
-import android.view.View
-import android.widget.RemoteViews
-import org.json.JSONObject
-import java.io.File
-
-/**
- * Home-screen launcher widget (Android parity of the iOS WidgetKit launcher). Reads the payload the
- * `widget.publish` handler wrote into SharedPreferences ("appwrap.widget" / key "appwrap.widget") and
- * renders up to 12 icon-grid tiles across 4 columns; each tile deep-links back into the app via its
- * entry's URL. Icons are PNGs the handler saved into the app files dir. Resource ids are looked up by
- * name so the module needs no compile-time reference to the host app's R class.
- */
-class AppwrapWidgetProvider : AppWidgetProvider() {
-    private val columns = 4
-    private val tiles = (0 until 12).map { "tile$it" }
-    private val rows = (0 until 3).map { "row$it" }
-
-    override fun onUpdate(ctx: Context, mgr: AppWidgetManager, ids: IntArray) {
-        for (id in ids) render(ctx, mgr, id)
-    }
-
-    private fun res(ctx: Context, type: String, name: String) =
-        ctx.resources.getIdentifier(name, type, ctx.packageName)
-
-    /**
-     * Round an app icon to look native on the home screen (iOS-parity: iOS clips to a
-     * RoundedRectangle ~24% of the icon size). RemoteViews ImageViews can't clip via an outline, so we
-     * center-crop the source to a square and redraw it into a rounded bitmap at full source resolution
-     * — the widget host then downscales a crisp, antialiased image rather than a hard-edged square.
-     */
-    private fun rounded(src: Bitmap): Bitmap {
-        val size = minOf(src.width, src.height)
-        val sq = if (src.width != src.height)
-            Bitmap.createBitmap(src, (src.width - size) / 2, (src.height - size) / 2, size, size)
-        else src
-        val out = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888)
-        val canvas = Canvas(out)
-        val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
-            shader = BitmapShader(sq, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP)
-        }
-        val r = size * 0.22f
-        canvas.drawRoundRect(RectF(0f, 0f, size.toFloat(), size.toFloat()), r, r, paint)
-        return out
-    }
-
-    private fun render(ctx: Context, mgr: AppWidgetManager, id: Int) {
-        val rv = RemoteViews(ctx.packageName, res(ctx, "layout", "appwrap_widget"))
-        val raw = ctx.getSharedPreferences("appwrap.widget", Context.MODE_PRIVATE)
-            .getString("appwrap.widget", null)
-        val payload = raw?.let { runCatching { JSONObject(it) }.getOrNull() }
-        val title = payload?.optString("title") ?: ""
-        rv.setTextViewText(res(ctx, "id", "appwrap_widget_title"), title)
-        rv.setViewVisibility(res(ctx, "id", "appwrap_widget_title"),
-            if (title.isEmpty()) View.GONE else View.VISIBLE)
-        val entries = payload?.optJSONArray("entries")
-        val count = entries?.length() ?: 0
-
-        // A row with no entries at all is GONE so it contributes no height (the grid stays top-packed
-        // and leftover widget height falls to the bottom). A row that is only PARTLY filled stays
-        // VISIBLE and hides its trailing tiles as INVISIBLE, so a short final row keeps its tiles in
-        // the leading columns rather than centring them (iOS Grid's short-final-row behaviour).
-        for (r in rows.indices) {
-            rv.setViewVisibility(res(ctx, "id", rows[r]),
-                if (r * columns < count) View.VISIBLE else View.GONE)
-        }
-
-        for (i in tiles.indices) {
-            val tileId = res(ctx, "id", tiles[i])
-            val e = if (entries != null && i < count) entries.optJSONObject(i) else null
-            if (e == null) { rv.setViewVisibility(tileId, View.INVISIBLE); continue }
-            rv.setViewVisibility(tileId, View.VISIBLE)
-            rv.setTextViewText(res(ctx, "id", "${tiles[i]}_label"), e.optString("label"))
-            // unread-count badge on the icon's top-right corner (absent/0 → hidden)
-            val badgeId = res(ctx, "id", "${tiles[i]}_badge")
-            val badge = e.optInt("badge", 0)
-            if (badge > 0) {
-                rv.setTextViewText(badgeId, if (badge > 99) "99+" else badge.toString())
-                rv.setViewVisibility(badgeId, View.VISIBLE)
-            } else rv.setViewVisibility(badgeId, View.GONE)
-            val icon = e.optString("icon", "")
-            if (icon.isNotEmpty()) {
-                val f = File(ctx.filesDir, icon)
-                if (f.exists()) BitmapFactory.decodeFile(f.absolutePath)
-                    ?.let { rv.setImageViewBitmap(res(ctx, "id", "${tiles[i]}_icon"), rounded(it)) }
-            }
-            val link = e.optString("deepLink", "")
-            if (link.isNotEmpty()) {
-                // Target the app's OWN launch activity explicitly + carry the deep link as data — the
-                // shell reads intent.getData() (like a pinned shortcut). Relying on an ACTION_VIEW
-                // intent-filter match would need an App Links autoVerify filter for https hosts, which
-                // the shell doesn't declare; an explicit component always opens the app.
-                val intent = (ctx.packageManager.getLaunchIntentForPackage(ctx.packageName)
-                    ?: Intent(Intent.ACTION_VIEW).setPackage(ctx.packageName))
-                    .setAction(Intent.ACTION_VIEW)
-                    .setData(Uri.parse(link))
-                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
-                val flags = PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-                rv.setOnClickPendingIntent(tileId, PendingIntent.getActivity(ctx, i, intent, flags))
-            }
-        }
-        mgr.updateAppWidget(id, rv)
-    }
-}

package/runtime/modules-native/widget/App_Resources/Android/src/main/res/drawable/appwrap_badge_bg.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Red circular/pill background for the widget tile's unread-count badge (iOS-parity Capsule).
-     Large corner radius → a true circle for single digits, a pill for 2+. White ring lifts it off
-     the icon. -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="#FF3B30" />
-    <stroke android:width="1.5dp" android:color="#FFFFFF" />
-    <corners android:radius="100dp" />
-</shape>

package/runtime/modules-native/widget/App_Resources/Android/src/main/res/layout/appwrap_widget.xml

@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- AppWrap launcher widget: title + a 4-column icon grid of deep-linked tiles (up to 3 rows / 12
-     tiles), populated by AppwrapWidgetProvider from the published payload.
-
-     LAYOUT CONTRACT (iOS parity — see AppwrapWidget.swift `gridView`):
-       * Rows are CONTENT-HEIGHT (wrap_content, NO layout_weight). The root is a vertical
-         LinearLayout at match_parent, so rows stack from the TOP and any leftover widget height
-         falls to the BOTTOM — the "app folder" feel. Giving rows `0dp + weight=1` (as this layout
-         once did) makes them greedily split the full height and float each icon to the centre of
-         its band, which strands the last row at the bottom behind a large dead gap on a
-         vertically-resized widget. Don't reintroduce weights here.
-       * A partially-filled row keeps its trailing tiles INVISIBLE (not GONE) so the short final row
-         stays aligned to the LEADING columns instead of centring. A fully-empty row is set GONE by
-         the provider so it consumes no height. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@color/appwrap_widget_bg"
-    android:padding="10dp">
-
-    <TextView
-        android:id="@+id/appwrap_widget_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="@color/appwrap_widget_title"
-        android:textStyle="bold"
-        android:textSize="12sp"
-        android:layout_marginBottom="8dp"
-        android:maxLines="1"
-        android:ellipsize="end" />
-
-    <LinearLayout android:id="@+id/row0" style="@style/AppwrapWidgetRow">
-        <LinearLayout android:id="@+id/tile0" style="@style/AppwrapWidgetTile">
-            <FrameLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="4dp">
-                <ImageView android:id="@+id/tile0_icon" style="@style/AppwrapWidgetIcon" />
-                <TextView android:id="@+id/tile0_badge" style="@style/AppwrapWidgetBadge" android:visibility="gone" />
-            </FrameLayout>
-            <TextView android:id="@+id/tile0_label" style="@style/AppwrapWidgetLabel" />
-        </LinearLayout>
-        <LinearLayout android:id="@+id/tile1" style="@style/AppwrapWidgetTile">
-            <FrameLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="4dp">
-                <ImageView android:id="@+id/tile1_icon" style="@style/AppwrapWidgetIcon" />
-                <TextView android:id="@+id/tile1_badge" style="@style/AppwrapWidgetBadge" android:visibility="gone" />
-            </FrameLayout>
-            <TextView android:id="@+id/tile1_label" style="@style/AppwrapWidgetLabel" />
-        </LinearLayout>
-        <LinearLayout android:id="@+id/tile2" style="@style/AppwrapWidgetTile">
-            <FrameLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="4dp">
-                <ImageView android:id="@+id/tile2_icon" style="@style/AppwrapWidgetIcon" />
-                <TextView android:id="@+id/tile2_badge" style="@style/AppwrapWidgetBadge" android:visibility="gone" />
-            </FrameLayout>
-            <TextView android:id="@+id/tile2_label" style="@style/AppwrapWidgetLabel" />
-        </LinearLayout>
-        <LinearLayout android:id="@+id/tile3" style="@style/AppwrapWidgetTile">
-            <FrameLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="4dp">
-                <ImageView android:id="@+id/tile3_icon" style="@style/AppwrapWidgetIcon" />
-                <TextView android:id="@+id/tile3_badge" style="@style/AppwrapWidgetBadge" android:visibility="gone" />
-            </FrameLayout>
-            <TextView android:id="@+id/tile3_label" style="@style/AppwrapWidgetLabel" />
-        </LinearLayout>
-    </LinearLayout>
-    <LinearLayout android:id="@+id/row1" style="@style/AppwrapWidgetRow">
-        <LinearLayout android:id="@+id/tile4" style="@style/AppwrapWidgetTile">
-            <FrameLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="4dp">
-                <ImageView android:id="@+id/tile4_icon" style="@style/AppwrapWidgetIcon" />
-                <TextView android:id="@+id/tile4_badge" style="@style/AppwrapWidgetBadge" android:visibility="gone" />
-            </FrameLayout>
-            <TextView android:id="@+id/tile4_label" style="@style/AppwrapWidgetLabel" />
-        </LinearLayout>
-        <LinearLayout android:id="@+id/tile5" style="@style/AppwrapWidgetTile">
-            <FrameLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="4dp">
-                <ImageView android:id="@+id/tile5_icon" style="@style/AppwrapWidgetIcon" />
-                <TextView android:id="@+id/tile5_badge" style="@style/AppwrapWidgetBadge" android:visibility="gone" />
-            </FrameLayout>
-            <TextView android:id="@+id/tile5_label" style="@style/AppwrapWidgetLabel" />
-        </LinearLayout>
-        <LinearLayout android:id="@+id/tile6" style="@style/AppwrapWidgetTile">
-            <FrameLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="4dp">
-                <ImageView android:id="@+id/tile6_icon" style="@style/AppwrapWidgetIcon" />
-                <TextView android:id="@+id/tile6_badge" style="@style/AppwrapWidgetBadge" android:visibility="gone" />
-            </FrameLayout>
-            <TextView android:id="@+id/tile6_label" style="@style/AppwrapWidgetLabel" />
-        </LinearLayout>
-        <LinearLayout android:id="@+id/tile7" style="@style/AppwrapWidgetTile">
-            <FrameLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="4dp">
-                <ImageView android:id="@+id/tile7_icon" style="@style/AppwrapWidgetIcon" />
-                <TextView android:id="@+id/tile7_badge" style="@style/AppwrapWidgetBadge" android:visibility="gone" />
-            </FrameLayout>
-            <TextView android:id="@+id/tile7_label" style="@style/AppwrapWidgetLabel" />
-        </LinearLayout>
-    </LinearLayout>
-    <LinearLayout android:id="@+id/row2" style="@style/AppwrapWidgetRow">
-        <LinearLayout android:id="@+id/tile8" style="@style/AppwrapWidgetTile">
-            <FrameLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="4dp">
-                <ImageView android:id="@+id/tile8_icon" style="@style/AppwrapWidgetIcon" />
-                <TextView android:id="@+id/tile8_badge" style="@style/AppwrapWidgetBadge" android:visibility="gone" />
-            </FrameLayout>
-            <TextView android:id="@+id/tile8_label" style="@style/AppwrapWidgetLabel" />
-        </LinearLayout>
-        <LinearLayout android:id="@+id/tile9" style="@style/AppwrapWidgetTile">
-            <FrameLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="4dp">
-                <ImageView android:id="@+id/tile9_icon" style="@style/AppwrapWidgetIcon" />
-                <TextView android:id="@+id/tile9_badge" style="@style/AppwrapWidgetBadge" android:visibility="gone" />
-            </FrameLayout>
-            <TextView android:id="@+id/tile9_label" style="@style/AppwrapWidgetLabel" />
-        </LinearLayout>
-        <LinearLayout android:id="@+id/tile10" style="@style/AppwrapWidgetTile">
-            <FrameLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="4dp">
-                <ImageView android:id="@+id/tile10_icon" style="@style/AppwrapWidgetIcon" />
-                <TextView android:id="@+id/tile10_badge" style="@style/AppwrapWidgetBadge" android:visibility="gone" />
-            </FrameLayout>
-            <TextView android:id="@+id/tile10_label" style="@style/AppwrapWidgetLabel" />
-        </LinearLayout>
-        <LinearLayout android:id="@+id/tile11" style="@style/AppwrapWidgetTile">
-            <FrameLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="4dp">
-                <ImageView android:id="@+id/tile11_icon" style="@style/AppwrapWidgetIcon" />
-                <TextView android:id="@+id/tile11_badge" style="@style/AppwrapWidgetBadge" android:visibility="gone" />
-            </FrameLayout>
-            <TextView android:id="@+id/tile11_label" style="@style/AppwrapWidgetLabel" />
-        </LinearLayout>
-    </LinearLayout>
-</LinearLayout>