Merge branch 'develop' into local-server

3 files changed, 147 insertions, 82 deletions

diff --git a/src/i18n/messages/src/components/settings/services/EditServiceForm.json b/src/i18n/messages/src/components/settings/services/EditServiceForm.json
index 45dc7b690..f4692ed29 100644
--- a/src/i18n/messages/src/components/settings/services/EditServiceForm.json
+++ b/src/i18n/messages/src/components/settings/services/EditServiceForm.json
@@ -26,15 +26,28 @@
     }
   },
   {
+    "id": "settings.service.form.openDarkmodeCss",
+    "defaultMessage": "!!!Open darkmode.css",
+    "file": "src/components/settings/services/EditServiceForm.js",
+    "start": {
+      "line": 32,
+      "column": 19
+    },
+    "end": {
+      "line": 35,
+      "column": 3
+    }
+  },
+  {
     "id": "settings.service.form.availableServices",
     "defaultMessage": "!!!Available services",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 32,
+      "line": 36,
       "column": 21
     },
     "end": {
-      "line": 35,
+      "line": 39,
       "column": 3
     }
   },
@@ -43,11 +56,11 @@
     "defaultMessage": "!!!Your services",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 36,
+      "line": 40,
       "column": 16
     },
     "end": {
-      "line": 39,
+      "line": 43,
       "column": 3
     }
   },
@@ -56,11 +69,11 @@
     "defaultMessage": "!!!Add {name}",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 40,
+      "line": 44,
       "column": 22
     },
     "end": {
-      "line": 43,
+      "line": 47,
       "column": 3
     }
   },
@@ -69,11 +82,11 @@
     "defaultMessage": "!!!Edit {name}",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 44,
+      "line": 48,
       "column": 23
     },
     "end": {
-      "line": 47,
+      "line": 51,
       "column": 3
     }
   },
@@ -82,11 +95,11 @@
     "defaultMessage": "!!!Hosted",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 48,
+      "line": 52,
       "column": 13
     },
     "end": {
-      "line": 51,
+      "line": 55,
       "column": 3
     }
   },
@@ -95,11 +108,11 @@
     "defaultMessage": "!!!Self hosted ⭐️",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 52,
+      "line": 56,
       "column": 16
     },
     "end": {
-      "line": 55,
+      "line": 59,
       "column": 3
     }
   },
@@ -108,11 +121,11 @@
     "defaultMessage": "!!!Use the hosted {name} service.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 56,
+      "line": 60,
       "column": 20
     },
     "end": {
-      "line": 59,
+      "line": 63,
       "column": 3
     }
   },
@@ -121,11 +134,11 @@
     "defaultMessage": "!!!Could not validate custom {name} server.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 60,
+      "line": 64,
       "column": 28
     },
     "end": {
-      "line": 63,
+      "line": 67,
       "column": 3
     }
   },
@@ -134,11 +147,11 @@
     "defaultMessage": "!!!To add self hosted services, you need a Ferdi Premium Supporter Account.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 64,
+      "line": 68,
       "column": 24
     },
     "end": {
-      "line": 67,
+      "line": 71,
       "column": 3
     }
   },
@@ -147,11 +160,11 @@
     "defaultMessage": "!!!Upgrade your account",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 68,
+      "line": 72,
       "column": 27
     },
     "end": {
-      "line": 71,
+      "line": 75,
       "column": 3
     }
   },
@@ -160,11 +173,11 @@
     "defaultMessage": "!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 72,
+      "line": 76,
       "column": 23
     },
     "end": {
-      "line": 75,
+      "line": 79,
       "column": 3
     }
   },
@@ -173,11 +186,11 @@
     "defaultMessage": "!!!When disabled, all notification sounds and audio playback are muted",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 76,
+      "line": 80,
       "column": 15
     },
     "end": {
-      "line": 79,
+      "line": 83,
       "column": 3
     }
   },
@@ -186,11 +199,11 @@
     "defaultMessage": "!!!Notifications",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 80,
+      "line": 84,
       "column": 25
     },
     "end": {
-      "line": 83,
+      "line": 87,
       "column": 3
     }
   },
@@ -199,11 +212,11 @@
     "defaultMessage": "!!!Unread message badges",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 84,
+      "line": 88,
       "column": 18
     },
     "end": {
-      "line": 87,
+      "line": 91,
       "column": 3
     }
   },
@@ -212,11 +225,11 @@
     "defaultMessage": "!!!General",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 88,
+      "line": 92,
       "column": 19
     },
     "end": {
-      "line": 91,
+      "line": 95,
       "column": 3
     }
   },
@@ -225,11 +238,11 @@
     "defaultMessage": "!!!Delete",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 92,
+      "line": 96,
       "column": 14
     },
     "end": {
-      "line": 95,
+      "line": 99,
       "column": 3
     }
   },
@@ -238,11 +251,11 @@
     "defaultMessage": "!!!Drop your image, or click here",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 96,
+      "line": 100,
       "column": 14
     },
     "end": {
-      "line": 99,
+      "line": 103,
       "column": 3
     }
   },
@@ -251,11 +264,11 @@
     "defaultMessage": "!!!HTTP/HTTPS Proxy Settings",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 100,
+      "line": 104,
       "column": 17
     },
     "end": {
-      "line": 103,
+      "line": 107,
       "column": 3
     }
   },
@@ -264,11 +277,11 @@
     "defaultMessage": "!!!Please restart Ferdi after changing proxy Settings.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 104,
+      "line": 108,
       "column": 20
     },
     "end": {
-      "line": 107,
+      "line": 111,
       "column": 3
     }
   },
@@ -277,11 +290,11 @@
     "defaultMessage": "!!!Proxy settings will not be synchronized with the Ferdi servers.",
     "file": "src/components/settings/services/EditServiceForm.js",
     "start": {
-      "line": 108,
+      "line": 112,
       "column": 13
     },
     "end": {
-      "line": 111,
+      "line": 115,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
index 97ecf4b5d..70c4fb87f 100644
--- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
+++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
@@ -182,15 +182,41 @@
     }
   },
   {
+    "id": "settings.app.universalDarkModeInfo",
+    "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 82,
+      "column": 25
+    },
+    "end": {
+      "line": 85,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.accentColorInfo",
+    "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: #7367f0)",
+    "file": "src/components/settings/settings/EditSettingsForm.js",
+    "start": {
+      "line": 86,
+      "column": 19
+    },
+    "end": {
+      "line": 89,
+      "column": 3
+    }
+  },
+  {
     "id": "settings.app.headlineAdvanced",
     "defaultMessage": "!!!Advanced",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 82,
+      "line": 90,
       "column": 20
     },
     "end": {
-      "line": 85,
+      "line": 93,
       "column": 3
     }
   },
@@ -199,11 +225,11 @@
     "defaultMessage": "!!!Help us to translate Ferdi into your language.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 86,
+      "line": 94,
       "column": 19
     },
     "end": {
-      "line": 89,
+      "line": 97,
       "column": 3
     }
   },
@@ -212,11 +238,11 @@
     "defaultMessage": "!!!Cache",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 90,
+      "line": 98,
       "column": 20
     },
     "end": {
-      "line": 93,
+      "line": 101,
       "column": 3
     }
   },
@@ -225,11 +251,11 @@
     "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 94,
+      "line": 102,
       "column": 13
     },
     "end": {
-      "line": 97,
+      "line": 105,
       "column": 3
     }
   },
@@ -238,11 +264,11 @@
     "defaultMessage": "!!!Clear cache",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 98,
+      "line": 106,
       "column": 23
     },
     "end": {
-      "line": 101,
+      "line": 109,
       "column": 3
     }
   },
@@ -251,11 +277,11 @@
     "defaultMessage": "!!!Check for updates",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 102,
+      "line": 110,
       "column": 25
     },
     "end": {
-      "line": 105,
+      "line": 113,
       "column": 3
     }
   },
@@ -264,11 +290,11 @@
     "defaultMessage": "!!!Restart & install update",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 106,
+      "line": 114,
       "column": 23
     },
     "end": {
-      "line": 109,
+      "line": 117,
       "column": 3
     }
   },
@@ -277,11 +303,11 @@
     "defaultMessage": "!!!Is searching for update",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 110,
+      "line": 118,
       "column": 25
     },
     "end": {
-      "line": 113,
+      "line": 121,
       "column": 3
     }
   },
@@ -290,11 +316,11 @@
     "defaultMessage": "!!!Update available, downloading...",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 114,
+      "line": 122,
       "column": 25
     },
     "end": {
-      "line": 117,
+      "line": 125,
       "column": 3
     }
   },
@@ -303,11 +329,11 @@
     "defaultMessage": "!!!You are using the latest version of Ferdi",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 118,
+      "line": 126,
       "column": 24
     },
     "end": {
-      "line": 121,
+      "line": 129,
       "column": 3
     }
   },
@@ -316,11 +342,11 @@
     "defaultMessage": "!!!Current version:",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 122,
+      "line": 130,
       "column": 18
     },
     "end": {
-      "line": 125,
+      "line": 133,
       "column": 3
     }
   },
@@ -329,11 +355,11 @@
     "defaultMessage": "!!!Changes require restart",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 126,
+      "line": 134,
       "column": 29
     },
     "end": {
-      "line": 129,
+      "line": 137,
       "column": 3
     }
   },
@@ -342,11 +368,11 @@
     "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
     "file": "src/components/settings/settings/EditSettingsForm.js",
     "start": {
-      "line": 130,
+      "line": 138,
       "column": 22
     },
     "end": {
-      "line": 133,
+      "line": 141,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index 54a8868bf..5ec8fdba7 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -234,15 +234,41 @@
     }
   },
   {
+    "id": "settings.app.form.universalDarkMode",
+    "defaultMessage": "!!!Enable universal Dark Mode",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 101,
+      "column": 21
+    },
+    "end": {
+      "line": 104,
+      "column": 3
+    }
+  },
+  {
+    "id": "settings.app.form.accentColor",
+    "defaultMessage": "!!!Accent color",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 105,
+      "column": 15
+    },
+    "end": {
+      "line": 108,
+      "column": 3
+    }
+  },
+  {
     "id": "settings.app.form.showDisabledServices",
     "defaultMessage": "!!!Display disabled services tabs",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 101,
+      "line": 109,
       "column": 24
     },
     "end": {
-      "line": 104,
+      "line": 112,
       "column": 3
     }
   },
@@ -251,11 +277,11 @@
     "defaultMessage": "!!!Show unread message badge when notifications are disabled",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 105,
+      "line": 113,
       "column": 29
     },
     "end": {
-      "line": 108,
+      "line": 116,
       "column": 3
     }
   },
@@ -264,11 +290,11 @@
     "defaultMessage": "!!!Enable spell checking",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 109,
+      "line": 117,
       "column": 23
     },
     "end": {
-      "line": 112,
+      "line": 120,
       "column": 3
     }
   },
@@ -277,11 +303,11 @@
     "defaultMessage": "!!!Enable GPU Acceleration",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 113,
+      "line": 121,
       "column": 25
     },
     "end": {
-      "line": 116,
+      "line": 124,
       "column": 3
     }
   },
@@ -290,11 +316,11 @@
     "defaultMessage": "!!!Include beta versions",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 117,
+      "line": 125,
       "column": 8
     },
     "end": {
-      "line": 120,
+      "line": 128,
       "column": 3
     }
   },
@@ -303,11 +329,11 @@
     "defaultMessage": "!!!Disable updates",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 121,
+      "line": 129,
       "column": 13
     },
     "end": {
-      "line": 124,
+      "line": 132,
       "column": 3
     }
   },
@@ -316,11 +342,11 @@
     "defaultMessage": "!!!Enable Franz Todos",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 125,
+      "line": 133,
       "column": 15
     },
     "end": {
-      "line": 128,
+      "line": 136,
       "column": 3
     }
   },
@@ -329,11 +355,11 @@
     "defaultMessage": "!!!Keep all workspaces loaded",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 129,
+      "line": 137,
       "column": 27
     },
     "end": {
-      "line": 132,
+      "line": 140,
       "column": 3
     }
   }