Remove iOS theme in favor of plain light/dark themes

js/background.js

@@ -114,6 +114,17 @@
     }
   });
 
+  function mapOldThemeToNew(theme) {
+    switch (theme) {
+      case 'android-dark':
+        return 'dark';
+      case 'android':
+      case 'ios':
+      default:
+        return 'light';
+    }
+  }
+
   // We need this 'first' check because we don't want to start the app up any other time
   //   than the first time. And storage.fetch() will cause onready() to fire.
   let first = true;
@@ -171,6 +182,10 @@
       },
     };
 
+    const themeSetting = window.Events.getThemeSetting();
+    const newThemeSetting = mapOldThemeToNew(themeSetting);
+    window.Events.setThemeSetting(newThemeSetting);
+
     try {
       await ConversationController.load();
     } finally {

js/debug_log_start.js

@@ -5,7 +5,7 @@ $(document).on('keyup', function(e) {
 });
 
 const $body = $(document.body);
-$body.addClass(window.theme);
+$body.addClass(`${window.theme}-theme`);
 
 // got.js appears to need this to successfully submit debug logs to the cloud
 window.setImmediate = window.nodeSetImmediate;

js/permissions_popup_start.js

@@ -5,7 +5,7 @@ $(document).on('keyup', function(e) {
 });
 
 const $body = $(document.body);
-$body.addClass(window.theme);
+$body.addClass(`${window.theme}-theme`);
 
 window.view = new Whisper.ConfirmationDialogView({
   message: i18n('audioPermissionNeeded'),

js/settings_start.js

@@ -5,7 +5,7 @@ $(document).on('keyup', function(e) {
 });
 
 const $body = $(document.body);
-$body.addClass(window.theme);
+$body.addClass(`${window.theme}-theme`);
 
 const getInitialData = async () => ({
   deviceName: await window.getDeviceName(),

js/views/app_view.js

@@ -16,12 +16,11 @@
       openInbox: 'openInbox',
     },
     applyTheme: function() {
-      var theme = storage.get('theme-setting') || 'android';
+      var theme = storage.get('theme-setting') || 'light';
       this.$el
-        .removeClass('ios')
-        .removeClass('android-dark')
-        .removeClass('android')
-        .addClass(theme);
+        .removeClass('light-theme')
+        .removeClass('dark-theme')
+        .addClass(`${theme}-theme`);
     },
     applyHideMenu: function() {
       var hideMenuBar = storage.get('hide-menu-bar', false);

js/views/settings_view.js

@@ -85,10 +85,9 @@
         value: window.initialData.themeSetting,
         setFn: theme => {
           $(document.body)
-            .removeClass('android')
-            .removeClass('android-dark')
-            .removeClass('ios')
-            .addClass(theme);
+            .removeClass('dark-theme')
+            .removeClass('light-theme')
+            .addClass(`${theme}-theme`);
           window.setThemeSetting(theme);
         },
       });
@@ -132,7 +131,8 @@
         nameOnly: i18n('nameOnly'),
         audioNotificationDescription: i18n('audioNotificationDescription'),
         isAudioNotificationSupported: Settings.isAudioNotificationSupported(),
-        themeAndroidDark: i18n('themeAndroidDark'),
+        themeLight: i18n('themeLight'),
+        themeDark: i18n('themeDark'),
         hideMenuBar: i18n('hideMenuBar'),
         clearDataHeader: i18n('clearDataHeader'),
         clearDataButton: i18n('clearDataButton'),