diff --git a/assets/Square150x150Logo.png b/assets/Square150x150Logo.png index 2cadefa..d54a96c 100644 Binary files a/assets/Square150x150Logo.png and b/assets/Square150x150Logo.png differ diff --git a/assets/Square44x44Logo.png b/assets/Square44x44Logo.png index 17cbf7b..4f033c3 100644 Binary files a/assets/Square44x44Logo.png and b/assets/Square44x44Logo.png differ diff --git a/assets/StoreLogo.png b/assets/StoreLogo.png index 324fdce..940c594 100644 Binary files a/assets/StoreLogo.png and b/assets/StoreLogo.png differ diff --git a/assets/lang/en-US.json b/assets/lang/en-US.json index 4950903..44a7b79 100644 --- a/assets/lang/en-US.json +++ b/assets/lang/en-US.json @@ -17,9 +17,17 @@ "settings-theme-desc1": "ArmCord \"themes\" manage apps behaviour and looks.", "settings-theme-desc2": "this is how ArmCord looks when you first launch it. It includes recreation of Discord's\n custom titlebar and ArmCord specific styles injected into Discord.", "settings-theme-desc3": "uses native titlebar of OS you're currently running (e.g Windows 7/10). Functions more\n similar to actual Discord app on Linux.", + "settings-theme-desc4": "transparent window with native titlebar, you need a compatible theme to run this.", "settings-theme-default": "Default", "settings-theme-native": "Native", - "settings-theme-transparent": "Transparent (Experimental)", + "settings-theme-transparent": "Transparent", + "settings-transparencyMode": "Transparency mode:", + "settings-transparencyMode-acrylic": "Acrylic", + "settings-transparencyMode-mica": "Mica", + "settings-transparencyMode-unifiedAcrylic": "Unified Acrylic", + "settings-transparencyMode-blurbehind": "Blur behind", + "settings-autoLaunch": "Auto launch", + "settings-autoLaunch-desc": "Starts ArmCord on system-startup.", "settings-csp-desc": "ArmCord CSP is our system that manages loading custom content loading into the Discord app. Stuff like\n client mods and themes depend on it. Disable if you want to get rid of mods and custom styles.", "settings-tray": "Minimize to tray", "settings-tray-desc": "When disabled, ArmCord will close like any other window when closed, otherwise it'll sit back and relax\n in your system tray for later.", diff --git a/package.json b/package.json index 3cff3c2..be7f3c3 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,7 @@ "arrpc": "file:src/arrpc", "cross-fetch": "^3.1.5", "electron-context-menu": "github:ArmCord/electron-context-menu", + "electron-winstore-auto-launch": "^2.0.6", "extract-zip": "^2.0.1", "v8-compile-cache": "^2.3.0", "ws": "^8.11.0" @@ -81,6 +82,12 @@ "rpm", "AppImage" ] + }, + "appx": { + "identityName": "53758smartfrigde.ArmCord", + "publisher": "CN=EAB3A6D3-7145-4623-8176-D579F573F339", + "publisherDisplayName": "smartfrigde", + "applicationId": "smartfrigde.ArmCord" } }, "packageManager": "pnpm@7.13.4" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f19321a..f209e55 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -13,6 +13,9 @@ dependencies: electron-context-menu: specifier: github:ArmCord/electron-context-menu version: github.com/ArmCord/electron-context-menu/280c81398c02a063f46e3285a9708d8db1a7ce32 + electron-winstore-auto-launch: + specifier: ^2.0.6 + version: 2.0.6 extract-zip: specifier: ^2.0.1 version: 2.0.1 @@ -230,6 +233,14 @@ packages: fastq: 1.15.0 dev: true + /@nodert-win10-au/windows.applicationmodel@0.4.4: + resolution: {integrity: sha512-/46SHT3E5s29p9Fh+BEAJIuzX1vLnGTKSfeGHcUKrPzJneP7OY05NTRH1PHRfRRCgE7YfbIeQqRpbJ0dyvliqw==} + requiresBuild: true + dependencies: + nan: 2.17.0 + dev: false + optional: true + /@sindresorhus/is@4.6.0: resolution: {integrity: sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==} engines: {node: '>=10'} @@ -1184,6 +1195,12 @@ packages: - supports-color dev: true + /electron-winstore-auto-launch@2.0.6: + resolution: {integrity: sha512-piE1U0+YCRzftD5YZjFFS5QfuksNGD6lpUMmtsHjd417grnttjRDK+ve6wTyyiGZfIQG3yEvYAEA5hUfGD42Sg==} + optionalDependencies: + '@nodert-win10-au/windows.applicationmodel': 0.4.4 + dev: false + /electron@24.3.0: resolution: {integrity: sha512-M7PpfpOzGdLeZPr2xhxXuvJeoXPEHMH40Rtv8BCGleRPolwna9BepAGc0H0F+Uz5kGKOv3xcm99fTurvXUH0nw==} engines: {node: '>= 12.20.55'} @@ -2142,6 +2159,11 @@ packages: /ms@2.1.2: resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} + /nan@2.17.0: + resolution: {integrity: sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==} + dev: false + optional: true + /natural-compare-lite@1.4.0: resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==} dev: true diff --git a/src/content/css/settings.css b/src/content/css/settings.css index 1df605e..51ec370 100644 --- a/src/content/css/settings.css +++ b/src/content/css/settings.css @@ -257,6 +257,13 @@ select option { font-weight: 400; font-style: normal; } +.previewimage { + height: auto; + width: 540px; +} +.acTransparencyMode { + z-index: 999; +} select { -webkit-appearance: button; -moz-appearance: button; diff --git a/src/content/setup.html b/src/content/setup.html index 6e82af8..a4ab39b 100644 --- a/src/content/setup.html +++ b/src/content/setup.html @@ -120,6 +120,8 @@ alternativePaste: false, automaticPatches: false, mods: "none", + transparencyMode: "acrylic", + autoStart: false, useLegacyCapturer: false, inviteWebsocket: true, mobileMode: false, @@ -154,12 +156,14 @@ channel: options.channel, armcordCSP: true, minimizeToTray: true, + autoStart: true, mobileMode: false, automaticPatches: false, performanceMode: "none", useLegacyCapturer: false, alternativePaste: false, dynamicIcon: false, + transparencyMode: "acrylic", spellcheck: true, disableAutogain: false, startMinimized: false, @@ -180,9 +184,11 @@ spellcheck: true, disableAutogain: false, mods: "none", + autoStart: true, dynamicIcon: false, useLegacyCapturer: false, startMinimized: false, + transparencyMode: "acrylic", alternativePaste: false, performanceMode: "none", trayIcon: "default", diff --git a/src/content/splash.html b/src/content/splash.html index fd3aed3..a2982b8 100644 --- a/src/content/splash.html +++ b/src/content/splash.html @@ -34,7 +34,7 @@ if (window.armcord.version === "3.2.0") { console.log("Running a development build of ArmCord. Skipping updater."); } else { - const response = await fetch("https://armcord.xyz/latest.json"); + const response = await fetch("https://armcord.xyz/msstore.json"); const data = await response.json(); if (data.version !== window.armcord.version) { var elem = document.createElement("img"); diff --git a/src/main.ts b/src/main.ts index 60bf086..16f41af 100644 --- a/src/main.ts +++ b/src/main.ts @@ -14,6 +14,7 @@ import "./extensions/mods"; import "./tray"; import {createCustomWindow, createNativeWindow, createTransparentWindow} from "./window"; import path from "path"; +import {WindowsStoreAutoLaunch} from "electron-winstore-auto-launch"; import {createTManagerWindow} from "./themeManager/main"; export let iconPath: string; export let settings: any; @@ -68,6 +69,11 @@ if (!app.requestSingleInstanceLock()) { checkIfConfigExists(); injectElectronFlags(); app.whenReady().then(async () => { + if ((await getConfig("autoStart")) == true) { + WindowsStoreAutoLaunch.enable(); + } else { + WindowsStoreAutoLaunch.disable(); + } if ((await getConfig("customIcon")) !== undefined ?? null) { iconPath = await getConfig("customIcon"); } else { diff --git a/src/settings/settings.html b/src/settings/settings.html index 2a73d6f..b6953b7 100644 --- a/src/settings/settings.html +++ b/src/settings/settings.html @@ -21,6 +21,7 @@ +

@@ -32,10 +33,27 @@
- +
+ - +
+
+ +

+ +
+ +
+
+
@@ -59,7 +77,13 @@


- +
+ + + +

+
+
diff --git a/src/utils.ts b/src/utils.ts index c39603f..f3ca805 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -42,10 +42,12 @@ export function setup(): void { windowStyle: "default", channel: "stable", armcordCSP: true, + autoStart: true, minimizeToTray: true, automaticPatches: false, alternativePaste: false, mods: "none", + transparencyMode: "acrylic", spellcheck: true, performanceMode: "none", skipSplash: false, @@ -245,10 +247,11 @@ export interface Settings { // Only used for external url warning dialog. ignoreProtocolWarning?: boolean; customIcon: string; - + transparencyMode: "mica" | "acrylic" | "unified-acrylic" | "blurbehind"; windowStyle: string; channel: string; armcordCSP: boolean; + autoStart: boolean; minimizeToTray: boolean; automaticPatches: boolean; alternativePaste: boolean; diff --git a/src/window.ts b/src/window.ts index dfd1d30..3bf1d9c 100644 --- a/src/window.ts +++ b/src/window.ts @@ -59,7 +59,7 @@ async function doAfterDefiningTheWindow(): Promise { } if (transparency && process.platform === "win32") { import("@pyke/vibe").then(async (vibe) => { - vibe.applyEffect(mainWindow, "acrylic"); + vibe.applyEffect(mainWindow, await getConfig("transparencyMode")); vibe.forceTheme(mainWindow, "dark"); if ((await getConfig("startMinimized")) == false) { mainWindow.show();