Merge pull request #52 from Minemetero/version-update

🔧 build: update sober from 0.7.0 to 1.1.5

Author: lingbopro

index.html

@@ -35,14 +35,14 @@
             <!-- Theme -->
             <s-tooltip slot="action" data-lang="ui.topbar.theme">
                 <s-icon-button id="topbar-theme-toggle" slot="trigger">
-                    <s-icon type="light_mode" id="theme-icon"></s-icon>
+                    <s-icon name="light_mode" id="theme-icon"></s-icon>
                 </s-icon-button>
             </s-tooltip>
             <!-- More -->
             <s-popup-menu slot="action">
                 <s-tooltip slot="trigger" data-lang="ui.topbar.more">
                     <s-icon-button slot="trigger">
-                        <s-icon type="more_horiz"></s-icon>
+                        <s-icon name="more_horiz"></s-icon>
                     </s-icon-button>
                 </s-tooltip>
                 <!-- GitHub -->
@@ -82,18 +82,18 @@
                         <!-- Winning Balls -->
                         <s-text-field id="winBalls" data-lang="ui.setup.winningBalls" data-lang-prop="label">
                             <s-icon-button id="setup-winBalls-add" slot="end">
-                                <s-icon type="chevron_up"></s-icon>
+                                <s-icon name="chevron_up"></s-icon>
                             </s-icon-button>
                             <s-icon-button id="setup-winBalls-minus" slot="end">
-                                <s-icon type="chevron_down"></s-icon>
+                                <s-icon name="chevron_down"></s-icon>
                             </s-icon-button>
                         </s-text-field>
                     </div>
                     <div class="form-group" id="playerInputGroup">
                         <!-- Player Name -->
                         <s-text-field id="playerName" data-lang="ui.setup.playerName" data-lang-prop="label">
                             <s-button type="text" slot="end" id="setup-addPlayer" data-lang="ui.setup.addPlayer">
-                                <s-icon slot="start" type="add"></s-icon>
+                                <s-icon slot="start" name="add"></s-icon>
                             </s-button>
                         </s-text-field>
                     </div>

package.json

@@ -17,6 +17,6 @@
     },
     "dependencies": {
         "canvas-confetti": "^1.9.3",
-        "sober": "~0.7.0"
+        "sober": "~1.1.5"
     }
 }

src/script.js

@@ -32,7 +32,7 @@ export function minusWinBalls() {
 export function addPlayer() {
     const playerName = document.getElementById('playerName').value.trim();
     if (playerName === '' || players.includes(playerName)) {
-        showSnackBar(lang('ui.tooltip.playerNameError'), 'PlayerNameError');
+        showSnackBar(lang('ui.tooltip.playerNameError'), 'PlayerNameError', 'error');
         return;
     }
     players.push(playerName);
@@ -56,13 +56,13 @@ export function updatePlayerList() {
 export function startGame() {
     showLoading();
     if (players.length < 2) {
-        showSnackBar(lang('ui.tooltip.playerAmountError'), 'PlayerAmountError');
+        showSnackBar(lang('ui.tooltip.playerAmountError'), 'PlayerAmountError', 'error');
         hideLoading();
         return;
     }
     winBalls = parseInt(document.getElementById('winBalls').value);
     if (isNaN(winBalls) || winBalls <= 0) {
-        showSnackBar(lang('ui.tooltip.winningBallsError'), 'WinningBallsError');
+        showSnackBar(lang('ui.tooltip.winningBallsError'), 'WinningBallsError', 'error');
         hideLoading();
         return;
     }
@@ -71,14 +71,15 @@ export function startGame() {
         document.getElementById('rotationalServes').value
     );
     if (isNaN(serveRule) || serveRule < 0 || serveRule > 1) {
-        showSnackBar(lang('ui.tooltip.serveRuleError'), 'ServeRuleError');
+        showSnackBar(lang('ui.tooltip.serveRuleError'), 'ServeRuleError', 'error');
         hideLoading();
         return;
     }
     if (serveRule === 1 && (isNaN(rotationalServes) || rotationalServes <= 0)) {
         showSnackBar(
             lang('ui.tooltip.rotationalServesError'),
-            'RotationalServesError'
+            'RotationalServesError',
+            'error'
         );
         hideLoading();
         return;
@@ -184,8 +185,8 @@ export function updateCurrentMatch() {
             <div class="playerTags">
                 <s-chip class="player-serve ${
                     serveRule === 1 && currentServe == 0 ? 'active' : ''
-                }" type="filled-tonal">
-                    <s-icon slot="start" type="done"></s-icon>
+                }" type="elevated">
+                    <s-icon slot="start" name="done"></s-icon>
                     ${lang('ui.gameBoard.serve')}
                 </s-chip>
             </div>
@@ -199,8 +200,8 @@ export function updateCurrentMatch() {
             <div class="playerTags">
                 <s-chip class="player-serve ${
                     serveRule === 1 && currentServe == 1 ? 'active' : ''
-                }" type="filled-tonal">
-                    <s-icon slot="start" type="done"></s-icon>
+                }" type="elevated">
+                    <s-icon slot="start" name="done"></s-icon>
                     ${lang('ui.gameBoard.serve')}
                 </s-chip>
             </div>
@@ -284,7 +285,7 @@ export function resetScores() {
 
 export function undoLastScore() {
     if (!lastScoringPlayer) {
-        showSnackBar(lang('ui.tooltip.noScoreToUndo'), 'NoScoreToUndo');
+        showSnackBar(lang('ui.tooltip.noScoreToUndo'), 'NoScoreToUndo', 'warning');
         return;
     }
 

src/ui.js

@@ -47,14 +47,15 @@ repo: https://github.com/Minemetero/Table-Tennis-Counter
     });
 }
 
-export function showSnackBar(message, id = 'snackbar') {
+export function showSnackBar(message, id = 'snackbar', type = 'info') {
     let snackBarEl = document.getElementById('snackbar-' + id);
     if (snackBarEl === null) {
         snackBarEl = document.createElement('s-snackbar');
         snackBarEl.id ='snackbar-' + id;
         document.getElementById('tooltips').appendChild(snackBarEl);
     }
     snackBarEl.innerText = message;
+    snackBarEl.type = type;
     snackBarEl.show();
 }
 export function showLoading() {
@@ -147,7 +148,7 @@ export function e_toggleTheme(theme) {
             break;
     }
     writeConfig('theme', theme);
-    showSnackBar(lang('ui.tooltip.themeSetTo', lang(`ui.theme.themeName.${theme}`)), 'Theme');
+    showSnackBar(lang('ui.tooltip.themeSetTo', lang(`ui.theme.themeName.${theme}`)), 'Theme', 'info');
 }
 
 export function e_reloadPage() {
@@ -156,7 +157,7 @@ export function e_reloadPage() {
 }
 
 export function e_gotoGitHub() {
-    showSnackBar(lang('ui.tooltip.repoTip'), 'RepoTips');
+    showSnackBar(lang('ui.tooltip.repoTip'), 'RepoTips', 'info');
     window.open('https://github.com/Minemetero/Table-Tennis-Counter', '_blank');
 }