Merge Window Files & Some Fixes

rn0x · Mar 15, 2023 · a30b91f · a30b91f
1 parent f2e0e2e
commit a30b91f
Show file tree

Hide file tree

Showing 10 changed files with 281 additions and 324 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "altaqwaa",
-  "version": "2.1.0",
+  "version": "3.0.0",
   "homepage": "https://www.altaqwaa.org",
   "description": "Altaqwaa - Islamic Desktop Application",
   "main": "./src/index.js",

diff --git a/src/index.js b/src/index.js
@@ -1,29 +1,271 @@
+/**
+ * ALTAQWAA v3.0.0
+ * LICENSE: GPL-3.0
+ * GITHUB: https://github.com/rn0x/Altaqwaa-Islamic-Desktop-Application 
+ * */
+
 /* PACKAGES */
 require('v8-compile-cache');
 const { BrowserWindow, ipcMain, app, Tray, Menu } = require('electron');
+const { menubar } = require('menubar');
 const path = require('path');
 const fs = require('fs-extra');
 
-/* MAIN WINDOW */
-const main = require('./main.js');
-
 /* App Initialization (Make Sure Files Ready)  */
+app.setAppUserModelId("org.altaqwaa.rn0x");
 const appInitialization = require('./modules/appInitialization.js');
 const App_Path = path.join(app?.getPath("appData"), './altaqwaa');
-appInitialization(path, fs, App_Path, app.getVersion());
-app.setAppUserModelId("org.altaqwaa.rn0x");
+const settings = fs.readJsonSync(path.join(App_Path, './data/settings.json'));
+appInitialization(path, fs, App_Path);
 
+/* App Main Code Start Here */
 app.on('ready', (e) => {
     e.preventDefault();
-    console.log("[Altaqwaa-CLI] Ready, Starting Main Window...")
-    main(path, fs, App_Path, BrowserWindow, ipcMain, app, Tray, Menu)
+
+    let loadingWindow
+
+    if (process.argv.includes('--hidden')) {
+        loadingWindow = null
+    } else if (settings?.startHidden == true) {
+        loadingWindow = null
+    } else {
+        loadingWindow = new BrowserWindow({
+            width: 128,
+            height: 128,
+            transparent: true,
+            frame: false,
+            alwaysOnTop: true,
+            center: true,
+            title: 'التقوى',
+            icon: path.join(__dirname, './build/icons/icon.png'),
+            webPreferences: {
+                nodeIntegration: false,
+                sandbox: false
+            }
+        })
+        loadingWindow?.removeMenu();
+        loadingWindow?.loadFile(path.join(__dirname, './pages/loading.html'));
+    }
+
+    let win
+    let tray
+    let contextMenu
+
+    win = new BrowserWindow({
+        width: 1000,
+        height: 645,
+        minWidth: 1000,
+        minHeight: 645,
+        show: false,
+        center: true,
+        frame: false,
+        title: 'التقوى',
+        icon: path.join(__dirname, './build/icons/icon.png'),
+        webPreferences: {
+            nodeIntegration: true,
+            sandbox: false,
+            preload: path.join(__dirname, './preload/preload.js')
+        }
+    });
+
+    win?.removeMenu();
+    win?.loadFile(path.join(__dirname, './pages/home.html'));
+
+    // The default window background color
+    settings?.dark_mode ? win?.setBackgroundColor('#2e3338') : win?.setBackgroundColor('#f4f5fb');
+
+    win?.once('ready-to-show', () => {
+
+        if (process.argv.includes('--hidden')) {
+            console.log("[Altaqwaa-CLI] Hidden & Minimized.")
+            win?.hide()
+        } else if (settings?.startHidden == true) {
+            console.log("[Altaqwaa-CLI] Hidden & Minimized.")
+            win?.hide()
+        } else {
+            setTimeout(() => {
+                loadingWindow?.close();
+                win?.show();
+                //win?.webContents.openDevTools();
+            }, 1000);
+        }
+
+    });
+
+    win?.on('minimize', (event) => {
+        event?.preventDefault();
+        settings?.minimizeToPanel ? win?.hide() :
+            false;
+    });
+
+    win?.on('closed', (event) => {
+        event?.preventDefault();
+        app?.quit()
+    });
+
+    contextMenu = Menu.buildFromTemplate([
+        {
+            label: 'عرض/اخفاء التطبيق', click: function () {
+                win?.isVisible() ? win?.hide() : win?.show()
+            }
+        },
+        {
+            label: 'إغلاق', click: () => {
+                if (win !== null) {
+                    win?.close();
+                } else if (win === null) {
+                    app.isQuiting = true;
+                    app?.quit();    
+                } 
+            }
+        }
+    ]);
+
+    tray = new Tray(path.join(__dirname, './build/icons/icon.png'));
+    tray?.setContextMenu(contextMenu);
+    tray?.setToolTip("التقوى");
+
+    if (process.platform != "linux") {
+        console.log("[Altaqwaa-CLI] Altaqwaa For Windows.")
+        try {
+            if (settings?.autostart == true) {
+                if (settings?.startHidden) {
+                    app?.setLoginItemSettings({
+                        openAtLogin: true,
+                        path: path.join(process.resourcesPath, '../Altaqwaa.exe'),
+                        args: ['--hidden']
+                    });
+                } else {
+                    app?.setLoginItemSettings({
+                        openAtLogin: true,
+                        path: path.join(process.resourcesPath, '../Altaqwaa.exe')
+                    });
+                }
+            } else {
+                app?.setLoginItemSettings({
+                    openAtLogin: false,
+                    path: path.join(process.resourcesPath, '../Altaqwaa.exe')
+                });
+            }
+        } catch (e) { }
+
+        let windowsMenubar = menubar({
+            browserWindow: {
+                transparent: true,
+                width: 350,
+                height: 380,
+                minWidth: 350,
+                minHeight: 380,
+                maxWidth: 350,
+                maxHeight: 380,
+                show: false,
+                title: 'التقوى',
+                icon: path.join(__dirname, '../build/icons/icon.png'),
+                webPreferences: {
+                    nodeIntegration: true,
+                    preload: path.join(__dirname, '../preload/tray_window.js'),
+                    devTools: false
+                }
+            },
+            index: path.join(__dirname, '../pages/tray_window.html'),
+            icon: path.join(__dirname, '../build/icons/icon@2x.png'),
+            tray: tray
+        });
+
+        windowsMenubar.on('ready', () => {
+            windowsMenubar.tray.on('click', () => {
+                if (win?.isVisible()) {
+                    win?.hide();
+                    windowsMenubar?.showWindow();
+                } else {
+                    win?.show();
+                    windowsMenubar?.hideWindow()
+                }
+            });
+        });
+
+    } else if (process.platform == 'linux') {
+        console.log("[Altaqwaa-CLI] Altaqwaa For Linux.")
+
+        tray.on('click', () => {
+            if (win?.isVisible()) {
+                win?.hide();
+            } else {
+                win?.show();
+            }
+        });
+    }
+
+    /* LOAD AUDIO WINDOW AFTER MAIN WINDOW (HOME) IS READY & LOADED */
+    if (settings.notifications_adhan == true || settings.notifications_adhkar == true) {
+        let audioWindow
+
+        ipcMain?.on('closed3', () => {
+            if (audioWindow?.isVisible()) {
+                audioWindow?.hide();
+            }
+        });
+
+        ipcMain?.on('show3', () => {
+            audioWindow?.show();
+        });
+
+        audioWindow = new BrowserWindow({
+            width: 600,
+            height: 200,
+            x: 450,
+            y: 0,
+            show: false,
+            center: true,
+            frame: false,
+            resizable: false,
+            title: 'التقوى',
+            icon: path.join(__dirname, './build/icons/icon.png'),
+            webPreferences: {
+                sandbox: false,
+                preload: path.join(__dirname, './preload/audio_window.js')
+            }
+        });
+
+
+        audioWindow.removeMenu();
+
+        audioWindow?.loadFile(path.join(__dirname, './pages/audio_window.html'));
+
+        audioWindow?.once('ready-to-show', () => {
+            audioWindow?.hide();
+            //audioWindow?.webContents.openDevTools();
+        });
+
+        audioWindow?.on('closed', (event) => {
+            event?.preventDefault();
+            audioWindow = null
+        });
+    }
+
+    // For changing light/dark mode on settings
+    ipcMain?.on('background', (_, dark) => {
+        dark ? win?.setBackgroundColor('#2e3338') : win?.setBackgroundColor('#f4f5fb');
+    });
+
+    // To get app version 
+    ipcMain?.handle('currentRelease', async () => {
+        return await app?.getVersion();
+    });
+
+    // Window Controls
+    ipcMain?.on('minimizable', () => win?.isMaximized() ? win?.unmaximize() : win?.maximize());
+    ipcMain?.on('minimize', () => win?.minimize());
+    ipcMain?.on('closed', () => win?.close());
+
+    app?.on('before-quit', () => tray?.destroy());
 });
 
-/* For App_Path */
+// For App_Path
 ipcMain?.handle('App_Path', async () => {
     return App_Path
 });
 
-app.on('window-all-closed', () => {
-    if (process.platform !== 'darwin') app.quit()
-})
+app?.on('window-all-closed', () => {
+    if (process.platform !== 'darwin') app?.quit()
+})