Fix showing/hiding animations with persistent settings

ubports · Mar 21, 2022 · e5e8bb4 · e5e8bb4
1 parent 862b7fa
commit e5e8bb4
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/src/App.svelte b/src/App.svelte
@@ -5,6 +5,7 @@
   //Store imports
   import {
     animationType,
+    animationHidden,
     footerData,
     osSelectOptions,
     installConfigData,
@@ -36,6 +37,14 @@
   import routes from "./routes.mjs";
 
   //Messages
+  //Settings messages
+  ipcRenderer
+    .invoke("getSettingsValue", "never.udev")
+    .then(show => animationHidden.set(!show));
+  ipcRenderer.on("settings:animations", (e, show) =>
+    animationHidden.set(!show)
+  );
+
   //Routing messages
   ipcRenderer.on("user:write:working", (e, animation) => {
     animationType.set(animation);

diff --git a/src/lib/menuManager.js b/src/lib/menuManager.js
@@ -132,10 +132,8 @@ class MenuManager {
             checked: settings.get("animations"),
             type: "checkbox",
             click: () => {
-              if (settings.get("animations")) {
-                window.send("animations:hide");
-              }
               settings.set("animations", !settings.get("animations"));
+              window.send("settings:animations", settings.get("animations"));
             }
           },
           {

diff --git a/src/stores.mjs b/src/stores.mjs
@@ -2,6 +2,7 @@ import { writable } from "svelte/store";
 
 //working view
 export const animationType = writable("");
+export const animationHidden = writable(false);
 
 //wait for device view
 export const deviceSelectOptions = writable([]);

diff --git a/src/ui/partials/Animation.svelte b/src/ui/partials/Animation.svelte
@@ -1,16 +1,18 @@
 <script>
   import { onMount } from "svelte";
-  import { animationType } from "../../stores.mjs";
+  import { animationType, animationHidden } from "../../stores.mjs";
   import { tsParticles } from "tsparticles";
   import CircuitBoard from "./CircuitBoard.svelte";
   import Squares from "./Squares.svelte";
 
   onMount(updateAnimations);
   animationType.subscribe(updateAnimations);
+  animationHidden.subscribe(updateAnimations);
 
   function updateAnimations() {
     if (
       $animationType === "particles" &&
+      !$animationHidden &&
       document.getElementById("tsparticles")
     ) {
       document.getElementById("tsparticles").style = "display: inherit";
@@ -59,20 +61,20 @@
 -->
 <div id="tsparticles" class="animation" />
 
-{#if $animationType === "circuit"}
+{#if !$animationHidden && $animationType === "circuit"}
   <div class="animation">
     <CircuitBoard />
   </div>
 {/if}
-{#if $animationType === "squares"}
+{#if !$animationHidden && $animationType === "squares"}
   <div class="animation">
     <Squares />
   </div>
 {/if}
-{#if $animationType === "download"}
+{#if !$animationHidden && $animationType === "download"}
   <div class="download-animation animation" />
 {/if}
-{#if $animationType === "push"}
+{#if !$animationHidden && $animationType === "push"}
   <div class="push-animation animation" />
 {/if}