From e7788c1b17f258d238fbd0c97260072c8d292550 Mon Sep 17 00:00:00 2001
From: hensm <m@matt.tf>
Date: Tue, 9 Aug 2022 18:31:08 +0100
Subject: [PATCH] Hide advanced options by default and add toggle checkbox

---
 ext/src/_locales/en/messages.json   |   4 +
 ext/src/defaultOptions.ts           |   4 +-
 ext/src/ui/options/Options.svelte   | 299 ++++++++++++++++------------
 ext/src/ui/options/Whitelist.svelte |   2 +-
 ext/src/ui/options/styles/index.css |  20 +-
 5 files changed, 186 insertions(+), 143 deletions(-)

diff --git a/ext/src/_locales/en/messages.json b/ext/src/_locales/en/messages.json
index 2418ef4..ed4a99d 100755
--- a/ext/src/_locales/en/messages.json
+++ b/ext/src/_locales/en/messages.json
@@ -415,5 +415,9 @@
     "optionsSaved": {
         "message": "Saved!",
         "description": "Status text displayed by save button once options have been successfully saved."
+    },
+    "optionsShowAdvancedOptions": {
+        "message": "Show advanced options",
+        "description": "Show advanced options checkbox label."
     }
 }
diff --git a/ext/src/defaultOptions.ts b/ext/src/defaultOptions.ts
index 8eb2fbe..2759693 100644
--- a/ext/src/defaultOptions.ts
+++ b/ext/src/defaultOptions.ts
@@ -19,6 +19,7 @@ export interface Options {
     siteWhitelistEnabled: boolean;
     siteWhitelist: WhitelistItemData[];
     siteWhitelistCustomUserAgent: string;
+    showAdvancedOptions: boolean;
 
     [key: string]: Options[keyof Options];
 }
@@ -39,5 +40,6 @@ export default {
     receiverSelectorWaitForConnection: true,
     siteWhitelistEnabled: true,
     siteWhitelist: [{ pattern: "https://www.netflix.com/*" }],
-    siteWhitelistCustomUserAgent: ""
+    siteWhitelistCustomUserAgent: "",
+    showAdvancedOptions: false
 } as Options;
diff --git a/ext/src/ui/options/Options.svelte b/ext/src/ui/options/Options.svelte
index 4ece5f4..874f82c 100644
--- a/ext/src/ui/options/Options.svelte
+++ b/ext/src/ui/options/Options.svelte
@@ -68,13 +68,19 @@
     }
 
     function resetForm() {
-        opts = JSON.parse(JSON.stringify(defaultOptions));
+        if (!opts) return;
+
+        opts = {
+            ...JSON.parse(JSON.stringify(defaultOptions)),
+            // Retain advanced options shown state
+            showAdvancedOptions: opts.showAdvancedOptions
+        };
     }
 </script>
 
 {#if opts}
     <form
-        id="form"
+        class="form"
         bind:this={formElement}
         on:input={onFormInput}
         on:submit|preventDefault={onFormSubmit}
@@ -102,21 +108,23 @@
                 </label>
             </div>
 
-            <div class="option option--inline">
-                <div class="option__control">
-                    <input
-                        id="mediaSyncElement"
-                        type="checkbox"
-                        bind:checked={opts.mediaSyncElement}
-                    />
+            {#if opts.showAdvancedOptions}
+                <div class="option option--inline">
+                    <div class="option__control">
+                        <input
+                            id="mediaSyncElement"
+                            type="checkbox"
+                            bind:checked={opts.mediaSyncElement}
+                        />
+                    </div>
+                    <label class="option__label" for="mediaSyncElement">
+                        {_("optionsMediaSyncElement")}
+                    </label>
+                    <div class="option__description">
+                        {_("optionsMediaSyncElementDescription")}
+                    </div>
                 </div>
-                <label class="option__label" for="mediaSyncElement">
-                    {_("optionsMediaSyncElement")}
-                </label>
-                <div class="option__description">
-                    {_("optionsMediaSyncElementDescription")}
-                </div>
-            </div>
+            {/if}
 
             <div class="option option--inline">
                 <div class="option__control">
@@ -166,88 +174,93 @@
             </div>
         </fieldset>
 
-        <fieldset class="category">
-            <legend class="category__name">
-                <h2>{_("optionsMirroringCategoryName")}</h2>
-            </legend>
-            <p class="category__description">
-                {_("optionsMirroringCategoryDescription")}
-            </p>
+        {#if opts.showAdvancedOptions}
+            <fieldset class="category">
+                <legend class="category__name">
+                    <h2>{_("optionsMirroringCategoryName")}</h2>
+                </legend>
+                <p class="category__description">
+                    {_("optionsMirroringCategoryDescription")}
+                </p>
 
-            <div class="option option--inline">
-                <div class="option__control">
-                    <input
-                        id="mirroringEnabled"
-                        type="checkbox"
-                        bind:checked={opts.mirroringEnabled}
-                    />
+                <div class="option option--inline">
+                    <div class="option__control">
+                        <input
+                            id="mirroringEnabled"
+                            type="checkbox"
+                            bind:checked={opts.mirroringEnabled}
+                        />
+                    </div>
+                    <label class="option__label" for="mirroringEnabled">
+                        {_("optionsMirroringEnabled")}
+                    </label>
                 </div>
-                <label class="option__label" for="mirroringEnabled">
-                    {_("optionsMirroringEnabled")}
-                </label>
-            </div>
-
-            <div class="option">
-                <label class="option__label" for="mirroringAppId">
-                    {_("optionsMirroringAppId")}
-                </label>
-                <div class="option__control">
-                    <input
-                        id="mirroringAppId"
-                        type="text"
-                        required
-                        bind:value={opts.mirroringAppId}
-                    />
-                    <div class="option__description">
-                        {_("optionsMirroringAppIdDescription")}
+                <div class="option">
+                    <label class="option__label" for="mirroringAppId">
+                        {_("optionsMirroringAppId")}
+                    </label>
+                    <div class="option__control">
+                        <input
+                            id="mirroringAppId"
+                            type="text"
+                            required
+                            bind:value={opts.mirroringAppId}
+                        />
+                        <div class="option__description">
+                            {_("optionsMirroringAppIdDescription")}
+                        </div>
                     </div>
                 </div>
-            </div>
-        </fieldset>
+            </fieldset>
+        {/if}
 
-        <fieldset class="category">
-            <legend class="category__name">
-                <h2>{_("optionsReceiverSelectorCategoryName")}</h2>
-            </legend>
-            <p class="category__description">
-                {_("optionsReceiverSelectorCategoryDescription")}
-            </p>
+        {#if opts.showAdvancedOptions}
+            <fieldset class="category">
+                <legend class="category__name">
+                    <h2>{_("optionsReceiverSelectorCategoryName")}</h2>
+                </legend>
+                <p class="category__description">
+                    {_("optionsReceiverSelectorCategoryDescription")}
+                </p>
 
-            <div class="option option--inline">
-                <div class="option__control">
-                    <input
-                        id="receiverSelectorWaitForConnection"
-                        type="checkbox"
-                        bind:checked={opts.receiverSelectorWaitForConnection}
-                    />
+                <div class="option option--inline">
+                    <div class="option__control">
+                        <input
+                            id="receiverSelectorWaitForConnection"
+                            type="checkbox"
+                            bind:checked={opts.receiverSelectorWaitForConnection}
+                        />
+                    </div>
+                    <label
+                        class="option__label"
+                        for="receiverSelectorWaitForConnection"
+                    >
+                        {_("optionsReceiverSelectorWaitForConnection")}
+                    </label>
+                    <div class="option__description">
+                        {_(
+                            "optionsReceiverSelectorWaitForConnectionDescription"
+                        )}
+                    </div>
                 </div>
-                <label
-                    class="option__label"
-                    for="receiverSelectorWaitForConnection"
-                >
-                    {_("optionsReceiverSelectorWaitForConnection")}
-                </label>
-                <div class="option__description">
-                    {_("optionsReceiverSelectorWaitForConnectionDescription")}
-                </div>
-            </div>
 
-            <div class="option option--inline">
-                <div class="option__control">
-                    <input
-                        id="receiverSelectorCloseIfFocusLost"
-                        type="checkbox"
-                        bind:checked={opts.receiverSelectorCloseIfFocusLost}
-                    />
+                <div class="option option--inline">
+                    <div class="option__control">
+                        <input
+                            id="receiverSelectorCloseIfFocusLost"
+                            type="checkbox"
+                            bind:checked={opts.receiverSelectorCloseIfFocusLost}
+                        />
+                    </div>
+                    <label
+                        class="option__label"
+                        for="receiverSelectorCloseIfFocusLost"
+                    >
+                        {_("optionsReceiverSelectorCloseIfFocusLost")}
+                    </label>
                 </div>
-                <label
-                    class="option__label"
-                    for="receiverSelectorCloseIfFocusLost"
-                >
-                    {_("optionsReceiverSelectorCloseIfFocusLost")}
-                </label>
-            </div>
-        </fieldset>
+            </fieldset>
+        {/if}
 
         <fieldset class="category">
             <legend class="category__name">
@@ -257,41 +270,48 @@
                 {_("optionsSiteWhitelistCategoryDescription")}
             </p>
 
-            <div class="option option--inline">
-                <div class="option__control">
-                    <input
-                        id="siteWhitelistEnabled"
-                        type="checkbox"
-                        bind:checked={opts.siteWhitelistEnabled}
-                    />
-                </div>
-                <label class="option__label" for="siteWhitelistEnabled">
-                    {_("optionsSiteWhitelistEnabled")}
-                    <span class="option__recommended">
-                        {_("optionsOptionRecommended")}
-                    </span>
-                </label>
-                <div class="option__description">
-                    {_("optionsSiteWhitelistEnabledDescription")}
-                </div>
-            </div>
-
-            <div class="option">
-                <label class="option__label" for="siteWhitelistCustomUserAgent">
-                    {_("optionsSiteWhitelistCustomUserAgent")}
-                </label>
-                <div class="option__control">
-                    <input
-                        id="siteWhitelistCustomUserAgent"
-                        type="text"
-                        bind:value={opts.siteWhitelistCustomUserAgent}
-                        placeholder={defaultUserAgent}
-                    />
+            {#if opts.showAdvancedOptions}
+                <div class="option option--inline">
+                    <div class="option__control">
+                        <input
+                            id="siteWhitelistEnabled"
+                            type="checkbox"
+                            bind:checked={opts.siteWhitelistEnabled}
+                        />
+                    </div>
+                    <label class="option__label" for="siteWhitelistEnabled">
+                        {_("optionsSiteWhitelistEnabled")}
+                        <span class="option__recommended">
+                            {_("optionsOptionRecommended")}
+                        </span>
+                    </label>
                     <div class="option__description">
-                        {_("optionsSiteWhitelistCustomUserAgentDescription")}
+                        {_("optionsSiteWhitelistEnabledDescription")}
                     </div>
                 </div>
-            </div>
+
+                <div class="option">
+                    <label
+                        class="option__label"
+                        for="siteWhitelistCustomUserAgent"
+                    >
+                        {_("optionsSiteWhitelistCustomUserAgent")}
+                    </label>
+                    <div class="option__control">
+                        <input
+                            id="siteWhitelistCustomUserAgent"
+                            type="text"
+                            bind:value={opts.siteWhitelistCustomUserAgent}
+                            placeholder={defaultUserAgent}
+                        />
+                        <div class="option__description">
+                            {_(
+                                "optionsSiteWhitelistCustomUserAgentDescription"
+                            )}
+                        </div>
+                    </div>
+                </div>
+            {/if}
 
             <div class="option">
                 <div class="option__label">
@@ -307,19 +327,34 @@
             </div>
         </fieldset>
 
-        <div id="buttons">
-            {#if isSavedIndicatorVisible}
-                <div id="status-line">
-                    {_("optionsSaved")}
+        <div class="form__footer">
+            <div class="option option--inline">
+                <div class="option__control">
+                    <input
+                        id="showAdvancedOptions"
+                        type="checkbox"
+                        bind:checked={opts.showAdvancedOptions}
+                    />
                 </div>
-            {/if}
+                <label class="option__label" for="showAdvancedOptions">
+                    {_("optionsShowAdvancedOptions")}
+                </label>
+            </div>
 
-            <button on:click={resetForm} type="button">
-                {_("optionsReset")}
-            </button>
-            <button type="submit" default disabled={!isFormValid}>
-                {_("optionsSave")}
-            </button>
+            <div class="form__buttons">
+                {#if isSavedIndicatorVisible}
+                    <div class="form__status-line">
+                        {_("optionsSaved")}
+                    </div>
+                {/if}
+
+                <button on:click={resetForm} type="button">
+                    {_("optionsReset")}
+                </button>
+                <button type="submit" default disabled={!isFormValid}>
+                    {_("optionsSave")}
+                </button>
+            </div>
         </div>
     </form>
 {/if}
diff --git a/ext/src/ui/options/Whitelist.svelte b/ext/src/ui/options/Whitelist.svelte
index 88a8506..ba8e7cb 100644
--- a/ext/src/ui/options/Whitelist.svelte
+++ b/ext/src/ui/options/Whitelist.svelte
@@ -183,7 +183,7 @@
                     <img src="assets/photon_delete.svg" alt="icon, remove" />
                 </button>
 
-                {#if !isEditingItem}
+                {#if !isEditingItem && opts.showAdvancedOptions}
                     <button
                         type="button"
                         class="whitelist__expand-button ghost"
diff --git a/ext/src/ui/options/styles/index.css b/ext/src/ui/options/styles/index.css
index f5208b6..9a9f717 100644
--- a/ext/src/ui/options/styles/index.css
+++ b/ext/src/ui/options/styles/index.css
@@ -48,23 +48,25 @@ button.ghost:not(:hover) {
     background-color: initial;
 }
 
-#form {
+.form {
     display: flex;
     flex-direction: column;
 }
 
-#buttons {
-    display: flex;
+.form__footer {
     align-items: center;
-    align-self: flex-end;
-    margin-block-start: 20px;
+    display: flex;
+    margin-top: 20px;
 }
 
-#buttons > :not(:last-child) {
-    margin-inline-end: 5px;
+.form__buttons {
+    align-items: center;
+    display: flex;
+    gap: 5px;
+    margin-inline-start: auto;
 }
 
-#status-line {
+.form__status-line {
     color: var(--secondary-color);
 }
 
@@ -228,7 +230,7 @@ button.ghost:not(:hover) {
     padding: 10px 0;
 }
 
-#form > .category {
+.form > .category {
     border-bottom: 1px solid var(--border-color);
 }