nn-widgets 0.1.18 → 0.1.20

package/plugin/build/withAndroidWidget.js

@@ -41,6 +41,38 @@ 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",
@@ -247,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)
@@ -368,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)
         }
     }
@@ -386,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)
         
@@ -394,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 {
@@ -402,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)
@@ -502,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)
@@ -904,14 +997,14 @@ function generateFlexGridCellListLayoutXml(w) {
     android:layout_weight="1"
     android:orientation="horizontal"
     android:gravity="center_vertical"
-    android:paddingHorizontal="6dp"
-    android:paddingVertical="4dp">
+    android:paddingHorizontal="4dp"
+    android:paddingVertical="2dp">
 
     <ImageView
         android:id="@+id/cell_icon"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
-        android:layout_marginEnd="8dp"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginEnd="6dp"
         android:scaleType="centerCrop"
         android:visibility="gone" />
 
@@ -925,20 +1018,22 @@ function generateFlexGridCellListLayoutXml(w) {
             android:id="@+id/cell_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textSize="13sp"
+            android:textSize="12sp"
             android:textStyle="bold"
             android:textColor="${titleColor}"
             android:maxLines="1"
-            android:ellipsize="end" />
+            android:ellipsize="end"
+            android:singleLine="true" />
 
         <TextView
             android:id="@+id/cell_description"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textSize="11sp"
+            android:textSize="10sp"
             android:textColor="${subtitleColor}"
             android:maxLines="1"
             android:ellipsize="end"
+            android:singleLine="true"
             android:visibility="gone" />
     </LinearLayout>
 
@@ -957,12 +1052,12 @@ function generateFlexGridCellCardLayoutXml(w) {
     android:layout_weight="1"
     android:orientation="vertical"
     android:gravity="center"
-    android:padding="4dp">
+    android:padding="2dp">
 
     <ImageView
         android:id="@+id/cell_icon"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
+        android:layout_width="28dp"
+        android:layout_height="28dp"
         android:scaleType="centerCrop"
         android:visibility="gone" />
 
@@ -970,12 +1065,13 @@ function generateFlexGridCellCardLayoutXml(w) {
         android:id="@+id/cell_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:textSize="10sp"
+        android:layout_marginTop="2dp"
+        android:textSize="9sp"
         android:textColor="${titleColor}"
-        android:maxLines="2"
+        android:maxLines="1"
         android:ellipsize="end"
-        android:gravity="center" />
+        android:gravity="center"
+        android:singleLine="true" />
 
 </LinearLayout>
 `;
@@ -1050,6 +1146,8 @@ const withAndroidWidget = (config, props = {}) => {
                 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
@@ -1162,10 +1260,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"}