diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f1aef92..5583c53 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,9 +29,9 @@ jobs: skip_build: true # If the commit is tagged with a version (e.g. "v1.0.0"), # release the app after building - # release: ${{ startsWith(github.ref, 'refs/tags/v') }} disabled for now as it caused problems + release: ${{ startsWith(github.ref, 'refs/tags/v') }} #disabled for now as it caused problems (nvm) - name: Archive production builds uses: actions/upload-artifact@v2 with: name: dist folder - path: dist/** \ No newline at end of file + path: dist/** diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..3036e5a --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "mods/goosemod"] + path = mods/goosemod + url = https://github.com/GooseMod/Extension diff --git a/README.md b/README.md index c92e96c..2a3c0ca 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,8 @@ ArmCord is a custom alternative Discord client made for people on lower-end devices and ARM architecture that want custom Discord experience. It uses [GooseMod](https://goosemod.com) for custom themes and plugins! # How to run/install it? -Check releases tab for precompiled deb(ARM64), rpm(ARM64), tar.gz(ARM64), Windows builds. -Alternative (npm, nodejs required): +Check releases tab for precompiled packages for Linux, Windows and Mac OS (experimental). +Alternatively you can run ArmCord from source (npm, nodejs required): 1.Run `npm install` 2.Run `npm start` 3.Compile/Package with `npm run make` @@ -13,21 +13,22 @@ Alternative (npm, nodejs required): # FAQ ## 1.Will I get banned from using it? - -You are breaking Discord ToS since we are using GooseMod for themes and plugins. But no one ever got banned from using ArmCord or GooseMod as of now + -You are breaking Discord ToS since we are using GooseMod for themes and plugins. But no one ever got banned from using ArmCord or GooseMod as of now. If you wish to remove GooseMod, you can find it in your plugins folder. ## 2.How does this work? -We are using official web app and adding GooseMod to it with some other tweaks. ## 3.Can I use this on other architectures or operating systems? - -Yes! ArmCord should work normally under Windows, Mac OS, Linux as long as it has NodeJS, npm and Electron support. + -Yes! ArmCord should work normally under Windows, ~~Mac OS~~ (Mac OS is broken see [#48](https://github.com/ArmCord/ArmCord/issues/48)), Linux as long as it has NodeJS, npm and Electron support. +## 4.Code is big spaghetti. + -I'm aware. I'm slowly rewriting everything. This branch is mostly fixes only. # Credits [ArmCord UI Elements and few features](https://github.com/kckarnige) [GooseMod](https://github.com/GooseMod/GooseMod) [GooseMod Extension](https://github.com/GooseMod/extension) -[update.rocks](https://www.update.rocks) [electron-discord-webapp](https://github.com/SpacingBat3/electron-discord-webapp) [custom-electron-titlebar](https://github.com/AlexTorresSk/custom-electron-titlebar) [electron-localshortcut](https://github.com/parro-it/electron-localshortcut) -[electron-forge](https://www.npmjs.com/package/electron-forge) +[electron-builder](https://electron.build) diff --git a/ac_icon_transparent.png b/ac_icon_transparent.png new file mode 100644 index 0000000..bb87d3b Binary files /dev/null and b/ac_icon_transparent.png differ diff --git a/ac_plug.ico b/ac_plug.ico new file mode 100644 index 0000000..d4831e6 Binary files /dev/null and b/ac_plug.ico differ diff --git a/ac_plug.png b/ac_plug.png new file mode 100644 index 0000000..cc60f6d Binary files /dev/null and b/ac_plug.png differ diff --git a/build/icon.ico b/build/icon.ico index 5585e1c..d4831e6 100644 Binary files a/build/icon.ico and b/build/icon.ico differ diff --git a/build/icon.png b/build/icon.png index 2e0d334..cc60f6d 100644 Binary files a/build/icon.png and b/build/icon.png differ diff --git a/discord.ico b/discord.ico deleted file mode 100644 index 5585e1c..0000000 Binary files a/discord.ico and /dev/null differ diff --git a/discord.png b/discord.png deleted file mode 100644 index 2bff157..0000000 Binary files a/discord.png and /dev/null differ diff --git a/main.js b/main.js index 45091cd..33d94fc 100644 --- a/main.js +++ b/main.js @@ -4,13 +4,17 @@ const path = require("path"); const contextMenu = require("electron-context-menu"); const os = require("os"); require("v8-compile-cache"); - +if (require("./utils/ArmCord.js").Titlebar === "native") { + var frame = true +} else { + var frame = false +} if (os.type() == 'Linux'){ - var iconformat = __dirname + "/discord.png" -} else { //test this + var iconformat = __dirname + "/ac_icon_transparent.png" +} else { console.log("Running Non-Linux") - var iconformat = __dirname + "/discord.ico"; + var iconformat = __dirname + "/ac_plug.ico"; } contextMenu({ @@ -31,7 +35,7 @@ function createWindow() { height: 600, icon: iconformat, title: "ArmCord", - frame: false, + frame: frame, webPreferences: { preload: path.join(__dirname, "preload.js"), enableRemoteModule: true, @@ -90,7 +94,7 @@ function createWindow() { try { appIcon(); } catch (error) { - console.error(error); + //console.error(error); // expected output: TypeError: appIcon is not a function } }); @@ -101,7 +105,7 @@ function createWindow() { // Some APIs can only be used after this event occurs. app.whenReady().then(() => { createWindow(); - //require("./utils/csp.js"); + require("./utils/mod.js"); require("./utils/plugin.js"); session .fromPartition("some-partition") diff --git a/manager.css b/manager.css index 7520933..abfab7a 100644 --- a/manager.css +++ b/manager.css @@ -36,7 +36,11 @@ span { font-size: 32px; text-align: center; } - +.disabled { + text-align: center; + font-weight: normal; + font-family: Helvetica, sans-serif; +} .container { position: fixed; top: 50%; @@ -107,7 +111,12 @@ button#open-themes-btn:active { left: 50%; transform: translateX(-50%); } - +#tm-disabled { + position: absolute; + top: 100px; + left: 50%; + transform: translateX(-50%); +} #tm-list-item { background: #23272a; font-family: Whitney, Helvetica Neue, Helvetica, Arial, sans-serif; diff --git a/manager.html b/manager.html index c900b99..09aac68 100644 --- a/manager.html +++ b/manager.html @@ -11,7 +11,7 @@
Cord Manager
-Disabled Themes:
+Disabled Themes: