Merge branch 'develop' into beta

Author: jarrodek

app.js

@@ -22,7 +22,7 @@ class ArcInit {
     /* global ipc, ArcContextMenu, ArcElectronDrive, OAuth2Handler,
     ThemeManager, ArcPreferencesProxy, CookieBridge, WorkspaceManager,
     FilesystemProxy, ElectronAmfService, versionInfo, WindowSearchService,
-    UpgradeHelper, ImportFilePrePprocessor */
+    UpgradeHelper, ImportFilePrePprocessor, EncryptionService */
     this.created = false;
     this.contextActions = new ArcContextMenu();
     this.driveBridge = new ArcElectronDrive();
@@ -33,6 +33,7 @@ class ArcInit {
     this.fs = new FilesystemProxy();
     this.amfService = new ElectronAmfService();
     this.search = new WindowSearchService();
+    this.encryption = new EncryptionService();
   }
   /**
    * @return {ImportFilePrePprocessor} Instance of import processor class.
@@ -66,6 +67,7 @@ class ArcInit {
     this.fs.listen();
     this.amfService.listen();
     this.search.listen();
+    this.encryption.listen();
 
     ipc.on('checking-for-update', () => {
       this.updateEventHandler('checking-for-update');

appresources/themes/@advanced-rest-client/arc-electron-anypoint-theme/arc-electron-anypoint-theme

@@ -338,4 +338,5 @@ body {
   --arc-toolbar-back-icon-color: #000;
   --arc-env-selector-background-color: transparent;
   --arc-env-selector-color: #000;
+  --arc-toolbar-icon-color: #fff;
 }

appresources/themes/@advanced-rest-client/arc-electron-anypoint-theme/arc-electron-anypoint-theme.css

@@ -1,7 +1,7 @@
 {
   "name": "@advanced-rest-client/arc-electron-anypoint-theme",
   "description": "Anypoint theme definition for Advanced REST Client",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "license": "Apache-2.0",
   "main": "arc-electron-anypoint-theme.css",
   "authors": [

appresources/themes/@advanced-rest-client/arc-electron-anypoint-theme/package.json

@@ -247,6 +247,7 @@ body {
   --arc-env-container-color: #fff;
   --arc-toolbar-variables-toggle-icon-color: #fff;
   --arc-toolbar-back-icon-color: #fff;
+  --arc-toolbar-icon-color: #fff;
 }
 
 body[narrow] {

appresources/themes/@advanced-rest-client/arc-electron-dark-theme/arc-electron-dark-theme.css

@@ -1,7 +1,7 @@
 {
   "name": "@advanced-rest-client/arc-electron-dark-theme",
   "description": "Dark theme definition for Advanced REST Client",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "license": "Apache-2.0",
   "main": "arc-electron-dark-theme.css",
   "authors": [

appresources/themes/@advanced-rest-client/arc-electron-dark-theme/package.json

@@ -136,6 +136,7 @@ body {
   --arc-env-container-color: #fff;
   --arc-toolbar-variables-toggle-icon-color: #fff;
   --arc-toolbar-back-icon-color: #fff;
+  --arc-toolbar-icon-color: #fff;
 }
 
 body[narrow] {

appresources/themes/@advanced-rest-client/arc-electron-default-theme/arc-electron-default-theme.css

@@ -1,7 +1,7 @@
 {
   "name": "@advanced-rest-client/arc-electron-default-theme",
   "description": "A default theme definition for Advanced REST Client",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "license": "Apache-2.0",
   "main": "arc-electron-default-theme.css",
   "authors": [

appresources/themes/@advanced-rest-client/arc-electron-default-theme/package.json

@@ -6,7 +6,7 @@
       "_id": "advanced-rest-client/arc-electron-default-theme",
       "title": "Default theme",
       "name": "@advanced-rest-client/arc-electron-default-theme",
-      "version": "3.0.0",
+      "version": "3.0.2",
       "location": "@advanced-rest-client/arc-electron-default-theme",
       "mainFile": "@advanced-rest-client/arc-electron-default-theme/arc-electron-default-theme.css",
       "description": "Advanced REST Client default theme",
@@ -16,7 +16,7 @@
       "_id": "advanced-rest-client/arc-electron-anypoint-theme",
       "title": "Anypoint theme",
       "name": "@advanced-rest-client/arc-electron-anypoint-theme",
-      "version": "3.0.0",
+      "version": "3.0.2",
       "location": "@advanced-rest-client/arc-electron-anypoint-theme",
       "mainFile": "@advanced-rest-client/arc-electron-anypoint-theme/arc-electron-anypoint-theme.css",
       "description": "Advanced REST Client anypoint theme",
@@ -26,7 +26,7 @@
       "_id": "advanced-rest-client/arc-electron-dark-theme",
       "title": "Dark theme",
       "name": "@advanced-rest-client/arc-electron-dark-theme",
-      "version": "3.0.0",
+      "version": "3.0.2",
       "location": "@advanced-rest-client/arc-electron-dark-theme",
       "mainFile": "@advanced-rest-client/arc-electron-dark-theme/arc-electron-dark-theme.css",
       "description": "Advanced REST Client dark theme",