Merge pull request #12 from kckarnige/main

Fixed icon, added support server hotkey, and fixed some CSS

index.html

@@ -10,11 +10,9 @@
 
     :root {
       background-color: #2c2f33;
-    }
+      --header-secondary: #b9bbbe;
-
+      --header-primary: #fff;
-    .titlebar {
+      --background-tertiary: #202225;
-      font-family: Verdana, Geneva, Tahoma, sans-serif;
-      background-color: #202225;
     }
 
     body {

main.js

@@ -21,7 +21,7 @@ function createWindow() {
   mainWindow = new BrowserWindow({
     width: 800,
     height: 600,
-    icon: __dirname + "/discord.ico",
+    icon: __dirname + "/discord.png",
     title: "ArmCord",
     frame: false,
     webPreferences: {

preload.js

@@ -1,6 +1,7 @@
 const customTitlebar = require('custom-electron-titlebar')
 const electronLocalshortcut = require("electron-localshortcut");
 const { remote } = require("electron");
+const ArmCord = require("./utils/ArmCord.js")
 
 window.addEventListener('DOMContentLoaded', () => {
   new customTitlebar.Titlebar({
@@ -8,17 +9,6 @@ window.addEventListener('DOMContentLoaded', () => {
     menu: false,
   });
 
-/**
- * Utility function to add CSS in multiple passes.
- * @param {string} styleString
- */
- function addStyle(styleString) {
-  const style = document.createElement('style');
-  style.textContent = styleString;
-  document.head.append(style);
-}
-
-
 const currentWindow = remote.getCurrentWindow();
 electronLocalshortcut.register(currentWindow, "F5", () => {
   location.reload();
@@ -26,10 +16,22 @@ electronLocalshortcut.register(currentWindow, "F5", () => {
 electronLocalshortcut.register(currentWindow, "F12", () => {
   currentWindow.webContents.openDevTools();
 });
+electronLocalshortcut.register(currentWindow, "F1", () => {
+  require("shell").openExternal("https://support.discord.com/")
+});
+electronLocalshortcut.register(currentWindow, "F2", () => {
+  window.location.href = "https://discord.com/invite/F25bc4RYDt"
+});
 require("./utils/capturer.js")
-addStyle(`
+
+ArmCord.addStyle(`
 @import url("https://kckarnige.github.io/femboi_owo/discord-font.css");
 
+:root {
+  --window-buttons: var(--header-secondary);
+  --cord-color: var(--header-primary);
+  --armcord-color: #7289da;
+}
 .base-3dtUhz, .sidebar-2K8pFh {
   display: -webkit-box;
   display: -ms-flexbox;
@@ -47,7 +49,7 @@ div.menubar[role="menubar"] {
 
 .window-title:after {
   content: "Cord";
-  color: #fff;
+  color: var(--cord-color) !important;
   font-weight: normal;
   font-size: 14px;
   font-family: Discordinated;
@@ -55,7 +57,7 @@ div.menubar[role="menubar"] {
 
 .window-title:before {
   content: "ARM";
-  color: #7289da;
+  color: var(--armcord-color);
   font-weight: normal;
   font-size: 14px;
   font-family: Helvetica, sans-serif;
@@ -68,8 +70,22 @@ div.menubar[role="menubar"] {
 }
 
 .titlebar {
-  background: #202225 !important;
+  background: var(--background-tertiary) !important;
+  font-family: Verdana, Geneva, Tahoma, sans-serif;
+}
+
+.titlebar .window-controls-container .window-icon {
+  background: var(--window-buttons) !important;
 }
 `);
-})
 
+ArmCord.addStyle(`.info-1VyQPT:last-child:before {
+  content: "ArmCord Version: ` + ArmCord.Version + `";
+  height: auto;
+  line-height: 16px;
+  text-align: center;
+  color: var(--text-muted);
+  font-size: 12px;
+  text-transform: none;
+}`);
+})

utils/ArmCord.js

@@ -0,0 +1,13 @@
+exports.Version = "DevBuild";
+  
+exports.addStyle = function(styleString) {
+ const style = document.createElement('style');
+ style.textContent = styleString;
+ document.head.append(style);
+};
+
+exports.addScript = function(scriptString) {
+  var script = document.createElement('script');
+  script.textContent = scriptString;
+  document.body.append(script);
+};