Remove flickering on page loads, reduce flashbangs, fix settings and popup themes applying correctly (#1088)

* Pull theme from settings on page load

* Make dark mode default

* Fix flickering on load

* Invert shadow for auto shadow theme

* Revert "Make dark mode default"

This reverts commit 4cdfc39686a9faa3ce7a620be23025f97816f5f9.

* Improve page load times

* Fix flicker on load for popup preview without breaking theming when auto is selected

* Revert shadow invert

1 files changed, 8 insertions, 5 deletions

diff --git a/ext/js/pages/settings/settings-main.js b/ext/js/pages/settings/settings-main.js
index a315eac4..ebb51276 100644
--- a/ext/js/pages/settings/settings-main.js
+++ b/ext/js/pages/settings/settings-main.js
@@ -91,6 +91,14 @@ await Application.main(true, async (application) => {
     const settingsController = new SettingsController(application);
     await settingsController.prepare();
 
+    const settingsDisplayController = new SettingsDisplayController(settingsController, modalController);
+    await settingsDisplayController.prepare();
+
+    document.body.hidden = false;
+
+    const popupPreviewController = new PopupPreviewController(settingsController);
+    popupPreviewController.prepare();
+
     const persistentStorageController = new PersistentStorageController(application);
     preparePromises.push(persistentStorageController.prepare());
 
@@ -124,9 +132,6 @@ await Application.main(true, async (application) => {
     const ankiTemplatesController = new AnkiTemplatesController(application, settingsController, modalController, ankiController);
     preparePromises.push(ankiTemplatesController.prepare());
 
-    const popupPreviewController = new PopupPreviewController(settingsController);
-    popupPreviewController.prepare();
-
     const scanInputsController = new ScanInputsController(settingsController);
     preparePromises.push(scanInputsController.prepare());
 
@@ -169,8 +174,6 @@ await Application.main(true, async (application) => {
     const sortFrequencyDictionaryController = new SortFrequencyDictionaryController(settingsController);
     preparePromises.push(sortFrequencyDictionaryController.prepare());
 
-    const settingsDisplayController = new SettingsDisplayController(settingsController, modalController);
-    settingsDisplayController.prepare();
 
     await Promise.all(preparePromises);