fix icons

Author: heapwolf

socket.ini

@@ -186,6 +186,9 @@ version = 1.0.0
 ; The icon to use for identifying your app on Android.
 icon = "icons/icon.png"
 
+; The various sizes and scales of the icons to create, required minimum are listed by default.
+icon_sizes = "512@1x"
+
 ; Extensions of files that will not be stored compressed in the APK.
 aapt_no_compress = ""
 
@@ -226,6 +229,11 @@ simulator_device = "iPhone 14"
 ; default value: false
 ; nonexempt_encryption = false
 
+; iOS icon!
+icon ="icons/icon.png"
+
+; The various sizes and scales of the icons to create, required minimum are listed by default.
+icon_sizes = "20@1x 20@2x 20@3x"
 
 [linux]
 ; Helps to make your app searchable in Linux desktop environments.
@@ -237,6 +245,9 @@ categories = "Developer Tools"
 ; The icon to use for identifying your app in Linux desktop environments.
 icon = "icons/icon.png"
 
+; The various sizes and scales of the icons to create, required minimum are listed by default.
+icon_sizes = "512@1x"
+
 
 [mac]
 
@@ -246,9 +257,6 @@ category = ""
 ; The command to execute to spawn the "back-end" process.
 ; cmd = "node backend/index.js"
 
-; The icon to use for identifying your app on MacOS.
-icon = "icons/icon.png"
-
 ; TODO Signing guide: https://socketsupply.co/guides/#code-signing-certificates
 codesign_identity = ""
 
@@ -260,6 +268,13 @@ codesign_paths = ""
 ; minimum_supported_version = "13.0.0"
 
 
+; The icon to use for identifying your app on MacOS.
+icon = "icons/icon.png"
+
+; The various sizes and scales of the icons to create, required minimum are listed by default.
+icon_sizes = "16@1x 32@1x 128@1x"
+
+
 [native]
 
 ; Files that should be added to the compile step.
@@ -286,6 +301,9 @@ logo = "icons/icon.ico"
 ; The signing information needed by the appx api.
 ; publisher = "CN=Beep Boop Corp., O=Beep Boop Corp., L=San Francisco, S=California, C=US"
 
+; The various sizes and scales of the icons to create, required minimum are listed by default.
+icon_sizes = "512@1x"
+
 
 [window]
 

src/icon/index.js

@@ -51,9 +51,8 @@ export function resizePNG (imageArrayBuffer, size) {
 /**
  * Converts a PNG file to an ICO file.
  * @param {string} pngFilePath Path to the source PNG file.
- * @param {string} icoFilePath Path where the ICO file will be saved.
  */
-export async function convertToICO (bytes, icoFilePath) {
+export async function convertToICO (bytes) {
   const icoHeader = Buffer.alloc(6)
   icoHeader.writeUInt16LE(0, 0) // Reserved
   icoHeader.writeUInt16LE(1, 2) // Type (1 = ICO)

src/index.js

@@ -39,11 +39,25 @@ class AppView extends Tonic {
     const paths = {}
     project.walk(project.state.tree.children[0], child => {
       if (child.type === 'dir') return
-      paths[path.join(this.state.cwd, child.id)] = child.data
+
+      let dir = child.id
+      let data = child.data
+
+      if (child.id.includes('icon.assets')) {
+        if (process.platform === 'win') {
+          data = convertToICO(node.data)
+          dir = path.join('icons', 'icon.ico')
+        } else {
+          dir = path.join('icons', 'icon.png')
+        }       
+      }
+
+      paths[path.join(this.state.cwd, dir)] = data
     })
 
-    for (const [path, data] of Object.entries(paths)) {
-      await fs.promises.writeFile(path, data)
+    for (const [pathToFile, data] of Object.entries(paths)) {
+      await fs.promises.mkdir(path.dirname(pathToFile), { recursive: true })
+      await fs.promises.writeFile(pathToFile, data)
     }
 
     const args = [

src/project.js

@@ -1,6 +1,7 @@
 import fs from 'socket:fs'
 import path from 'socket:path'
 import Tonic from '@socketsupply/tonic'
+import { convertToICO } from './icon/index.js' 
 
 const EXPANDED_STATE = 1
 const CLOSED_STATE = 0
@@ -84,14 +85,6 @@ class AppProject extends Tonic {
     })
   }
 
-  exportData (prefix) {
-    this.walk(this.state.tree, node => {
-      const p = path.join(prefix, node.id)
-      fs.mkdir(path.dirname(p), { recursive: true })
-      fs.promises.writeFile(p, node.data)
-    })
-  }
-
   click (e) {
     const el = Tonic.match(e.target, '[data-path]')
     if (!el) return

src/templates/socket.ini

@@ -185,7 +185,8 @@ version = 1.0.0
 
 [android]
 ; The icon to use for identifying your app on Android.
-icon = "src/icon.png"
+icon = "icons/icon.png"
+icon_sizes = "512@1x"
 
 ; Extensions of files that will not be stored compressed in the APK.
 aapt_no_compress = ""
@@ -227,6 +228,8 @@ simulator_device = "iPhone 14"
 ; default value: false
 ; nonexempt_encryption = false
 
+icon = "icons/icon.png"
+icon_sizes = "20@1x 20@2x 20@3x"
 
 [linux]
 ; Helps to make your app searchable in Linux desktop environments.
@@ -236,7 +239,7 @@ categories = "Developer Tools"
 ; cmd = "node backend/index.js"
 
 ; The icon to use for identifying your app in Linux desktop environments.
-icon = "src/icon.png"
+icon = "icons/icon.png"
 
 
 [mac]
@@ -248,7 +251,8 @@ category = ""
 ; cmd = "node backend/index.js"
 
 ; The icon to use for identifying your app on MacOS.
-icon = "src/icon.png"
+icon = "icons/icon.png"
+icon_sizes = "16@1x 32@1x 128@1x"
 
 ; TODO Signing guide: https://socketsupply.co/guides/#code-signing-certificates
 codesign_identity = ""
@@ -276,10 +280,11 @@ headers = native-module1.hh
 ; cmd = "node backend/index.js"
 
 ; The icon to use for identifying your app on Windows.
-icon = "src/icon.ico"
+icon = "icons/icon.ico"
+icon_sizes = "16@1x 32@1x 128@1x"
 
 ; The icon to use for identifying your app on Windows, relative to copied path resources
-logo = "icon.ico"
+logo = "icons/icon.ico"
 
 ; A relative path to the pfx file used for signing.
 ; pfx = "certs/cert.pfx"
@@ -340,7 +345,7 @@ width = 50%
 [tray]
 ; The icon to be displayed in the operating system tray. On Windows, you may need to use ICO format.
 ; defalut value = ""
-; icon = "icon.png"
+; icon = "icons/icon.png"
 
 
 [headless]