From 678d9d816c13f45abb3ad3ad3eb22fdfcbb2d939 Mon Sep 17 00:00:00 2001
From: "Grigorii K. Shartsev" <me@shgk.me>
Date: Thu, 18 Apr 2024 11:59:41 +0200
Subject: [PATCH 1/5] feat(talk): new title bar design

Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
---
 src/talk/renderer/DesktopHeader.vue       | 138 +++++++++-------------
 src/talk/renderer/assets/overrides.css    |   2 +-
 src/talk/renderer/components/UserMenu.vue |   1 +
 src/talk/talk.window.js                   |  13 +-
 4 files changed, 72 insertions(+), 82 deletions(-)

diff --git a/src/talk/renderer/DesktopHeader.vue b/src/talk/renderer/DesktopHeader.vue
index d3ccc495..5417c3ff 100644
--- a/src/talk/renderer/DesktopHeader.vue
+++ b/src/talk/renderer/DesktopHeader.vue
@@ -20,74 +20,59 @@
   -->
 
 <template>
-	<header class="header">
-		<!-- Nextcloud Apps use #header selector to get its height -->
-		<!-- This is invisible stub with the same height -->
-		<div id="header" class="header-stub" />
-
-		<a class="header__root-link" @click.prevent="pushToRoot">
-			<img class="header__logo" src="~@talk/img/app.svg" alt="Talk Logo">
-		</a>
-
-		<div>
-			<span class="header__title">Nextcloud Talk</span>
-			<span class="header__preview-badge">Preview</span>
-		</div>
-
-		<div class="spacer" />
-
-		<div class="header__item">
-			<NcButton :aria-label="t('talk_desktop', 'Search')"
-				type="tertiary-no-background"
-				class="header__button"
-				@click="showNotSupportedAlert('Search')">
-				<template #icon>
-					<MdiMagnify />
-				</template>
-			</NcButton>
-		</div>
-
-		<div class="header__item">
-			<NcButton :aria-label="t('talk_desktop', 'Notifications')"
-				type="tertiary-no-background"
-				class="header__button"
-				@click="showNotSupportedAlert('Notifications')">
-				<template #icon>
-					<MdiBell />
-				</template>
-			</NcButton>
-		</div>
-
-		<div class="header__item">
-			<UserMenu :user="$options.userMetadata" @logout="logout" />
+	<header id="header" class="header">
+		<div class="header__inner">
+			<div v-if="!OS.isMac"
+				class="header__title-wrapper"
+				role="button"
+				tabindex="0"
+				@click="pushToRoot">
+				<span class="header__title">Nextcloud Talk</span>
+				<span class="header__preview-badge">Preview</span>
+			</div>
+
+			<div class="spacer" />
+
+			<div class="header__item">
+				<UserMenu :user="user" @logout="logout" />
+			</div>
 		</div>
 	</header>
 </template>
 
 <script>
-import MdiBell from 'vue-material-design-icons/Bell.vue'
-import MdiMagnify from 'vue-material-design-icons/Magnify.vue'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import UserMenu from './components/UserMenu.vue'
 import { appData } from '../../app/AppData.js'
 
 export default {
 	name: 'DesktopHeader',
 
-	userMetadata: appData.userMetadata,
-
 	components: {
-		MdiBell,
-		MdiMagnify,
-		NcButton,
 		UserMenu,
 	},
 
-	inject: ['router'],
+	setup() {
+		return {
+			user: appData.userMetadata,
+			OS: window.OS,
+		}
+	},
+
+	mounted() {
+		window.addEventListener('keydown', (event) => {
+			if (event.key === 'Escape' && document.activeElement === document.body) {
+				this.pushToRoot()
+			}
+		}, { capture: true })
+	},
 
 	methods: {
+		getTalkRouter() {
+			return window.OCA.Talk.instance.$router
+		},
+
 		pushToRoot() {
-			this.router.push({ name: 'root' }).catch(() => {})
+			this.getTalkRouter().push({ name: 'root' }).catch(() => {})
 		},
 
 		logout() {
@@ -102,25 +87,22 @@ export default {
 </script>
 
 <style scoped>
-.header__root-link {
-	cursor: pointer;
-}
-
-.header-stub {
-	height: 100%;
-	position: absolute;
-	z-index: -1;
-}
-
 .header {
 	height: 50px;
 	box-sizing: border-box;
 	margin-bottom: -50px;
 	color: #FFF;
+	user-select: none;
+}
+
+.header__inner {
 	padding: 0 calc(var(--body-container-margin) + 4px) 0 var(--body-container-margin);
 	display: flex;
 	align-items: center;
-	user-select: none;
+	height: 100%;
+	/* Save space for native title bar buttons */
+	margin-inline-start: env(titlebar-area-x, 0);
+	width: env(titlebar-area-width, 100%);
 }
 
 .header__item {
@@ -129,35 +111,31 @@ export default {
 	justify-content: center;
 }
 
-.header__logo {
-	height: 32px;
-	margin: 0 14px 0 20px;
+.header__title-wrapper {
+	display: flex;
+	align-items: center;
+	height: 100%;
+	margin-inline-start: calc(var(--default-grid-baseline) * 3);
+	position: relative;
+
+	&:focus-visible::after {
+		bottom: 0;
+	}
 }
 
 .header__title {
-	font-size: 20px;
+	font-size: 18px;
 	font-weight: bold;
 }
 
 .header__preview-badge {
-	margin-left: var(--default-grid-baseline);
-}
-
-.header__button {
-	opacity: .85;
-	/* We have to use !important here because NcButton already has !important */
-	color: inherit !important;
-	transition: opacity ease var(--animation-quick) !important;
-}
-
-.header__button:hover,
-.header__button:active,
-.header__button:focus-visible {
-	color: inherit !important;
-	opacity: 1;
+	margin-inline-start: var(--default-grid-baseline);
 }
 
 .spacer {
 	flex: 1 0 auto;
+	height: 100%;
+	/* Allow to drag the window using header */
+	app-region: drag;
 }
 </style>
diff --git a/src/talk/renderer/assets/overrides.css b/src/talk/renderer/assets/overrides.css
index 7f852148..79dbf670 100644
--- a/src/talk/renderer/assets/overrides.css
+++ b/src/talk/renderer/assets/overrides.css
@@ -28,5 +28,5 @@
 }
 
 #content-vue {
-	border-radius: var(--body-container-radius) var(--body-container-radius) 0 0 !important;
+	border-radius: 0 !important;
 }
diff --git a/src/talk/renderer/components/UserMenu.vue b/src/talk/renderer/components/UserMenu.vue
index db1941b3..0257efdd 100644
--- a/src/talk/renderer/components/UserMenu.vue
+++ b/src/talk/renderer/components/UserMenu.vue
@@ -202,6 +202,7 @@ export default {
 .user-menu__trigger {
 	display: flex;
 	align-items: center;
+	margin: 0 !important; /* Re-define server default styles */
 }
 
 .user-menu__avatar {
diff --git a/src/talk/talk.window.js b/src/talk/talk.window.js
index e90e30f1..c3d31620 100644
--- a/src/talk/talk.window.js
+++ b/src/talk/talk.window.js
@@ -34,12 +34,23 @@ function createTalkWindow() {
 	const talkWindowOptions = {
 		minWidth: 600,
 		minHeight: 400,
-		backgroundColor: '#171717',
+		backgroundColor: '#00669E',
 		autoHideMenuBar: true,
 		webPreferences: {
 			preload: TALK_WINDOW_PRELOAD_WEBPACK_ENTRY,
 		},
 		icon: getBrowserWindowIcon(),
+		titleBarStyle: 'hidden',
+		titleBarOverlay: {
+			color: '#00669E00', // Transparent
+			symbolColor: '#FFFFFF', // White
+			height: 50,
+		},
+		// Position of the top left corner of the traffic light on Mac
+		trafficLightPosition: {
+			x: 12, // In line with SearchBox
+			y: (50 - 16) / 2, // 16 is the default traffic light button diameter
+		},
 	}
 
 	const window = new BrowserWindow({

From 52d1ecc12f5cb43844c9d92a0e7240e6f2e49362 Mon Sep 17 00:00:00 2001
From: "Grigorii K. Shartsev" <me@shgk.me>
Date: Tue, 16 Apr 2024 19:21:03 +0200
Subject: [PATCH 2/5] fix(viewer): align with new title bar design

Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
---
 src/talk/renderer/Viewer/ViewerApp.vue | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/talk/renderer/Viewer/ViewerApp.vue b/src/talk/renderer/Viewer/ViewerApp.vue
index 5fa14b4f..48b88649 100644
--- a/src/talk/renderer/Viewer/ViewerApp.vue
+++ b/src/talk/renderer/Viewer/ViewerApp.vue
@@ -24,6 +24,7 @@
 		id="viewer"
 		:show.sync="isOpen"
 		class="viewer-modal"
+		:class="{ 'viewer-modal--open': isOpen }"
 		:name="file.basename"
 		size="full"
 		:close-button-contained="false"
@@ -97,7 +98,21 @@ export default {
 }
 </script>
 
+<style>
+.header {
+	transition: background-color 250ms; /* Same as NcModal transition timing */
+}
+
+body:has(.viewer-modal--open) .header {
+	background: black;
+}
+</style>
+
 <style scoped>
+.viewer-modal {
+	top: 50px !important;
+}
+
 .viewer-modal :deep(.modal-container) {
 	background: none !important;
 }

From cebf4e1ab66de5c144514c359dccb912c71f68a6 Mon Sep 17 00:00:00 2001
From: "Grigorii K. Shartsev" <me@shgk.me>
Date: Tue, 16 Apr 2024 18:36:36 +0200
Subject: [PATCH 3/5] perf(talk): optimize title bar loading

Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
---
 src/talk/renderer/desktop.app.js | 14 ++------------
 src/talk/renderer/init.js        | 18 +++++++-----------
 src/talk/renderer/talk.main.js   |  9 +++++----
 3 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/src/talk/renderer/desktop.app.js b/src/talk/renderer/desktop.app.js
index 47b75173..94e0d3a8 100644
--- a/src/talk/renderer/desktop.app.js
+++ b/src/talk/renderer/desktop.app.js
@@ -27,18 +27,8 @@ Vue.prototype.t = translate
 Vue.prototype.n = translatePlural
 
 /**
- * @param {import('VueRouter').Router} router - Vue Router instance
  * @return {import('vue').ComponentPublicInstance}
  */
-export function createDesktopApp(router) {
-	// eslint-disable-next-line vue/require-name-property
-	return new Vue({
-	  provide() {
-			return {
-				router,
-			}
-		},
-
-		render: (h) => h(DesktopHeader),
-	}).$mount('#desktop-header')
+export function createDesktopApp() {
+	return new Vue(DesktopHeader).$mount('#desktop-header')
 }
diff --git a/src/talk/renderer/init.js b/src/talk/renderer/init.js
index 521cdac3..008d2eeb 100644
--- a/src/talk/renderer/init.js
+++ b/src/talk/renderer/init.js
@@ -24,11 +24,9 @@ import { appData } from '../../app/AppData.js'
 import { getCapabilities } from '../../shared/ocs.service.js'
 
 /**
- * Initialize Talk application: styles, localization etc.
- *
- * @return {Promise<object>}
+ * @return {Promise<void>}
  */
-export async function init() {
+export async function initServerStyles() {
 	// Load application styles from server
 	await Promise.all([
 		loadServerCss('/apps/theming/css/default.css'),
@@ -53,16 +51,14 @@ export async function init() {
 			window.TALK_DESKTOP.quit()
 		}
 	})
+}
 
+/**
+ * @return {Promise<void>}
+ */
+export async function initLocalStyles() {
 	// Load styles overrides
 	await import('./assets/overrides.css')
-
-	// Get Talk's modules
-	const { default: router } = await import('@talk/src/router/router.js')
-
-	return {
-		router,
-	}
 }
 
 /**
diff --git a/src/talk/renderer/talk.main.js b/src/talk/renderer/talk.main.js
index d4de0715..bc3d8914 100644
--- a/src/talk/renderer/talk.main.js
+++ b/src/talk/renderer/talk.main.js
@@ -23,9 +23,10 @@ import '@talk/css/icons.css'
 import './assets/styles.css'
 
 import 'regenerator-runtime' // TODO: Why isn't it added on bundling
-import { init, initTalkHashIntegration } from './init.js'
+import { initLocalStyles, initServerStyles, initTalkHashIntegration } from './init.js'
 import { setupWebPage } from '../../shared/setupWebPage.js'
 import { createViewer } from './Viewer/Viewer.js'
+import { createDesktopApp } from './desktop.app.js'
 
 // Initially open the welcome page, if not specified
 if (!window.location.hash) {
@@ -34,10 +35,10 @@ if (!window.location.hash) {
 
 await setupWebPage()
 
-const { router } = await init()
+await initServerStyles()
+await initLocalStyles()
 
-const { createDesktopApp } = await import('./desktop.app.js')
-createDesktopApp(router)
+createDesktopApp()
 
 window.OCA.Viewer = createViewer()
 

From 124195cb8ba9ff1bf2a752bb6be4773adda082dd Mon Sep 17 00:00:00 2001
From: "Grigorii K. Shartsev" <me@shgk.me>
Date: Thu, 18 Apr 2024 16:19:27 +0200
Subject: [PATCH 4/5] fix(welcome): remove traffic light on Mac

Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
---
 src/welcome/welcome.window.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/welcome/welcome.window.js b/src/welcome/welcome.window.js
index 46783668..a65a599c 100644
--- a/src/welcome/welcome.window.js
+++ b/src/welcome/welcome.window.js
@@ -21,6 +21,7 @@
 
 const { BrowserWindow } = require('electron')
 const { getBrowserWindowIcon } = require('../shared/icons.utils.js')
+const { isMac } = require('../shared/os.utils.js')
 
 /**
  * @return {import('electron').BrowserWindow}
@@ -42,6 +43,11 @@ function createWelcomeWindow() {
 		icon: getBrowserWindowIcon(),
 	})
 
+	if (isMac()) {
+		// Hide traffic light buttons on Mac
+		window.setWindowButtonVisibility(false)
+	}
+
 	window.loadURL(WELCOME_WINDOW_WEBPACK_ENTRY)
 
 	return window

From fd1c9b79e578c257a1667eb37737d475129e4e89 Mon Sep 17 00:00:00 2001
From: "Grigorii K. Shartsev" <me@shgk.me>
Date: Thu, 18 Apr 2024 17:59:27 +0200
Subject: [PATCH 5/5] feat(authentication): add new title bar design

Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
---
 src/authentication/authentication.window.js       | 11 +++++++++++
 src/authentication/renderer/AuthenticationApp.vue |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/src/authentication/authentication.window.js b/src/authentication/authentication.window.js
index da741f81..ab318d8c 100644
--- a/src/authentication/authentication.window.js
+++ b/src/authentication/authentication.window.js
@@ -44,6 +44,17 @@ function createAuthenticationWindow() {
 			preload: AUTHENTICATION_WINDOW_PRELOAD_WEBPACK_ENTRY,
 		},
 		icon: getBrowserWindowIcon(),
+		titleBarStyle: 'hidden',
+		titleBarOverlay: {
+			color: '#00669E00', // Transparent
+			symbolColor: '#FFFFFF', // White
+			height: 50,
+		},
+		// Position of the top left corner of the traffic light on Mac
+		trafficLightPosition: {
+			x: 12, // Same as on Talk Window
+			y: (50 - 16) / 2, // 16 is the default traffic light button diameter
+		},
 	})
 
 	// TODO: return this on release
diff --git a/src/authentication/renderer/AuthenticationApp.vue b/src/authentication/renderer/AuthenticationApp.vue
index 4467ba59..0c1831b6 100644
--- a/src/authentication/renderer/AuthenticationApp.vue
+++ b/src/authentication/renderer/AuthenticationApp.vue
@@ -219,6 +219,7 @@ export default {
 	flex-direction: column;
 	align-items: center;
 	user-select: none;
+	app-region: drag;
 }
 
 .spacer {
@@ -246,6 +247,7 @@ export default {
 	border-radius: var(--border-radius-large);
 	box-shadow: 0 0 10px var(--color-box-shadow);
 	width: 300px;
+	app-region: no-drag;
 }
 
 .login-box__header {