4 files changed, 29 insertions, 87 deletions

diff --git a/src/electron/Settings.js b/src/electron/Settings.js
index 049a08296..824b4c20c 100644
--- a/src/electron/Settings.js
+++ b/src/electron/Settings.js
@@ -1,5 +1,17 @@
+import { observable } from 'mobx';
+
+import { DEFAULT_APP_SETTINGS } from '../config';
+
 export default class Settings {
-  store = {};
+  @observable store = {
+    autoLaunchOnStart: DEFAULT_APP_SETTINGS.autoLaunchOnStart,
+    autoLaunchInBackground: DEFAULT_APP_SETTINGS.autoLaunchInBackground,
+    runInBackground: DEFAULT_APP_SETTINGS.runInBackground,
+    enableSystemTray: DEFAULT_APP_SETTINGS.enableSystemTray,
+    minimizeToSystemTray: DEFAULT_APP_SETTINGS.minimizeToSystemTray,
+    locale: DEFAULT_APP_SETTINGS.locale,
+    beta: DEFAULT_APP_SETTINGS.beta,
+  };
 
   set(settings) {
     this.store = Object.assign(this.store, settings);
diff --git a/src/electron/ipc-api/appIndicator.js b/src/electron/ipc-api/appIndicator.js
index 576234d25..d31819068 100644
--- a/src/electron/ipc-api/appIndicator.js
+++ b/src/electron/ipc-api/appIndicator.js
@@ -1,12 +1,11 @@
-import { app, ipcMain, Tray, Menu } from 'electron';
+import { app, ipcMain } from 'electron';
 import path from 'path';
+import { autorun } from 'mobx';
 
-const INDICATOR_TRAY_PLAIN = 'tray';
-const INDICATOR_TRAY_UNREAD = 'tray-unread';
 const INDICATOR_TASKBAR = 'taskbar';
-
 const FILE_EXTENSION = process.platform === 'win32' ? 'ico' : 'png';
-let trayIcon;
+
+let isTrayIconEnabled;
 
 function getAsset(type, asset) {
   return path.join(
@@ -15,26 +14,14 @@ function getAsset(type, asset) {
 }
 
 export default (params) => {
-  trayIcon = new Tray(getAsset('tray', INDICATOR_TRAY_PLAIN));
-  const trayMenuTemplate = [
-    {
-      label: 'Show Franz',
-      click() {
-        params.mainWindow.show();
-      },
-    }, {
-      label: 'Quit Franz',
-      click() {
-        app.quit();
-      },
-    },
-  ];
-
-  const trayMenu = Menu.buildFromTemplate(trayMenuTemplate);
-  trayIcon.setContextMenu(trayMenu);
+  autorun(() => {
+    isTrayIconEnabled = params.settings.get('enableSystemTray');
 
-  trayIcon.on('click', () => {
-    params.mainWindow.show();
+    if (!isTrayIconEnabled) {
+      params.trayIcon.hide();
+    } else if (isTrayIconEnabled) {
+      params.trayIcon.show();
+    }
   });
 
   ipcMain.on('updateAppIndicator', (event, args) => {
@@ -68,13 +55,7 @@ export default (params) => {
       }
     }
 
-    // Update system tray
-    trayIcon.setImage(getAsset('tray', args.indicator !== 0 ? INDICATOR_TRAY_UNREAD : INDICATOR_TRAY_PLAIN));
-
-    if (process.platform === 'darwin') {
-      trayIcon.setPressedImage(
-        getAsset('tray', `${args.indicator !== 0 ? INDICATOR_TRAY_UNREAD : INDICATOR_TRAY_PLAIN}-active`),
-      );
-    }
+    // Update Tray
+    params.trayIcon.setIndicator(args.indicator);
   });
 };
diff --git a/src/electron/ipc-api/settings.js b/src/electron/ipc-api/settings.js
index 1d7eafa6c..995b28fbd 100644
--- a/src/electron/ipc-api/settings.js
+++ b/src/electron/ipc-api/settings.js
@@ -1,10 +1,7 @@
 import { ipcMain } from 'electron';
 
 export default (params) => {
-  if (process.platform === 'darwin' || process.platform === 'win32') {
-    // eslint-disable-next-line
-    ipcMain.on('settings', (event, args) => {
-      params.settings.set(args);
-    });
-  }
+  ipcMain.on('settings', (event, args) => {
+    params.settings.set(args);
+  });
 };
diff --git a/src/electron/ipc-api/tray.js b/src/electron/ipc-api/tray.js
deleted file mode 100644
index 43364c0ed..000000000
--- a/src/electron/ipc-api/tray.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import { Tray, Menu, ipcMain } from 'electron';
-import path from 'path';
-
-const INDICATOR_PLAIN = 'franz-taskbar';
-const INDICATOR_UNREAD = 'franz-taskbar-unread';
-
-const FILE_EXTENSION = process.platform === 'win32' ? 'ico' : 'png';
-
-let trayIcon;
-
-function getAsset(asset) {
-  return path.join(
-    __dirname, '..', '..', 'assets', 'images', 'tray', process.platform, `${asset}.${FILE_EXTENSION}`,
-  );
-}
-
-export default (params) => {
-  // if (process.platform === 'win32' || process.platform === 'linux') {
-  trayIcon = new Tray(getAsset(INDICATOR_PLAIN));
-  const trayMenuTemplate = [
-    {
-      label: 'Show Franz',
-      click() {
-        params.mainWindow.show();
-      },
-    }, {
-      label: 'Quit Franz',
-      click() {
-        params.app.quit();
-      },
-    },
-  ];
-
-  const trayMenu = Menu.buildFromTemplate(trayMenuTemplate);
-  trayIcon.setContextMenu(trayMenu);
-
-  trayIcon.on('click', () => {
-    params.mainWindow.show();
-  });
-
-  ipcMain.on('updateTrayIconIndicator', (event, args) => {
-    trayIcon.setImage(getAsset(args.count !== 0 ? INDICATOR_UNREAD : INDICATOR_PLAIN));
-
-    if (process.platform === 'darwin') {
-      trayIcon.setPressedImage(getAsset(`${args.count !== 0 ? INDICATOR_UNREAD : INDICATOR_PLAIN}-active`));
-    }
-  });
-};