Fixed #488 Added animations off indicator on stage.

wordplaydev · Jun 29, 2024 · 909ddd1 · 909ddd1
1 parent 30d15b4
commit 909ddd1
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ Dates are in `YYYY-MM-DD` format and versions are in [semantic versioning](http:
 -   Correct typos in tutorial.
 -   [#503](https://github.com/wordplaydev/wordplay/issues/503). Prevent infinite loops in parser.
 -   [#504](https://github.com/wordplaydev/wordplay/issues/504). Account for non-fixed-width characters in caret positioning.
+-   [#488](https://github.com/wordplaydev/wordplay/issues/488). Added animations off indicator on stage.
 
 ## 0.10.1 2024-06-22
 

diff --git a/src/components/project/ProjectView.svelte b/src/components/project/ProjectView.svelte
@@ -84,6 +84,7 @@
         blocks,
         localized,
         Creators,
+        animationFactor,
     } from '../../db/Database';
     import Arrangement from '../../db/Arrangement';
     import type Value from '../../values/Value';
@@ -121,6 +122,7 @@
     import Glyphs from '../../lore/Glyphs';
     import Speech from '@components/lore/Speech.svelte';
     import Translate from './Translate.svelte';
+    import { AnimationFactorIcons } from '@db/AnimationFactorSetting';
 
     export let project: Project;
     export let original: Project | undefined = undefined;
@@ -1334,6 +1336,24 @@
                                             )}>⨉</ConfirmButton
                                         >
                                     {/if}
+                                {:else if tile.kind === TileKind.Output}
+                                    <span
+                                        title={$locales.get(
+                                            (l) =>
+                                                l.ui.dialog.settings.mode
+                                                    .animate,
+                                        ).modes[$animationFactor]}
+                                        ><Emoji
+                                            >{AnimationFactorIcons[
+                                                $animationFactor
+                                            ]}</Emoji
+                                        >
+                                        {#if $animationFactor === 0}{$locales.get(
+                                                (l) =>
+                                                    l.ui.dialog.settings.mode
+                                                        .animate,
+                                            ).modes[0]}{/if}</span
+                                    >
                                 {/if}
                             </svelte:fragment>
                             <svelte:fragment slot="extra">

diff --git a/src/components/settings/Settings.svelte b/src/components/settings/Settings.svelte
@@ -21,6 +21,7 @@
     import CreatorView from '../app/CreatorView.svelte';
     import Beta from '../../routes/Beta.svelte';
     import { Creator } from '../../db/CreatorDatabase';
+    import { AnimationFactorIcons } from '@db/AnimationFactorSetting';
 
     let user = getUser();
 
@@ -115,7 +116,7 @@
                 )}
                 choice={$animationFactor}
                 select={(choice) => Settings.setAnimationFactor(choice)}
-                modes={['🧘🏽‍♀️', '🏃‍♀️', '½', '⅓', '¼']}
+                modes={AnimationFactorIcons}
             /></p
         >
         <!-- <p
@@ -210,18 +211,16 @@
             />
         </p>
         <p
-        ><Mode
-            descriptions={$locales.get(
-                (l) => l.ui.dialog.settings.mode.space,
-            )}
-            choice={$spaceIndicator === false ? 1 : 0}
-            select={(choice) =>
-                Settings.setSpace(
-                    choice === 0 ? true : false,
+            ><Mode
+                descriptions={$locales.get(
+                    (l) => l.ui.dialog.settings.mode.space,
                 )}
-            modes={['✓', '✗']}
-        />
-    </p>
+                choice={$spaceIndicator === false ? 1 : 0}
+                select={(choice) =>
+                    Settings.setSpace(choice === 0 ? true : false)}
+                modes={['✓', '✗']}
+            />
+        </p>
     </Dialog>
 </div>
 

diff --git a/src/db/AnimationFactorSetting.ts b/src/db/AnimationFactorSetting.ts
@@ -1,9 +1,11 @@
 import Setting from './Setting';
 
+export const AnimationFactorIcons = ['🧘🏽‍♀️', '🏃‍♀️', '½', '⅓', '¼'];
+
 export const AnimationFactorSetting = new Setting<number>(
     'animationFactor',
     false,
     1,
     (value) => (typeof value === 'number' && value >= 1 ? value : undefined),
-    (current, value) => current === value
+    (current, value) => current === value,
 );
diff --git a/src/locale/en-US.json b/src/locale/en-US.json
@@ -4259,8 +4259,8 @@
                     "animate": {
                         "label": "animations",
                         "modes": [
-                            "off",
-                            "on",
+                            "animations off",
+                            "normal speed",
                             "half speed",
                             "third speed",
                             "quarter speed"