Update linux & windows builds

.forgejo/workflows/Linux.yaml

@@ -0,0 +1,51 @@
+name: Linux Build
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  publish:
+  
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 24
+
+      - name: Install deps
+        run: npm ci
+
+      - name: Sync capacitor
+        run: npx cap sync
+
+      - name: Generate assets
+        run: npx capacitor-assets generate --pwa
+        
+      - name: Update web app
+        run: npx cap copy
+      
+      - name: Update electron app
+        run: npx cap copy electron
+
+      - name: Convert icon
+        run: magick -background none -density 300 -resize 256x256 ./assets/icon.svg ./icons/icon.png
+        
+      - name: Copy icon
+        run: cp ./icons/icon.png ./electron/assets/icon.png
+      
+      - name: Build
+        run: mkdir -p build && cd build && npx electron-packager ../electron miarven --platform=linux --arch=x64 --icon=../icons/icon.png --overwrite --asar
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: Windows
+          path: ./build/miarven-linux-x64/

.forgejo/workflows/Windows.yaml

@@ -0,0 +1,51 @@
+name: Linux Build
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  publish:
+  
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 24
+
+      - name: Install deps
+        run: npm ci
+
+      - name: Sync capacitor
+        run: npx cap sync
+
+      - name: Generate assets
+        run: npx capacitor-assets generate --pwa
+        
+      - name: Update web app
+        run: npx cap copy
+      
+      - name: Update electron app
+        run: npx cap copy electron
+
+      - name: Convert icon
+        run: magick -background none -density 300 -define icon:auto-resize=256,128,64,48,32,16 ./assets/icon.svg ./icons/icon.ico
+        
+      - name: Copy icon
+        run: cp ./icons/icon.ico ./electron/assets/icon.ico
+      
+      - name: Build
+        run: mkdir -p build && cd build && npx electron-packager ../electron miarven --platform=win32 --arch=x64 --icon=../icons/icon.png --overwrite --asar
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: Windows
+          path: ./build/miarven-win32-x64/

build-android.sh

@@ -1,2 +1,3 @@
+npx capacitor-assets generate --android
 cd android
 ./gradlew assembleRelease

build-linux.sh

@@ -1,3 +1,7 @@
+npx cap copy electron
+npx capacitor-assets generate --pwa
+magick -background none -density 300 -resize 256x256 ./assets/icon.svg ./icons/icon.png
+cp ./icons/icon.png ./electron/assets/icon.png
 mkdir build
 cd build
-npx electron-packager ../electron miarven --platform=linux --arch=x64
+npx electron-packager ../electron miarven --platform=linux --arch=x64 --icon=../icons/icon.png --overwrite --asar

build-windows.sh

@@ -1,3 +1,8 @@
+npx cap copy electron
+npx capacitor-assets generate --pwa
+magick -background none -density 300 -define icon:auto-resize=256,128,64,48,32,16 ./assets/icon.svg ./icons/icon.ico
+cp ./icons/icon.ico ./electron/assets/icon.ico
 mkdir build
 cd build
-npx electron-packager ../electron miarven --platform=win32 --arch=x64
+npx electron-packager ../electron miarven --platform=win32 --arch=x64 --icon=../icons/icon.ico --overwrite --asar
+

electron/src/setup.ts

@@ -7,7 +7,8 @@ import {
 import chokidar from 'chokidar';
 import type { MenuItemConstructorOptions } from 'electron';
 import { app, BrowserWindow, Menu, MenuItem, nativeImage, Tray, session } from 'electron';
-import electronIsDev from 'electron-is-dev';
+//import electronIsDev from 'electron-is-dev';
+var electronIsDev = false;
 import electronServe from 'electron-serve';
 import windowStateKeeper from 'electron-window-state';
 import { join } from 'path';
@@ -99,8 +100,14 @@ export class ElectronCapacitorApp {
 
   async init(): Promise<void> {
     const icon = nativeImage.createFromPath(
-      join(app.getAppPath(), 'assets', process.platform === 'win32' ? 'appIcon.ico' : 'appIcon.png')
+      join(app.getAppPath(), 'assets', process.platform === 'win32' ? 'icon.ico' : 'icon.png')
     );
+
+    const appName = "olcxja.miarven"
+    app.setName(appName);
+
+    app.setAppUserModelId(appName);
+
     this.mainWindowState = windowStateKeeper({
       defaultWidth: 1000,
       defaultHeight: 800,
@@ -114,6 +121,7 @@ export class ElectronCapacitorApp {
       y: this.mainWindowState.y,
       width: this.mainWindowState.width,
       height: this.mainWindowState.height,
+      autoHideMenuBar: true,
       webPreferences: {
         nodeIntegration: true,
         contextIsolation: true,
@@ -122,6 +130,7 @@ export class ElectronCapacitorApp {
         preload: preloadPath,
       },
     });
+    
     this.mainWindowState.manage(this.MainWindow);
 
     if (this.CapacitorFileConfig.backgroundColor) {
@@ -163,31 +172,18 @@ export class ElectronCapacitorApp {
     }
 
     // Setup the main manu bar at the top of our window.
-    Menu.setApplicationMenu(Menu.buildFromTemplate(this.AppMenuBarMenuTemplate));
+    //Menu.setApplicationMenu(Menu.buildFromTemplate(this.AppMenuBarMenuTemplate));
+    Menu.setApplicationMenu(null);
 
-    // If the splashscreen is enabled, show it first while the main window loads then switch it out for the main window, or just load the main window from the start.
-    if (this.CapacitorFileConfig.electron?.splashScreenEnabled) {
-      this.SplashScreen = new CapacitorSplashScreen({
-        imageFilePath: join(
-          app.getAppPath(),
-          'assets',
-          this.CapacitorFileConfig.electron?.splashScreenImageName ?? 'splash.png'
-        ),
-        windowWidth: 400,
-        windowHeight: 400,
-      });
-      this.SplashScreen.init(this.loadMainWindow, this);
-    } else {
-      this.loadMainWindow(this);
-    }
+ 
+    this.loadMainWindow(this);
+    
 
     // Security
     this.MainWindow.webContents.setWindowOpenHandler((details) => {
-      if (!details.url.includes(this.customScheme)) {
-        return { action: 'deny' };
-      } else {
+
         return { action: 'allow' };
-      }
+     
     });
     this.MainWindow.webContents.on('will-navigate', (event, _newURL) => {
       if (!this.MainWindow.webContents.getURL().includes(this.customScheme)) {
@@ -207,12 +203,14 @@ export class ElectronCapacitorApp {
         this.MainWindow.show();
       }
       setTimeout(() => {
-        if (electronIsDev) {
-          this.MainWindow.webContents.openDevTools();
-        }
+
         CapElectronEventEmitter.emit('CAPELECTRON_DeeplinkListenerInitialized', '');
       }, 400);
     });
+
+    this.MainWindow.setMenu(null);
+    this.MainWindow.setAutoHideMenuBar(true);
+    this.MainWindow.removeMenu();
   }
 }
 

sync-project.sh

@@ -1,9 +1,7 @@
 #update plugins
 npx cap sync
 #update assets
-#npx capacitor-assets generate
-#for some reason icon is broken without this
-npx capacitor-assets generate --pwa
-npx capacitor-assets generate --android
+npx capacitor-assets generate
 #update webroot
-npx cap copy
+npx cap copy
+npx cap copy electron