feat: redesign settings screen using Material Design principles (#1263)

Robot-Inventor · Dec 26, 2024 · 0abc818 · 0abc818
1 parent d96dabc
commit 0abc818
Show file tree

Hide file tree

Showing 15 changed files with 144 additions and 388 deletions.
diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
@@ -153,9 +153,6 @@
     "initialSetup": {
         "message": "Initial Setup - Shadowban Scanner"
     },
-    "shadowbanScannerHasBeenInstalled": {
-        "message": "Shadowban Scanner has been installed."
-    },
     "letsStartWithASimpleInitialSetup": {
         "message": "Let's begin with a simple initial setup."
     },
@@ -181,7 +178,7 @@
         "message": "Next"
     },
     "initialSetupCompleted": {
-        "message": "Initial setup completed!<br>Would you like to open the usage instructions?"
+        "message": "Initial setup completed! Would you like to open the usage instructions?"
     },
     "open": {
         "message": "Open"

diff --git a/src/_locales/ja/messages.json b/src/_locales/ja/messages.json
@@ -153,9 +153,6 @@
     "initialSetup": {
         "message": "初期設定 - Shadowban Scanner"
     },
-    "shadowbanScannerHasBeenInstalled": {
-        "message": "Shadowban Scannerがインストールされました"
-    },
     "letsStartWithASimpleInitialSetup": {
         "message": "簡単な初期設定を始めましょう"
     },
@@ -181,7 +178,7 @@
         "message": "次へ"
     },
     "initialSetupCompleted": {
-        "message": "初期設定が完了しました！<br>使い方の説明を開きますか？"
+        "message": "初期設定が完了しました！使い方の説明を開きますか？"
     },
     "open": {
         "message": "開く"

diff --git a/src/_locales/ko/messages.json b/src/_locales/ko/messages.json
@@ -153,9 +153,6 @@
     "initialSetup": {
         "message": "초기 설정 - Shadowban Scanner"
     },
-    "shadowbanScannerHasBeenInstalled": {
-        "message": "Shadowban Scanner가 설치되었습니다."
-    },
     "letsStartWithASimpleInitialSetup": {
         "message": "간단한 초기 설정을 시작해 보겠습니다."
     },
@@ -181,7 +178,7 @@
         "message": "다음"
     },
     "initialSetupCompleted": {
-        "message": "초기 설정 완료!<br>사용 설명서를 열까요?"
+        "message": "초기 설정 완료! 사용 설명서를 열까요?"
     },
     "open": {
         "message": "열기"

diff --git a/src/_locales/zh_TW/messages.json b/src/_locales/zh_TW/messages.json
@@ -159,9 +159,6 @@
     "initialSetup": {
         "message": "初始設定 - Shadowban Scanner"
     },
-    "shadowbanScannerHasBeenInstalled": {
-        "message": "已安裝 Shadowban Scanner"
-    },
     "letsStartWithASimpleInitialSetup": {
         "message": "先從簡單的初始設定開始吧"
     },
@@ -187,7 +184,7 @@
         "message": "下一步"
     },
     "initialSetupCompleted": {
-        "message": "已完成初始設定！<br>是否要開啟使用說明？"
+        "message": "已完成初始設定！是否要開啟使用說明？"
     },
     "open": {
         "message": "開啟"

diff --git a/src/css/initialSetup.css b/src/css/initialSetup.css
@@ -1,4 +1,6 @@
-* {
+@import url("./theme.css");
+
+*:not(md-filled-button, md-text-button) {
     margin: 0;
     padding: 0;
     box-sizing: border-box;
@@ -10,22 +12,31 @@ body {
     height: 100%;
     font-family: sans-serif;
     font-size: 100%;
-    background: radial-gradient(#1c1f63, #111 50%);
-    color: white;
+    background: var(--md-surface-container);
+    color: var(--md-on-surface);
 }
 
 body {
     display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+#logo {
+    height: 2rem;
 }
 
 main {
     width: max-content;
+    height: max-content;
     max-width: 100%;
-    height: 80%;
-    padding: 2rem;
-    display: flex;
-    gap: 3rem;
-    margin: auto;
+    gap: 5rem;
+    margin: 2rem;
+    background: var(--md-surface);
+    border-radius: 1rem;
+    display: grid;
+    grid-template-columns: 1fr auto auto 1fr;
+    grid-template-rows: 1fr auto 1fr;
 }
 
 #shadowban-scanner-installed {
@@ -34,143 +45,90 @@ main {
 
 h1 {
     line-height: 110%;
-    font-size: 4rem;
-    text-align: center;
-    background: linear-gradient(to bottom, white, #a2a5b0);
-    background-clip: border-box;
-    background-clip: border-box;
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
+    font-size: 2.5rem;
+}
+
+#text-container {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 1rem;
+    grid-column: 2;
+    grid-row: 2;
 }
 
-#text-container,
 #button-container {
     display: flex;
     flex-direction: column;
     justify-content: center;
+    grid-column: 3;
+    grid-row: 2;
 }
 
 #instruction {
-    text-align: center;
     font-size: 1.3rem;
     font-weight: bold;
+    margin-top: 0.5rem;
 }
 
 #settings-buttons {
-    margin: 1rem 0;
-    height: 100%;
-    max-height: 20rem;
     display: flex;
-    max-width: 50rem;
+    flex-direction: column;
     gap: 1rem;
+    margin-top: 1rem;
 }
 
-.settings-button-item {
-    --button-margin: 1rem;
-    --button-padding: 0.5rem;
-    --button-default-border-width: 0.1rem;
-
-    width: calc(100% - var(--button-margin) * 2);
-    background: rgb(255, 255, 255, 20%);
-    backdrop-filter: blur(3rem);
-    border-radius: 0.5rem;
-    border: var(--button-default-border-width) solid rgb(255, 255, 255, 30%);
+.settings-button-item label {
     cursor: pointer;
-    color: white;
-    font-size: 1.5rem;
-    font-weight: bold;
-    padding: var(--button-padding);
-    transition:
-        background 0.3s,
-        transform 0.3s,
-        border-color 0.3s;
-    aspect-ratio: 1 / 1;
 }
 
 @media (orientation: portrait) {
-    h1 {
-        font-size: 3rem;
-        margin-top: 1rem;
+    #logo {
+        height: 1.5rem;
     }
 
-    body {
-        height: max-content;
+    h1 {
+        font-size: 1.75rem;
+        margin-top: 1rem;
     }
 
     main {
-        min-height: 100%;
-        max-width: 100%;
         width: 100%;
+        height: max-content;
+        margin: 1rem;
+        display: flex;
         flex-direction: column;
+        padding: 1.5rem;
+        gap: 2rem;
     }
 
-    #shadowban-scanner-installed {
-        font-size: 1rem;
+    #text-container {
+        align-items: center;
+        gap: 0;
     }
 
-    #settings-buttons {
-        max-height: none;
-        margin: 2rem 0;
-        max-width: 100%;
-        flex-direction: column;
+    #instruction {
+        font-size: 1.1rem;
+        font-weight: normal;
     }
 
-    .settings-button-item {
-        width: 100%;
+    #button-container {
+        grid-column: 2;
+        grid-row: 3;
     }
-}
-
-.settings-button-item:hover,
-.settings-button-item:focus {
-    background: rgb(255, 255, 255, 30%);
-    border-color: rgb(255, 255, 255, 40%);
-    transform: scale(1.01);
-}
 
-.settings-button-item.selected {
-    --button-selected-border-width: 0.3rem;
-    border: solid var(--button-selected-border-width) #bedfec;
-    padding: calc(var(--button-padding) - var(--button-selected-border-width) + var(--button-default-border-width));
+    #shadowban-scanner-installed {
+        font-size: 1rem;
+    }
 }
 
-.settings-button-item img {
-    display: block;
-    margin: auto;
-    height: 50%;
-    width: auto;
-    max-width: 100%;
-    filter: invert();
+md-list-item {
+    --md-list-item-label-text-color: var(--md-on-surface);
 }
 
 #navigation-buttons {
     display: flex;
     justify-content: flex-end;
     gap: 1rem;
-    margin-top: 1rem;
-}
-
-.basic-secondary-button,
-.basic-primary-button {
-    cursor: pointer;
-    color: white;
-    font-size: 100%;
-    padding: 0.5em 2em;
-    border-radius: 2em;
-}
-
-.basic-secondary-button:disabled,
-.basic-primary-button:disabled {
-    opacity: 0.5;
-    cursor: not-allowed;
-}
-
-.basic-secondary-button {
-    background: rgba(255, 255, 255, 0.2);
-    border: 0.1rem solid rgba(255, 255, 255, 0.2);
-}
-
-.basic-primary-button {
-    background: white;
-    color: #333;
-    border: none;
+    margin-top: 2rem;
 }
diff --git a/src/css/theme.css b/src/css/theme.css
@@ -1,6 +1,7 @@
 :root {
     --md-surface-container: #f2f3f6;
     --md-surface: white;
+    --md-sys-color-surface: var(--md-surface);
     --md-surface-variant: #fafafc;
     --md-on-surface: #36373a;
     --md-on-surface-variant: #768098;

diff --git a/src/html/initialSetup.html b/src/html/initialSetup.html
@@ -10,17 +10,19 @@
     <body>
         <main>
             <div id="text-container">
-                <div id="shadowban-scanner-installed" data-sb-translation="shadowbanScannerHasBeenInstalled"></div>
+                <img src="../image/logo.svg" alt="Shadowban Scanner Icon" id="logo" />
                 <h1 data-sb-translation="letsStartWithASimpleInitialSetup"></h1>
             </div>
             <div id="button-container">
                 <div id="instruction" data-sb-translation="pleaseSelectOneOfThem"></div>
-                <div id="settings-buttons">
-                    <!-- The contents of this element are dynamically generated. -->
-                </div>
+                <form id="settings-buttons">
+                    <md-list>
+                        <!-- The contents of this element are dynamically generated. -->
+                    </md-list>
+                </form>
                 <div id="navigation-buttons">
-                    <button id="back-button" class="basic-secondary-button" data-sb-translation="back"></button>
-                    <button id="next-button" class="basic-primary-button" data-sb-translation="next"></button>
+                    <md-text-button id="back-button" data-sb-translation="back"></md-text-button>
+                    <md-filled-button id="next-button" data-sb-translation="next"></md-filled-button>
                 </div>
             </div>
         </main>

diff --git a/src/image/materialSymbols/close.svg b/src/image/materialSymbols/close.svg
diff --git a/src/image/materialSymbols/done_all.svg b/src/image/materialSymbols/done_all.svg
diff --git a/src/image/materialSymbols/group.svg b/src/image/materialSymbols/group.svg
diff --git a/src/image/materialSymbols/open_in_new.svg b/src/image/materialSymbols/open_in_new.svg
diff --git a/src/image/materialSymbols/person.svg b/src/image/materialSymbols/person.svg
diff --git a/src/image/materialSymbols/report.svg b/src/image/materialSymbols/report.svg