Compare commits

..

No commits in common. "0c34328f437e8087ac2ebdaf953824ec03d2c9a1" and "3e2efad9436b4a767171f543a27d44128a9c1e43" have entirely different histories.

4 changed files with 29 additions and 99 deletions

View file

@ -105,10 +105,12 @@ p {
color: white; color: white;
font-size: 1.2em; font-size: 1.2em;
font-weight: lighter; font-weight: lighter;
white-space: pre-line;
bottom: 40px; bottom: 40px;
} }
.dropdown { .dropdown {
position: relative; position: relative;
top: 40px !important;
font-size: 25px; font-size: 25px;
} }
.center { .center {
@ -237,36 +239,3 @@ select {
white-space: nowrap; white-space: nowrap;
outline: none !important; outline: none !important;
} }
.acTheme {
height: 14em !important;
}
.acCSP {
height: 10em !important;
}
.acTray {
height: 8em !important;
}
.acPatches {
height: 10em !important;
}
.acWebsocket {
height: 10em !important;
}
.acMobileMode {
height: 11em !important;
}
.acAltPaste {
height: 11em !important;
}
.acChannel {
height: 21em !important;
}
.acClientMod {
height: 18em !important;
}
.acPrfmMode {
height: 10em !important;
}
.acTray {
height: 8em !important;
}

View file

@ -5,6 +5,11 @@ import * as path from "path";
import os from "os"; import os from "os";
export function injectTitlebar() { export function injectTitlebar() {
document.addEventListener("DOMContentLoaded", function (event) { document.addEventListener("DOMContentLoaded", function (event) {
if (window.armcord.channel == "hummus") {
window.alert(
"ArmCord Titlebar doesn't currently work well in Hummus, please change ArmCord style to native for better experience."
);
}
var elem = document.createElement("div"); var elem = document.createElement("div");
elem.innerHTML = `<nav class="titlebar"> elem.innerHTML = `<nav class="titlebar">
<div class="window-title" id="window-title"></div> <div class="window-title" id="window-title"></div>

View file

@ -9,7 +9,7 @@
</head> </head>
<body> <body>
<div class="switch acTheme"> <div class="switch">
<select name="theme" id="theme" class="left dropdown"> <select name="theme" id="theme" class="left dropdown">
<option value="default">Default</option> <option value="default">Default</option>
<option value="native">Native</option> <option value="native">Native</option>
@ -26,7 +26,7 @@
</p> </p>
</div> </div>
<br /> <br />
<div class="switch acCSP"> <div class="switch">
<label class="header2">ArmCord CSP</label> <label class="header2">ArmCord CSP</label>
<input class="tgl tgl-light left" id="csp" type="checkbox" /> <input class="tgl tgl-light left" id="csp" type="checkbox" />
<label class="tgl-btn left" for="csp"></label> <label class="tgl-btn left" for="csp"></label>
@ -36,17 +36,17 @@
</p> </p>
</div> </div>
<br /> <br />
<div class="switch acTray"> <div class="switch">
<label class="header2" id="settings-tray">Minimize to tray</label> <label class="header2" id="settings-tray">Minimize to tray</label>
<input class="tgl tgl-light left" id="tray" type="checkbox" /> <input class="tgl tgl-light left" id="tray" type="checkbox" />
<label class="tgl-btn left" for="tray"></label> <label class="tgl-btn left" for="tray"></label>
<p class="description2"> <p class="description2">
When disabled, ArmCord will close like any other window when closed, otherwise it'll sit back and relax If enabled, when you close the Discord window, ArmCord will sit back and relax in your system tray.
in your system tray for later. Otherwise it'll shutdown completely.
</p> </p>
</div> </div>
<br /> <br />
<div class="switch acPatches"> <div class="switch">
<label class="header2" id="settings-patches">Automatic Patches</label> <label class="header2" id="settings-patches">Automatic Patches</label>
<input class="tgl tgl-light left" id="patches" type="checkbox" /> <input class="tgl tgl-light left" id="patches" type="checkbox" />
<label class="tgl-btn left" for="patches"></label> <label class="tgl-btn left" for="patches"></label>
@ -56,39 +56,28 @@
</p> </p>
</div> </div>
<br /> <br />
<div class="switch acWebsocket"> <div class="switch">
<label class="header2" id="settings-invitewebsocket">Invite Websocket</label> <label class="header2" id="settings-invitewebsocket">Invite Websocket</label>
<input class="tgl tgl-light left" id="websocket" type="checkbox" /> <input class="tgl tgl-light left" id="websocket" type="checkbox" />
<label class="tgl-btn left" for="websocket"></label> <label class="tgl-btn left" for="websocket"></label>
<p class="description2"> <p class="description2">short description, describing this great feature</p>
When enabled ArmCord will support Discord.gg links which means that if you open an invite link in your
browser, ArmCord will automatically accept the invite. Can be unresponsive at times.
</p>
</div> </div>
<br /> <br />
<div class="switch acMobileMode"> <div class="switch">
<label class="header2" id="settings-mobileMode">Mobile mode</label> <label class="header2" id="settings-mobileMode">Mobile mode</label>
<input class="tgl tgl-light left" id="mobile" type="checkbox" /> <input class="tgl tgl-light left" id="mobile" type="checkbox" />
<label class="tgl-btn left" for="mobile"></label> <label class="tgl-btn left" for="mobile"></label>
<p class="description2"> <p class="description2">short description, describing this great feature</p>
If you're on a device with touch-screen this feature is for you! It activates Discord's hidden mobile
mode meant for phones and tablets. Only major feature missing is voice chat support. This is ideal for
users on PinePhone and similar.
</p>
</div> </div>
<br /> <br />
<div class="switch acAltPaste"> <div class="switch">
<label class="header2" id="settings-alternativePaste">Alternative paste</label> <label class="header2" id="settings-alternativePaste">Alternative paste</label>
<input class="tgl tgl-light left" id="alternativePaste" type="checkbox" /> <input class="tgl tgl-light left" id="alternativePaste" type="checkbox" />
<label class="tgl-btn left" for="alternativePaste"></label> <label class="tgl-btn left" for="alternativePaste"></label>
<p class="description2"> <p class="description2">to be used on gnome DE or when accelerator doesn't work on platform of choice</p>
If you're on Gnome on Linux or just simply can't paste images copied from other messages, then this is
for you. This enables alternative module for pasting images. Only enable this when you're experiencing
issues.
</p>
</div> </div>
<br /> <br />
<div class="switch acChannel"> <div class="switch">
<select name="channel" id="channel" class="left dropdown"> <select name="channel" id="channel" class="left dropdown">
<option value="stable">Stable</option> <option value="stable">Stable</option>
<option value="canary">Canary</option> <option value="canary">Canary</option>
@ -97,24 +86,11 @@
</select> </select>
<div> <div>
<p class="header" id="settings-channel">Discord channel:</p> <p class="header" id="settings-channel">Discord channel:</p>
<p class="description"> <p class="description">short description, describing this great feature</p>
You can use this setting to change current instance of Discord:
<br />
<b>Stable</b> - you're probably most familiar with this one. It's the one you see in default Discord
client!
<br />
<b>Canary</b> - this is alpha test release of Discord. By using it you gain access to newest
features and fixes.
<br />
<b>PTB</b> - public test build. Gets features earlier than stable but is a bit older than Canary.
<br />
<b>Hummus</b> - unofficial instance of Discord that takes you back to 2016! None of the client mods
bundled with ArmCord work with it. It's run by community, so you take all the risk by using it.
</p>
</div> </div>
</div> </div>
<br /> <br />
<div class="switch acClientMod"> <div class="switch">
<select name="mod" id="mod" class="left dropdown"> <select name="mod" id="mod" class="left dropdown">
<option value="cumcord">Cumcord</option> <option value="cumcord">Cumcord</option>
<option value="goosemod">GooseMod</option> <option value="goosemod">GooseMod</option>
@ -122,34 +98,20 @@
<option value="none">None</option> <option value="none">None</option>
</select> </select>
<p class="header" id="settings-mod">Client mod:</p> <p class="header" id="settings-mod">Client mod:</p>
<p class="description"> <p class="description">short description, describing this great feature</p>
Client mods are programs that allow you customize your Discord experience. They can change appearance of
the client, modify behaviours or add new features!
<br />
<b>Cumcord</b> - focuses on making the Discord plugin development experience easier. Minimal and
lightweight.
<br />
<b>GooseMod</b> - light, secure, and easy to use, with out of the box experience. Features a built-in
store for plugins.
<br />
<b>Flicker</b> - heavily work in progress, doesn't have a working UI.
</p>
</div> </div>
<br /> <br />
<div class="switch acPrfmMode"> <div class="switch">
<select name="prfmMode" id="prfmMode" class="left dropdown"> <select name="prfmMode" id="prfmMode" class="left dropdown">
<option value="performance">Performance</option> <option value="performance">Performance</option>
<option value="battery">Battery</option> <option value="battery">Battery</option>
<option value="none">None</option> <option value="none">None</option>
</select> </select>
<p class="header" id="settings-prfmMode">Performance mode:</p> <p class="header" id="settings-prfmMode">Performance mode:</p>
<p class="description"> <p class="description">short description, describing this great feature</p>
Performance mode is an experimental function that may either increase responsiveness and performance of
ArmCord or... decrease it. Please try every option and see which fits you the best.
</p>
</div> </div>
<br /> <br />
<div class="switch acTray"> <div class="switch">
<select name="trayIcon" id="trayIcon" class="left dropdown"> <select name="trayIcon" id="trayIcon" class="left dropdown">
<option value="ac_plug_colored">Default</option> <option value="ac_plug_colored">Default</option>
<option value="dsc-tray">Discord Icon</option> <option value="dsc-tray">Discord Icon</option>
@ -159,9 +121,8 @@
<option value="ac_black_plug_hollow">Black Hollowed Icon</option> <option value="ac_black_plug_hollow">Black Hollowed Icon</option>
</select> </select>
<p class="header" id="settings-trayIcon">Tray icon:</p> <p class="header" id="settings-trayIcon">Tray icon:</p>
<p class="description">Set the icon which will appear in tray menu.</p> <p class="description">short description, describing this great feature</p>
</div> </div>
<br />
<button id="settings-save" class="center">Save Settings</button> <button id="settings-save" class="center">Save Settings</button>
</body> </body>
<script> <script>

View file

@ -52,15 +52,10 @@ export function setup() {
}); });
} }
//I'm too lazy to replace every mf reference so :p
export function getVersion() { export function getVersion() {
//Checks if the version # has 4 sections (3.1.0.0) instead of 3 (3.1.0) / Shitty way to check if Kernel Mod is installed //I'm too lazy to replace every mf reference so :p
if (((app.getVersion()).split('.').length > 3) == true) {
return app.getVersion().split('.')[0] + "." + app.getVersion().split('.')[1] + "." + app.getVersion().split('.')[2] + " [Kernel Mod]";
} else {
return app.getVersion(); return app.getVersion();
}} }
export async function injectJS(inject: string) { export async function injectJS(inject: string) {
const js = await (await fetch(`${inject}`)).text(); const js = await (await fetch(`${inject}`)).text();