nn-widgets 0.1.17 → 0.1.19

package/plugin/build/withAndroidWidget.js

@@ -39,6 +39,70 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const withIosWidget_1 = require("./withIosWidget");
 // ──────────────────────────────────────────────
+//  Constants and helpers
+// ──────────────────────────────────────────────
+/**
+ * Copy bundled icons from nn-widgets package to app's drawable folder
+ */
+function copyBundledIcons(drawablePath) {
+    // Get the path to bundled icons in nn-widgets package
+    // The icons are in assets/android/drawable/ relative to the plugin
+    const pluginDir = __dirname;
+    const packageRoot = path.resolve(pluginDir, "..", "..");
+    const bundledIconsPath = path.join(packageRoot, "assets", "android", "drawable");
+    if (!fs.existsSync(bundledIconsPath)) {
+        console.log(`[nn-widgets] Bundled icons path not found: ${bundledIconsPath}`);
+        return 0;
+    }
+    // Copy all XML icons from bundled assets
+    const files = fs.readdirSync(bundledIconsPath);
+    let copiedCount = 0;
+    for (const file of files) {
+        if (file.endsWith(".xml") && file.startsWith("nn_icon_")) {
+            const srcPath = path.join(bundledIconsPath, file);
+            const destPath = path.join(drawablePath, file);
+            // Only copy if doesn't exist or is different
+            if (!fs.existsSync(destPath)) {
+                fs.copyFileSync(srcPath, destPath);
+                copiedCount++;
+            }
+        }
+    }
+    if (copiedCount > 0) {
+        console.log(`[nn-widgets] Copied ${copiedCount} bundled icons to drawable`);
+    }
+    return copiedCount;
+}
+// Material background names that should use blur effect on Android 12+
+const BLUR_BACKGROUNDS = [
+    "blur",
+    "ultraThinMaterial",
+    "thinMaterial",
+    "regularMaterial",
+    "thickMaterial",
+    "ultraThickMaterial",
+];
+/**
+ * Check if backgroundColor should use blur effect
+ */
+function isBlurBackground(bgColor) {
+    return bgColor ? BLUR_BACKGROUNDS.includes(bgColor) : false;
+}
+/**
+ * Resolve Android background attribute for XML.
+ * - If blur/material: use system widget background (API 31+) or transparent
+ * - Otherwise: use the color directly
+ */
+function resolveAndroidBackground(bgColor) {
+    if (!bgColor)
+        return "#FFFFFF";
+    if (isBlurBackground(bgColor)) {
+        // Will be handled by drawable resource
+        return "@drawable/widget_blur_background";
+    }
+    return bgColor;
+}
+// ──────────────────────────────────────────────
 //  Code generation helpers (per widget)
 // ──────────────────────────────────────────────
 function generateWidgetProviderCode(w, packageName, deepLinkUrl) {
@@ -215,10 +279,22 @@ class ${w.name}Provider : AppWidgetProvider() {
                         itemView.setViewVisibility(R.id.item_description, View.GONE)
                     }
                     
-                    // Parse icon
+                    // Parse icon with bundled nn_icon_ prefix support
                     val iconName = parseIconName(item)
                     if (iconName.isNotEmpty()) {
-                        val resId = context.resources.getIdentifier(iconName, "drawable", context.packageName)
+                        val normalizedName = iconName
+                            .replace("-", "_")
+                            .replace(".", "_")
+                            .replace(" ", "_")
+                            .lowercase()
+                            .replace("_fill$".toRegex(), "")
+                        
+                        // Try bundled icon first, then original name
+                        var resId = context.resources.getIdentifier("nn_icon_\$normalizedName", "drawable", context.packageName)
+                        if (resId == 0) {
+                            resId = context.resources.getIdentifier(iconName, "drawable", context.packageName)
+                        }
+                        
                         if (resId != 0) {
                             itemView.setImageViewResource(R.id.item_icon, resId)
                             itemView.setViewVisibility(R.id.item_icon, View.VISIBLE)
@@ -336,15 +412,27 @@ class ${w.name}Provider : AppWidgetProvider() {
         }
     }
 
-    override fun onEnabled(context: Context) {}
-    override fun onDisabled(context: Context) {}
+    override fun onEnabled(context: Context) {
+        android.util.Log.d("${w.name}Provider", "Widget enabled")
+    }
+    
+    override fun onDisabled(context: Context) {
+        android.util.Log.d("${w.name}Provider", "Widget disabled")
+    }
 
     override fun onReceive(context: Context, intent: Intent) {
+        android.util.Log.d("${w.name}Provider", "onReceive: \${intent.action}")
         super.onReceive(context, intent)
-        if (intent.action == "\${context.packageName}.WIDGET_UPDATE_${w.name.toUpperCase()}") {
+        
+        val expectedAction = "\${context.packageName}.WIDGET_UPDATE_${w.name.toUpperCase()}"
+        android.util.Log.d("${w.name}Provider", "Expected action: $expectedAction")
+        
+        if (intent.action == expectedAction) {
+            android.util.Log.d("${w.name}Provider", "Custom update action received, refreshing widget...")
             val appWidgetManager = AppWidgetManager.getInstance(context)
             val thisWidget = android.content.ComponentName(context, ${w.name}Provider::class.java)
             val appWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget)
+            android.util.Log.d("${w.name}Provider", "Found \${appWidgetIds.size} widget instances")
             onUpdate(context, appWidgetManager, appWidgetIds)
         }
     }
@@ -354,6 +442,8 @@ class ${w.name}Provider : AppWidgetProvider() {
         appWidgetManager: AppWidgetManager,
         appWidgetId: Int
     ) {
+        android.util.Log.d("${w.name}Provider", "updateAppWidget called for id: $appWidgetId")
+        
         val prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
         val views = RemoteViews(context.packageName, R.layout.${w.name.toLowerCase()}_layout)
         
@@ -362,6 +452,9 @@ class ${w.name}Provider : AppWidgetProvider() {
         val layoutJson = prefs.getString("widget_${w.name}_layout", null)
         val title = prefs.getString("widget_${w.name}_title", "${w.fallbackTitle}") ?: "${w.fallbackTitle}"
         val subtitle = prefs.getString("widget_${w.name}_subtitle", "${w.fallbackSubtitle}") ?: "${w.fallbackSubtitle}"
+        
+        android.util.Log.d("${w.name}Provider", "itemsJson: \${itemsJson?.take(100)}...")
+        android.util.Log.d("${w.name}Provider", "layoutJson: $layoutJson")
 
         if (itemsJson != null && layoutJson != null) {
             try {
@@ -370,6 +463,8 @@ class ${w.name}Provider : AppWidgetProvider() {
                 // Get layout for systemSmall (default) - same as iOS
                 val layout = layoutObj.optJSONArray("systemSmall") ?: JSONArray("[[1]]")
                 
+                android.util.Log.d("${w.name}Provider", "Parsed \${items.length()} items, layout rows: \${layout.length()}")
+                
                 // Hide fallback, show grid
                 views.setViewVisibility(R.id.widget_fallback, View.GONE)
                 views.setViewVisibility(R.id.widget_grid_container, View.VISIBLE)
@@ -470,19 +565,49 @@ class ${w.name}Provider : AppWidgetProvider() {
     
     private fun setupIcon(context: Context, views: RemoteViews, item: JSONObject, iconViewId: Int) {
         val iconName = parseIconName(item)
+        android.util.Log.d("${w.name}Provider", "Setting up icon: $iconName")
+        
         if (iconName.isNotEmpty()) {
-            // Try to load from drawable resources
-            val resId = context.resources.getIdentifier(
+            // Normalize icon name: remove dashes, dots, make lowercase
+            val normalizedName = iconName
+                .replace("-", "_")
+                .replace(".", "_")
+                .replace(" ", "_")
+                .lowercase()
+                .replace("_fill$".toRegex(), "") // Remove .fill suffix from iOS SF Symbols
+            
+            // Try multiple variations of the icon name, prioritizing bundled nn_icon_ prefix
+            val variations = listOf(
+                "nn_icon_\$normalizedName",     // Bundled icon with prefix (e.g., nn_icon_star)
+                normalizedName,                 // Direct name (e.g., star)
+                iconName,                       // Original name
                 iconName.replace("-", "_").lowercase(),
-                "drawable",
-                context.packageName
+                iconName.lowercase()
             )
+            
+            var resId = 0
+            for (variation in variations) {
+                resId = context.resources.getIdentifier(variation, "drawable", context.packageName)
+                if (resId != 0) {
+                    android.util.Log.d("${w.name}Provider", "Found drawable: $variation ($resId)")
+                    break
+                }
+            }
+            
             if (resId != 0) {
                 views.setImageViewResource(iconViewId, resId)
                 views.setViewVisibility(iconViewId, View.VISIBLE)
             } else {
-                // Fallback to a default icon or hide
-                views.setViewVisibility(iconViewId, View.GONE)
+                // Try to use a placeholder icon if available
+                val placeholderResId = context.resources.getIdentifier("nn_icon_star", "drawable", context.packageName)
+                if (placeholderResId != 0) {
+                    views.setImageViewResource(iconViewId, placeholderResId)
+                    views.setViewVisibility(iconViewId, View.VISIBLE)
+                    android.util.Log.d("${w.name}Provider", "Using placeholder icon")
+                } else {
+                    views.setViewVisibility(iconViewId, View.GONE)
+                    android.util.Log.w("${w.name}Provider", "Icon not found: $iconName (tried: \${variations.joinToString()})")
+                }
             }
         } else {
             views.setViewVisibility(iconViewId, View.GONE)
@@ -646,7 +771,7 @@ function generateWidgetLayoutXml(w) {
     }
     // ── List layout ──
     if (w.type === "list") {
-        const bgColor = w.style?.backgroundColor || "#FFFFFF";
+        const bgColor = resolveAndroidBackground(w.style?.backgroundColor);
         const titleColor = w.style?.titleColor || "#000000";
         const subtitleColor = w.style?.subtitleColor || "#888888";
         return `<?xml version="1.0" encoding="utf-8"?>
@@ -699,7 +824,7 @@ function generateWidgetLayoutXml(w) {
     }
     // ── Flex-grid layout ──
     if (w.type === "flex-grid") {
-        const bgColor = w.style?.backgroundColor || "#FFFFFF";
+        const bgColor = resolveAndroidBackground(w.style?.backgroundColor);
         const titleColor = w.style?.titleColor || "#000000";
         const subtitleColor = w.style?.subtitleColor || "#888888";
         return `<?xml version="1.0" encoding="utf-8"?>
@@ -751,7 +876,7 @@ function generateWidgetLayoutXml(w) {
 `;
     }
     // ── Single (default) styled text layout ──
-    const bgColor = w.style?.backgroundColor || "#FFFFFF";
+    const bgColor = resolveAndroidBackground(w.style?.backgroundColor);
     const titleColor = w.style?.titleColor || "#000000";
     const subtitleColor = w.style?.subtitleColor || "#888888";
     const accentColor = w.style?.accentColor || "#6200EE";
@@ -948,6 +1073,32 @@ function generateFlexGridCellCardLayoutXml(w) {
 </LinearLayout>
 `;
 }
+/**
+ * Generate blur background drawable for API 31+ (Android 12+)
+ * Uses the system widget background with rounded corners
+ */
+function generateBlurBackgroundDrawableV31() {
+    return `<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="16dp" />
+    <solid android:color="@android:color/system_accent1_50" />
+</shape>
+`;
+}
+/**
+ * Generate blur background drawable for pre-API 31 (fallback)
+ * Uses semi-transparent white with rounded corners
+ */
+function generateBlurBackgroundDrawableFallback() {
+    return `<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="16dp" />
+    <solid android:color="#E6FFFFFF" />
+</shape>
+`;
+}
 function generateWidgetInfoXml(w, updatePeriodMillis) {
     return `<?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
@@ -979,17 +1130,31 @@ const withAndroidWidget = (config, props = {}) => {
         const resXmlPath = path.join(androidPath, "res", "xml");
         const resValuesPath = path.join(androidPath, "res", "values");
         const resDrawablePath = path.join(androidPath, "res", "drawable");
+        const resDrawableV31Path = path.join(androidPath, "res", "drawable-v31");
         [
             widgetPackagePath,
             resLayoutPath,
             resXmlPath,
             resValuesPath,
             resDrawablePath,
+            resDrawableV31Path,
         ].forEach((dir) => {
             if (!fs.existsSync(dir)) {
                 fs.mkdirSync(dir, { recursive: true });
             }
         });
+        // Copy bundled icons from nn-widgets package to app's drawable
+        copyBundledIcons(resDrawablePath);
+        // Check if any widget uses blur background
+        const hasBlurWidget = resolvedProps.widgets.some((w) => isBlurBackground(w.style?.backgroundColor));
+        // Generate blur background drawables if needed
+        if (hasBlurWidget) {
+            // Fallback drawable (pre-API 31)
+            fs.writeFileSync(path.join(resDrawablePath, "widget_blur_background.xml"), generateBlurBackgroundDrawableFallback());
+            // API 31+ drawable
+            fs.writeFileSync(path.join(resDrawableV31Path, "widget_blur_background.xml"), generateBlurBackgroundDrawableV31());
+            console.log("[nn-widgets] Generated Android blur background drawables");
+        }
         // Generate files for each widget
         for (const w of resolvedProps.widgets) {
             // Widget provider Kotlin
@@ -1092,10 +1257,6 @@ const withAndroidWidget = (config, props = {}) => {
                                             "android:name": "android.appwidget.action.APPWIDGET_UPDATE",
                                         },
                                     },
-                                ],
-                            },
-                            {
-                                action: [
                                     {
                                         $: {
                                             "android:name": `${packageName}.WIDGET_UPDATE_${w.name.toUpperCase()}`,

package/plugin/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/index.ts","./src/types.ts","./src/withandroidwidget.ts","./src/withioswidget.ts"],"version":"5.9.3"}
+{"root":["./src/icons.ts","./src/index.ts","./src/types.ts","./src/withandroidwidget.ts","./src/withioswidget.ts"],"version":"5.9.3"}