From 002dd2752b760320615a5d62b407e89f6686b12b Mon Sep 17 00:00:00 2001
From: Hinton <hinton.oscar@gmail.com>
Date: Fri, 20 Nov 2020 14:05:50 +0100
Subject: [PATCH] Add setting for toggling hide dock

---
 src/app/accounts/settings.component.html | 10 ++++++++++
 src/app/accounts/settings.component.ts   |  8 ++++++++
 src/locales/en/messages.json             |  6 ++++++
 3 files changed, 24 insertions(+)

diff --git a/src/app/accounts/settings.component.html b/src/app/accounts/settings.component.html
index f54b90a2d7..9fef93a2ee 100644
--- a/src/app/accounts/settings.component.html
+++ b/src/app/accounts/settings.component.html
@@ -128,6 +128,16 @@
                             </div>
                             <small class="help-block">{{'startToTrayDesc' | i18n}}</small>
                         </div>
+                        <div class="form-group" *ngIf="showHideDock">
+                            <div class="checkbox">
+                                <label for="hideDock">
+                                    <input id="hideDock" type="checkbox" name="HideDock" [(ngModel)]="hideDock"
+                                        (change)="saveHideDock()">
+                                    {{'hideDock' | i18n}}
+                                </label>
+                            </div>
+                            <small class="help-block">{{'hideDockDesc' | i18n}}</small>
+                        </div>
                         <div class="form-group">
                             <label for="theme">{{'theme' | i18n}}</label>
                             <select id="theme" name="Theme" [(ngModel)]="theme" (change)="saveTheme()">
diff --git a/src/app/accounts/settings.component.ts b/src/app/accounts/settings.component.ts
index fafa817717..3e5dcf3acc 100644
--- a/src/app/accounts/settings.component.ts
+++ b/src/app/accounts/settings.component.ts
@@ -51,6 +51,8 @@ export class SettingsComponent implements OnInit {
     supportsBiometric: boolean;
     biometric: boolean;
     biometricText: string;
+    hideDock: boolean;
+    showHideDock: boolean = false;
 
     constructor(private analytics: Angulartics2, private toasterService: ToasterService,
         private i18nService: I18nService, private platformUtilsService: PlatformUtilsService,
@@ -131,6 +133,8 @@ export class SettingsComponent implements OnInit {
         this.supportsBiometric = await this.platformUtilsService.supportsBiometric();
         this.biometric = await this.vaultTimeoutService.isBiometricLockSet();
         this.biometricText = await this.storageService.get<string>(ConstantsService.biometricText);
+        this.hideDock = await this.storageService.get<boolean>(ElectronConstants.hideDock);
+        this.showHideDock = this.platformUtilsService.getDevice() === DeviceType.MacOsDesktop;
     }
 
     async saveVaultTimeoutOptions() {
@@ -277,6 +281,10 @@ export class SettingsComponent implements OnInit {
         });
     }
 
+    async saveHideDock() {
+        await this.storageService.save(ElectronConstants.hideDock, this.hideDock);
+    }
+
     private callAnalytics(name: string, enabled: boolean) {
         const status = enabled ? 'Enabled' : 'Disabled';
         this.analytics.eventTrack.next({ action: `${status} ${name}` });
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 926fa34b65..9d75ebcde4 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -870,6 +870,12 @@
   "startToTrayDesc": {
     "message": "When the application is first started, only show an icon in the system tray."
   },
+  "hideDock": {
+    "message": "Hide dock icon"
+  },
+  "hideDockDesc": {
+    "message": "Hide Bitwarden from the Dock when minimized to the menu bar."
+  },
   "language": {
     "message": "Language"
   },