![{_t("Cancel")}]({require("../../../res/img/cancel.svg")}){kind=small}
![{_t('Hangup')}]({require("../../../../res/img/hangup.svg")} "{_t('Hangup')}"){kind=small}
+
diff --git a/src/components/views/settings/tabs/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/GeneralUserSettingsTab.js
index bfcc7b945c..378a54a51a 100644
--- a/src/components/views/settings/tabs/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/GeneralUserSettingsTab.js
@@ -54,6 +54,7 @@ export default class GeneralUserSettingsTab extends React.Component {
if (this.state.theme === newTheme) return;
SettingsStore.setValue("theme", null, SettingLevel.ACCOUNT, newTheme);
+ this.setState({theme: newTheme});
dis.dispatch({action: 'set_theme', value: newTheme});
};
@@ -138,17 +139,14 @@ export default class GeneralUserSettingsTab extends React.Component {
}
_renderThemeSection() {
- // TODO: Re-enable theme selection once the themes actually work
const SettingsFlag = sdk.getComponent("views.elements.SettingsFlag");
return (
{_t("Theme")}
-
-
+
-
-
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7376b35fe5..74c32e2b30 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -522,10 +522,8 @@
"Phone numbers": "Phone numbers",
"Language and region": "Language and region",
"Theme": "Theme",
- "Light theme": "Light theme",
+ "Default theme": "Default theme",
"Dark theme": "Dark theme",
- "2018 theme": "2018 theme",
- "Status.im theme": "Status.im theme",
"Account management": "Account management",
"Deactivating your account is a permanent action - be careful!": "Deactivating your account is a permanent action - be careful!",
"Close Account": "Close Account",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 671f46b366..bd9d81996d 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -22,6 +22,7 @@ import {
NotificationsEnabledController,
} from "./controllers/NotificationControllers";
import CustomStatusController from "./controllers/CustomStatusController";
+import ThemeController from './controllers/ThemeController';
// These are just a bunch of helper arrays to avoid copy/pasting a bunch of times
const LEVELS_ROOM_SETTINGS = ['device', 'room-device', 'room-account', 'account', 'config'];
@@ -231,8 +232,9 @@ export const SETTINGS = {
invertedSettingName: 'TagPanel.disableTagPanel',
},
"theme": {
- supportedLevels: ['config'],
- default: "dharma",
+ supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+ default: "light",
+ controller: new ThemeController(),
},
"webRtcForcePeerToPeer": {
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
diff --git a/src/settings/controllers/ThemeController.js b/src/settings/controllers/ThemeController.js
new file mode 100644
index 0000000000..615fc4c192
--- /dev/null
+++ b/src/settings/controllers/ThemeController.js
@@ -0,0 +1,33 @@
+/*
+Copyright 2019 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import SettingController from "./SettingController";
+
+const SUPPORTED_THEMES = [
+ "light",
+ "dark",
+];
+
+export default class ThemeController extends SettingController {
+ getValueOverride(level, roomId, calculatedValue, calculatedAtLevel) {
+ // Override in case some no longer supported theme is stored here
+ if (!SUPPORTED_THEMES.includes(calculatedValue)) {
+ return "light";
+ }
+
+ return null; // no override
+ }
+}
diff --git a/src/settings/handlers/ConfigSettingsHandler.js b/src/settings/handlers/ConfigSettingsHandler.js
index 67fff51e5b..a54ad1cef6 100644
--- a/src/settings/handlers/ConfigSettingsHandler.js
+++ b/src/settings/handlers/ConfigSettingsHandler.js
@@ -1,5 +1,6 @@
/*
Copyright 2017 Travis Ralston
+Copyright 2019 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -27,7 +28,7 @@ export default class ConfigSettingsHandler extends SettingsHandler {
// Special case themes
if (settingName === "theme") {
- return "dharma"; // config["default_theme"];
+ return config["default_theme"];
}
const settingsConfig = config["settingDefaults"];