Bump version to 1.1.5

index.js

@@ -2,7 +2,7 @@
 const path = require("path");
 
 const electron        = require("electron");
-const isDev           = require("electron-is-dev");
+const is              = require("electron-is");
 const { autoUpdater } = require("electron-updater");
 
 const { setApplicationMenu }       = require("./menu");
@@ -45,8 +45,8 @@ function createMainWindow() {
 			nodeIntegration: false,
 			preload        : path.join(__dirname, "preload.js")
 		},
-		frame        : false,
+		frame        : !is.macOS(),
-		titleBarStyle: "hiddenInset"
+		titleBarStyle: is.macOS() ? "hiddenInset": "default"
 	});
 	if (windowMaximized) {
 		win.maximize();
@@ -57,7 +57,7 @@ function createMainWindow() {
 
 	injectCSS(win.webContents, path.join(__dirname, "youtube-music.css"));
 	win.webContents.on("did-finish-load", () => {
-		if (isDev) {
+		if (is.dev()) {
 			console.log("did finish load");
 			win.webContents.openDevTools();
 		}
@@ -73,7 +73,7 @@ function createMainWindow() {
 	});
 
 	win.webContents.on("did-fail-load", () => {
-		if (isDev) {
+		if (is.dev()) {
 			console.log("did fail load");
 		}
 		win.webContents.loadFile(path.join(__dirname, "error.html"));
@@ -129,7 +129,7 @@ app.on("activate", () => {
 app.on("ready", () => {
 	setApplicationMenu();
 	mainWindow = createMainWindow();
-	if (!isDev) {
+	if (!is.dev()) {
 		autoUpdater.checkForUpdatesAndNotify();
 		autoUpdater.on("update-available", () => {
 			const dialogOpts = {

package-lock.json

@@ -113,6 +113,18 @@
 				"bloom-filter-cpp": "^1.2.2",
 				"hashset-cpp": "^2.1.1",
 				"nan": "^2.10.0"
+			},
+			"dependencies": {
+				"bloom-filter-cpp": {
+					"version": "1.2.2",
+					"resolved": "https://registry.npmjs.org/bloom-filter-cpp/-/bloom-filter-cpp-1.2.2.tgz",
+					"integrity": "sha512-ZqEMFVy05r2IA35Ah8+KUBTg0S5h5iIeiQW7gLiPiF8ysXMC0vI8VkIcxeNX/aGhhVm0YwlE3OG1VOPnY5XmeQ=="
+				},
+				"hashset-cpp": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/hashset-cpp/-/hashset-cpp-2.1.1.tgz",
+					"integrity": "sha512-599bBFIuKI78NvLbkCkU/2UmOC2u+Z7S5xqwVHQhW+TZXRzx0XeTupGmoVfGur5sx86fcdFYUOpeKwi9/OS9hg=="
+				}
 			}
 		},
 		"ajv": {
@@ -579,11 +591,6 @@
 				"inherits": "~2.0.0"
 			}
 		},
-		"bloom-filter-cpp": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/bloom-filter-cpp/-/bloom-filter-cpp-1.2.0.tgz",
-			"integrity": "sha512-R5axBRU0tvJK6tZmTFj8pMdjWtjh6eUWDUVj2I8nyeCYVOUKbW+uzM8VsWvMlAYs82fdUUZmA4/rNGkHW+dPNw=="
-		},
 		"bluebird": {
 			"version": "3.5.4",
 			"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz",
@@ -1770,16 +1777,27 @@
 				"jimp": "^0.2.27"
 			}
 		},
+		"electron-is": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/electron-is/-/electron-is-3.0.0.tgz",
+			"integrity": "sha512-aQv1y3WrDZ+mtO8acbhiiip/8fa0Et7cvZyvlqJm2H7fih4hiJWEFRyYxzLgDG2kmiLdF8l3y5tbek5JFOPQkQ==",
+			"requires": {
+				"electron-is-dev": "^0.3.0",
+				"semver": "^5.5.0"
+			},
+			"dependencies": {
+				"electron-is-dev": {
+					"version": "0.3.0",
+					"resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-0.3.0.tgz",
+					"integrity": "sha1-FOb9pcaOnk7L7/nM8DfL18BcWv4="
+				}
+			}
+		},
 		"electron-is-accelerator": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz",
 			"integrity": "sha1-UJ5RDCala1Xhf4Y6SwThEYRqsns="
 		},
-		"electron-is-dev": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-1.0.1.tgz",
-			"integrity": "sha512-iwM3EotA9HTXqMGpQRkR/kT8OZqBbdfHTnlwcxsjSLYqY8svvsq0MuujsWCn3/vtgRmDv/PC/gKUUpoZvi5C1w=="
-		},
 		"electron-localshortcut": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/electron-localshortcut/-/electron-localshortcut-3.1.0.tgz",
@@ -3284,11 +3302,6 @@
 				"pinkie-promise": "^2.0.0"
 			}
 		},
-		"hashset-cpp": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/hashset-cpp/-/hashset-cpp-2.1.0.tgz",
-			"integrity": "sha512-+HbrTNQH/qiWeObpS0ZFP0INA4yalHCm0j/lHW1V6h106DO+EOp26xQQqFsjGtrqy6vgB7hucTZarByazSd1Uw=="
-		},
 		"highlight.js": {
 			"version": "9.15.6",
 			"resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.6.tgz",

package.json

@@ -1,7 +1,7 @@
 {
 	"name"       : "youtube-music",
 	"productName": "YouTube Music",
-	"version"    : "1.1.3",
+	"version"    : "1.1.5",
 	"description": "YouTube Music Desktop App - including custom plugins",
 	"license"    : "MIT",
 	"repository" : "th-ch/youtube-music",
@@ -41,7 +41,7 @@
 	"dependencies": {
 		"ad-block"              : "^4.1.3",
 		"electron-debug"        : "^2.0.0",
-		"electron-is-dev"       : "^1.0.1",
+		"electron-is"           : "^3.0.0",
 		"electron-localshortcut": "^3.1.0",
 		"electron-store"        : "^2.0.0",
 		"electron-updater"      : "^4.0.6"

plugins/navigation/back.js

@@ -1,7 +1,10 @@
-const { listenAction } = require("../utils");
+const path = require("path");
-const { ACTIONS, CHANNEL } = require("./actions.js");
+
+const { injectCSS, listenAction } = require("../utils");
+const { ACTIONS, CHANNEL }        = require("./actions.js");
 
 function handle(win) {
+	injectCSS(win.webContents, path.join(__dirname, "style.css"));
 	listenAction(CHANNEL, (event, action) => {
 		switch (action) {
 			case ACTIONS.NEXT: 

plugins/navigation/front.js

@@ -1,14 +1,15 @@
-const { ElementFromFile, templatePath } = require('../utils');
+const { ElementFromFile, templatePath } = require("../utils");
 
 function run() {
-    const forwardButton = ElementFromFile(templatePath(__dirname, 'forward.html'));
+	const forwardButton = ElementFromFile(
-    const backButton = ElementFromFile(templatePath(__dirname, 'back.html'));
+		templatePath(__dirname, "forward.html")
-    const menu = document.querySelector("ytmusic-pivot-bar-renderer");
+	);
+	const backButton = ElementFromFile(templatePath(__dirname, "back.html"));
+	const menu       = document.querySelector("ytmusic-pivot-bar-renderer");
 
-    if (menu) {
+	if (menu) {
-        menu.prepend(forwardButton);
+		menu.prepend(backButton, forwardButton);
-        menu.prepend(backButton);
+	}
-    }
 }
 
 module.exports = run;

plugins/navigation/style.css

@@ -0,0 +1,36 @@
+.navigation-item {
+	font-family                : Roboto, Noto Naskh Arabic UI, Arial, sans-serif;
+	font-size                  : 20px;
+	line-height                : var(--ytmusic-title-1_-_line-height);
+	font-weight                : 500;
+	color                      : #fff;
+	--yt-endpoint-color        : #fff;
+	--yt-endpoint-hover-color  : #fff;
+	--yt-endpoint-visited-color: #fff;
+	display                    : inline-flex;
+	align-items                : center;
+	color                      : rgba(255, 255, 255, 0.5);
+	cursor                     : pointer;
+	margin                     : 0 var(--ytmusic-pivot-bar-tab-margin);
+}
+
+.navigation-item:hover {
+	color: #fff;
+}
+
+.navigation-icon {
+	display                : inline-flex;
+	-ms-flex-align         : center;
+	-webkit-align-items    : center;
+	align-items            : center;
+	-ms-flex-pack          : center;
+	-webkit-justify-content: center;
+	justify-content        : center;
+	position               : relative;
+	vertical-align         : middle;
+	fill                   : var(--iron-icon-fill-color, currentcolor);
+	stroke                 : none;
+	width                  : var(--iron-icon-width, 24px);
+	height                 : var(--iron-icon-height, 24px);
+	animation              : var(--iron-icon_-_animation);
+}

plugins/navigation/templates/back.html

@@ -1,21 +1,51 @@
-<ytmusic-pivot-bar-item-renderer class="style-scope ytmusic-pivot-bar-renderer" tab-id="FEmusic_back" role="tab" onclick="goToPreviousPage()">
+<div
-    <yt-icon class="tab-icon style-scope ytmusic-pivot-bar-item-renderer">
+	class="style-scope ytmusic-pivot-bar-renderer navigation-item"
-        <svg viewBox="0 0 24 24" preserveAspectRatio="xMidYMid meet" focusable="false" class="style-scope yt-icon" style="pointer-events: none; display: block; width: 100%; height: 100%;">
+	tab-id="FEmusic_back"
-            <g class="style-scope yt-icon">
+	role="tab"
-                <path class="st0" d="M109.3 265.2l218.9 218.9c5.1 5.1 11.8 7.9 19 7.9s14-2.8 19-7.9l16.1-16.1c10.5-10.5 10.5-27.6 0-38.1L198.6 246.1 382.7 62c5.1-5.1 7.9-11.8 7.9-19 0-7.2-2.8-14-7.9-19L366.5 7.9c-5.1-5.1-11.8-7.9-19-7.9-7.2 0-14 2.8-19 7.9L109.3 227c-5.1 5.1-7.9 11.9-7.8 19.1 0 7.2 2.8 14 7.8 19.1z" class="style-scope yt-icon">
+	onclick="goToPreviousPage()"
-                </path>
+>
-            </g>
+	<div
-        </svg>
+		class="tab-icon style-scope ytmusic-pivot-bar-item-renderer yt-icon-container"
-    </yt-icon>
+	>
+		<svg
+			viewBox="0 0 24 24"
+			preserveAspectRatio="xMidYMid meet"
+			focusable="false"
+			class="style-scope yt-icon"
+			style="pointer-events: none; display: block; width: 100%; height: 100%;"
+		>
+			<g class="style-scope yt-icon">
+				<path
+					class="st0"
+					d="M109.3 265.2l218.9 218.9c5.1 5.1 11.8 7.9 19 7.9s14-2.8 19-7.9l16.1-16.1c10.5-10.5 10.5-27.6 0-38.1L198.6 246.1 382.7 62c5.1-5.1 7.9-11.8 7.9-19 0-7.2-2.8-14-7.9-19L366.5 7.9c-5.1-5.1-11.8-7.9-19-7.9-7.2 0-14 2.8-19 7.9L109.3 227c-5.1 5.1-7.9 11.9-7.8 19.1 0 7.2 2.8 14 7.8 19.1z"
+					class="style-scope yt-icon"
+				></path>
+			</g>
+		</svg>
+	</div>
 
-    <paper-icon-button class="search-icon style-scope ytmusic-search-box" role="button" tabindex="0" aria-disabled="false" title="Go to previous page">
+	<div
-        <iron-icon id="icon" class="style-scope paper-icon-button">
+		class="search-icon style-scope ytmusic-search-box"
-            <svg viewBox="0 0 492 492"  preserveAspectRatio="xMidYMid meet" focusable="false" class="style-scope iron-icon" style="pointer-events: none; display: block; width: 100%; height: 100%;">
+		role="button"
-                <g class="style-scope iron-icon">
+		tabindex="0"
-                    <path class="st0" d="M109.3 265.2l218.9 218.9c5.1 5.1 11.8 7.9 19 7.9s14-2.8 19-7.9l16.1-16.1c10.5-10.5 10.5-27.6 0-38.1L198.6 246.1 382.7 62c5.1-5.1 7.9-11.8 7.9-19 0-7.2-2.8-14-7.9-19L366.5 7.9c-5.1-5.1-11.8-7.9-19-7.9-7.2 0-14 2.8-19 7.9L109.3 227c-5.1 5.1-7.9 11.9-7.8 19.1 0 7.2 2.8 14 7.8 19.1z">
+		aria-disabled="false"
-                    </path>
+		title="Go to previous page"
-                </g>
+	>
-            </svg>
+		<div id="icon" class="style-scope paper-icon-button navigation-icon">
-        </iron-icon>
+			<svg
-    </paper-icon-button>
+				viewBox="0 0 492 492"
-</ytmusic-pivot-bar-item-renderer>
+				preserveAspectRatio="xMidYMid meet"
+				focusable="false"
+				class="style-scope iron-icon"
+				style="pointer-events: none; display: block; width: 100%; height: 100%;"
+			>
+				<g class="style-scope iron-icon">
+					<path
+						class="st0"
+						d="M109.3 265.2l218.9 218.9c5.1 5.1 11.8 7.9 19 7.9s14-2.8 19-7.9l16.1-16.1c10.5-10.5 10.5-27.6 0-38.1L198.6 246.1 382.7 62c5.1-5.1 7.9-11.8 7.9-19 0-7.2-2.8-14-7.9-19L366.5 7.9c-5.1-5.1-11.8-7.9-19-7.9-7.2 0-14 2.8-19 7.9L109.3 227c-5.1 5.1-7.9 11.9-7.8 19.1 0 7.2 2.8 14 7.8 19.1z"
+					></path>
+				</g>
+			</svg>
+		</div>
+	</div>
+</div>

plugins/navigation/templates/forward.html

@@ -1,26 +1,53 @@
-<ytmusic-pivot-bar-item-renderer class="style-scope ytmusic-pivot-bar-renderer" tab-id="FEmusic_next" role="tab" onclick="goToNextPage()">
+<div
-    <yt-icon class="tab-icon style-scope ytmusic-pivot-bar-item-renderer">
+	class="style-scope ytmusic-pivot-bar-renderer navigation-item"
-        <svg viewBox="0 0 24 24" preserveAspectRatio="xMidYMid meet" focusable="false" class="style-scope yt-icon" style="pointer-events: none; display: block; width: 100%; height: 100%;">
+	tab-id="FEmusic_next"
-            <g class="style-scope yt-icon">
+	role="tab"
-                <path d="M382.678,226.804L163.73,7.86C158.666,2.792,151.906,0,144.698,0s-13.968,2.792-19.032,7.86l-16.124,16.12
+	onclick="goToNextPage()"
+>
+	<div class="tab-icon style-scope ytmusic-pivot-bar-item-renderer">
+		<svg
+			viewBox="0 0 24 24"
+			preserveAspectRatio="xMidYMid meet"
+			focusable="false"
+			class="style-scope yt-icon"
+			style="pointer-events: none; display: block; width: 100%; height: 100%;"
+		>
+			<g class="style-scope yt-icon">
+				<path
+					d="M382.678,226.804L163.73,7.86C158.666,2.792,151.906,0,144.698,0s-13.968,2.792-19.032,7.86l-16.124,16.12
                 c-10.492,10.504-10.492,27.576,0,38.064L293.398,245.9l-184.06,184.06c-5.064,5.068-7.86,11.824-7.86,19.028
                 c0,7.212,2.796,13.968,7.86,19.04l16.124,16.116c5.068,5.068,11.824,7.86,19.032,7.86s13.968-2.792,19.032-7.86L382.678,265
-                c5.076-5.084,7.864-11.872,7.848-19.088C390.542,238.668,387.754,231.884,382.678,226.804z" class="style-scope yt-icon">
+                c5.076-5.084,7.864-11.872,7.848-19.088C390.542,238.668,387.754,231.884,382.678,226.804z"
-                </path>
+					class="style-scope yt-icon"
-            </g>
+				></path>
-        </svg>
+			</g>
-    </yt-icon>
+		</svg>
+	</div>
 
-    <paper-icon-button class="search-icon style-scope ytmusic-search-box" role="button" tabindex="0" aria-disabled="false" title="Go to next page">
+	<div
-        <iron-icon id="icon" class="style-scope paper-icon-button">
+		class="search-icon style-scope ytmusic-search-box"
-            <svg viewBox="0 0 492 492"  preserveAspectRatio="xMidYMid meet" focusable="false" class="style-scope iron-icon" style="pointer-events: none; display: block; width: 100%; height: 100%;">
+		role="button"
-                <g class="style-scope iron-icon">
+		tabindex="0"
-                    <path class="st0" d="M382.7,226.8L163.7,7.9c-5.1-5.1-11.8-7.9-19-7.9s-14,2.8-19,7.9L109.5,24c-10.5,10.5-10.5,27.6,0,38.1
+		aria-disabled="false"
+		title="Go to next page"
+	>
+		<div id="icon" class="style-scope paper-icon-button navigation-icon">
+			<svg
+				viewBox="0 0 492 492"
+				preserveAspectRatio="xMidYMid meet"
+				focusable="false"
+				class="style-scope iron-icon"
+				style="pointer-events: none; display: block; width: 100%; height: 100%;"
+			>
+				<g class="style-scope iron-icon">
+					<path
+						class="st0"
+						d="M382.7,226.8L163.7,7.9c-5.1-5.1-11.8-7.9-19-7.9s-14,2.8-19,7.9L109.5,24c-10.5,10.5-10.5,27.6,0,38.1
                     l183.9,183.9L109.3,430c-5.1,5.1-7.9,11.8-7.9,19c0,7.2,2.8,14,7.9,19l16.1,16.1c5.1,5.1,11.8,7.9,19,7.9s14-2.8,19-7.9L382.7,265
-                    c5.1-5.1,7.9-11.9,7.8-19.1C390.5,238.7,387.8,231.9,382.7,226.8z">
+                    c5.1-5.1,7.9-11.9,7.8-19.1C390.5,238.7,387.8,231.9,382.7,226.8z"
-                    </path>
+					></path>
-                </g>
+				</g>
-            </svg>
+			</svg>
-        </iron-icon>
+		</div>
-    </paper-icon-button>
+	</div>
-</ytmusic-pivot-bar-item-renderer>
+</div>

store/index.js

@@ -8,7 +8,7 @@ const store = new Store({
 			height: 550
 		},
 		url    : "https://music.youtube.com",
-		plugins: ["navigation", "shortcuts", "adblocker", "no-google-login"]
+		plugins: ["navigation", "shortcuts", "adblocker"]
 	}
 });