From e48611b11c3b1080cd40b1823400582d81056ac9 Mon Sep 17 00:00:00 2001
From: Vomitblood <tohyouxuan@gmail.com>
Date: Sat, 10 Aug 2024 02:43:41 +0800
Subject: [PATCH] style improvements

---
 src/components/Generic/FloatingDialog.tsx     | 10 ++-
 src/components/Generic/Layout.tsx             |  6 +-
 .../HeaderBar/Settings/Settings.tsx           | 12 +--
 ...ttingsTabBackground.tsx => Background.tsx} | 37 +++++---
 .../{SettingsTabStyle.tsx => Style.tsx}       | 86 +++++++++++++++----
 .../{SettingsTabWindow.tsx => Window.tsx}     | 11 +--
 src/contexts/ThemeContext.tsx                 |  4 +-
 src/lib/settings.ts                           |  3 +
 src/lib/utils/color.ts                        | 26 ++++++
 9 files changed, 151 insertions(+), 44 deletions(-)
 rename src/components/HeaderBar/Settings/SettingsTabs/{SettingsTabBackground.tsx => Background.tsx} (87%)
 rename src/components/HeaderBar/Settings/SettingsTabs/{SettingsTabStyle.tsx => Style.tsx} (75%)
 rename src/components/HeaderBar/Settings/SettingsTabs/{SettingsTabWindow.tsx => Window.tsx} (83%)
 create mode 100644 src/lib/utils/color.ts

diff --git a/src/components/Generic/FloatingDialog.tsx b/src/components/Generic/FloatingDialog.tsx
index 97ded8b..26ef1ea 100644
--- a/src/components/Generic/FloatingDialog.tsx
+++ b/src/components/Generic/FloatingDialog.tsx
@@ -1,7 +1,8 @@
 import { Close, UnfoldLess, UnfoldMore } from "@mui/icons-material";
-import { Box, IconButton, Modal, Tooltip, Typography } from "@mui/material";
+import { Box, IconButton, Modal, Tooltip, Typography, useTheme } from "@mui/material";
 import { FC, ReactNode } from "react";
 import { useSettings } from "../../contexts/SettingsContext";
+import { hexToRgba } from "../../lib/utils/color";
 
 interface FloatingDialog {
   actionButtons?: ReactNode;
@@ -28,7 +29,11 @@ export const FloatingDialog: FC<FloatingDialog> = ({
   title,
   sx,
 }) => {
+  // contexts
   const { settings } = useSettings();
+  const theme = useTheme();
+
+  const { r, g, b, a } = hexToRgba(theme.palette.background.paper);
 
   return (
     <>
@@ -40,7 +45,8 @@ export const FloatingDialog: FC<FloatingDialog> = ({
       >
         <Box
           sx={{
-            bgcolor: "background.paper",
+            backdropFilter: `blur(${settings.style.blur_radius}px)`,
+            backgroundColor: `rgba(${r}, ${g}, ${b}, ${settings.style.opacity})`,
             borderRadius: maximisedState ? "0px" : settings.style.radius + "px",
             display: "flex",
             flexDirection: "column",
diff --git a/src/components/Generic/Layout.tsx b/src/components/Generic/Layout.tsx
index a329e9c..744e810 100644
--- a/src/components/Generic/Layout.tsx
+++ b/src/components/Generic/Layout.tsx
@@ -1,4 +1,4 @@
-import { Box, Button } from "@mui/material";
+import { Box, Button, useTheme } from "@mui/material";
 import { convertFileSrc } from "@tauri-apps/api/tauri";
 import { useEffect, useState } from "react";
 import { useSettings } from "../../contexts/SettingsContext";
@@ -6,7 +6,9 @@ import { FooterBar } from "../FooterBar/FooterBar";
 import { HeaderBar } from "../HeaderBar/HeaderBar";
 
 export const Layout = () => {
+  // contexts
   const { settings } = useSettings();
+  const theme = useTheme();
 
   const [imageUrl, setImageUrl] = useState<string | null>(null);
 
@@ -23,7 +25,7 @@ export const Layout = () => {
     <Box
       sx={{
         // Use the URL function for background images
-        backgroundColor: settings.background.background_color,
+        backgroundColor: theme.palette.background.default,
         backgroundImage: settings.background.background_image_path ? `url(${imageUrl})` : "",
         backgroundSize: "cover",
         backgroundPosition: "center",
diff --git a/src/components/HeaderBar/Settings/Settings.tsx b/src/components/HeaderBar/Settings/Settings.tsx
index 42b5d6d..a0c7423 100644
--- a/src/components/HeaderBar/Settings/Settings.tsx
+++ b/src/components/HeaderBar/Settings/Settings.tsx
@@ -7,9 +7,9 @@ import { useEffect, useState } from "react";
 import { useSettings } from "../../../contexts/SettingsContext";
 import { stagedSettingsAtom } from "../../../lib/store/jotai/settings";
 import { FloatingDialog } from "../../Generic/FloatingDialog";
-import { SettingsTabBackground } from "./SettingsTabs/SettingsTabBackground";
-import { SettingsTabStyle } from "./SettingsTabs/SettingsTabStyle";
-import { SettingsTabWindow } from "./SettingsTabs/SettingsTabWindow";
+import { Background } from "./SettingsTabs/Background";
+import { Style } from "./SettingsTabs/Style";
+import { Window } from "./SettingsTabs/Window";
 
 export const Settings = () => {
   // contexts
@@ -127,19 +127,19 @@ export const Settings = () => {
                 sx={{ p: 2 }}
                 value="style"
               >
-                <SettingsTabStyle />
+                <Style />
               </TabPanel>
               <TabPanel
                 sx={{ p: 2 }}
                 value="background"
               >
-                <SettingsTabBackground />
+                <Background />
               </TabPanel>
               <TabPanel
                 sx={{ p: 2 }}
                 value="window"
               >
-                <SettingsTabWindow />
+                <Window />
               </TabPanel>
             </Box>
           </TabContext>
diff --git a/src/components/HeaderBar/Settings/SettingsTabs/SettingsTabBackground.tsx b/src/components/HeaderBar/Settings/SettingsTabs/Background.tsx
similarity index 87%
rename from src/components/HeaderBar/Settings/SettingsTabs/SettingsTabBackground.tsx
rename to src/components/HeaderBar/Settings/SettingsTabs/Background.tsx
index d6860df..5604f99 100644
--- a/src/components/HeaderBar/Settings/SettingsTabs/SettingsTabBackground.tsx
+++ b/src/components/HeaderBar/Settings/SettingsTabs/Background.tsx
@@ -1,21 +1,22 @@
 import { DeleteOutline, FileOpenOutlined } from "@mui/icons-material";
 import { Box, Button, Stack, TextField } from "@mui/material";
 import { open } from "@tauri-apps/api/dialog";
-import { convertFileSrc, invoke } from "@tauri-apps/api/tauri";
+import { readBinaryFile } from "@tauri-apps/api/fs";
+import { invoke } from "@tauri-apps/api/tauri";
 import { useAtom } from "jotai";
 import Image from "next/image";
 import { FC, useEffect, useState } from "react";
 import { useSettings } from "../../../../contexts/SettingsContext";
+import { defaultSettings } from "../../../../lib/settings";
 import { stagedSettingsAtom } from "../../../../lib/store/jotai/settings";
 import { CategoryTitle } from "../CategoryTitle";
 import { SettingsItem } from "../SettingsItem";
-import { readBinaryFile } from "@tauri-apps/api/fs";
 
-interface SettingsTabBackgroundProps {
+interface BackgroundProps {
   sx?: any;
 }
 
-export const SettingsTabBackground: FC<SettingsTabBackgroundProps> = ({ sx }) => {
+export const Background: FC<BackgroundProps> = ({ sx }) => {
   // contexts
   const { settings, updateSettings } = useSettings();
 
@@ -195,7 +196,7 @@ export const SettingsTabBackground: FC<SettingsTabBackgroundProps> = ({ sx }) =>
       </Box>
       <CategoryTitle title="Colors" />
       <SettingsItem
-        defaultText="#202124"
+        defaultText={defaultSettings.background.background_color}
         description="Background color"
         input={
           <TextField
@@ -213,13 +214,25 @@ export const SettingsTabBackground: FC<SettingsTabBackgroundProps> = ({ sx }) =>
           />
         }
       />
-      <button
-        onClick={() => {
-          updateSettings(stagedSettings);
-        }}
-      >
-        apply
-      </button>
+      <SettingsItem
+        defaultText={defaultSettings.background.background_color_popup}
+        description="Popup background color"
+        input={
+          <TextField
+            name="background_color_popup"
+            onChange={(e) => {
+              handleSettingsBackgroundValueChange(e.target.name, e.target.value);
+            }}
+            sx={{
+              width: "100%",
+            }}
+            size="small"
+            type="color"
+            value={stagedSettings.background.background_color_popup}
+            variant="standard"
+          />
+        }
+      />
     </Box>
   );
 };
diff --git a/src/components/HeaderBar/Settings/SettingsTabs/SettingsTabStyle.tsx b/src/components/HeaderBar/Settings/SettingsTabs/Style.tsx
similarity index 75%
rename from src/components/HeaderBar/Settings/SettingsTabs/SettingsTabStyle.tsx
rename to src/components/HeaderBar/Settings/SettingsTabs/Style.tsx
index 460acce..4be123a 100644
--- a/src/components/HeaderBar/Settings/SettingsTabs/SettingsTabStyle.tsx
+++ b/src/components/HeaderBar/Settings/SettingsTabs/Style.tsx
@@ -1,17 +1,18 @@
-import { Box, InputAdornment, MenuItem, Slider, Switch, TextField, Typography } from "@mui/material";
+import { Box, InputAdornment, MenuItem, Slider, Switch, TextField } from "@mui/material";
 import { useAtom } from "jotai";
 import { FC } from "react";
+import { defaultSettings } from "../../../../lib/settings";
 import { stagedSettingsAtom } from "../../../../lib/store/jotai/settings";
 import { BetaChip } from "../BetaChip";
 import { CategoryTitle } from "../CategoryTitle";
 import { DevChip } from "../DevChip";
 import { SettingsItem } from "../SettingsItem";
 
-interface SettingsTabStyleProps {
+interface StyleProps {
   sx?: any;
 }
 
-export const SettingsTabStyle: FC<SettingsTabStyleProps> = ({ sx }) => {
+export const Style: FC<StyleProps> = ({ sx }) => {
   // atoms
   const [stagedSettings, setStagedSettings] = useAtom(stagedSettingsAtom);
 
@@ -32,7 +33,7 @@ export const SettingsTabStyle: FC<SettingsTabStyleProps> = ({ sx }) => {
     <Box sx={{ sx }}>
       <CategoryTitle title="Basic styles" />
       <SettingsItem
-        defaultText="On"
+        defaultText={defaultSettings.style.dark_mode ? "On" : "Off"}
         description={
           <>
             <BetaChip />
@@ -50,7 +51,7 @@ export const SettingsTabStyle: FC<SettingsTabStyleProps> = ({ sx }) => {
         }
       />
       <SettingsItem
-        defaultText="#8ab4f8"
+        defaultText={defaultSettings.style.accent_color}
         description="Accent color"
         input={
           <TextField
@@ -69,7 +70,7 @@ export const SettingsTabStyle: FC<SettingsTabStyleProps> = ({ sx }) => {
         }
       />
       <SettingsItem
-        defaultText="Monospace"
+        defaultText={defaultSettings.style.font_family}
         description="Font family"
         inputLong={
           <TextField
@@ -94,7 +95,7 @@ export const SettingsTabStyle: FC<SettingsTabStyleProps> = ({ sx }) => {
         }
       />
       <SettingsItem
-        defaultText="100%"
+        defaultText={defaultSettings.style.font_scaling + "%"}
         description="Font scaling"
         inputBottom={
           <Slider
@@ -134,20 +135,20 @@ export const SettingsTabStyle: FC<SettingsTabStyleProps> = ({ sx }) => {
       />
       <CategoryTitle title="Advanced settings" />
       <SettingsItem
-        defaultText="200ms"
+        defaultText={defaultSettings.style.blur_radius + "px"}
         description={
           <>
             <DevChip />
-            Transition duration
+            Blur radius
           </>
         }
         input={
           <TextField
             InputProps={{
-              endAdornment: <InputAdornment position="end">ms</InputAdornment>,
+              endAdornment: <InputAdornment position="end">px</InputAdornment>,
               inputProps: { min: 0, max: 100, step: 1 },
             }}
-            name="transition_duration"
+            name="blur_radius"
             onChange={(e) => {
               handleSettingsStyleValueChange(e.target.name, parseFloat(e.target.value));
             }}
@@ -156,13 +157,13 @@ export const SettingsTabStyle: FC<SettingsTabStyleProps> = ({ sx }) => {
             }}
             size="small"
             type="number"
-            value={stagedSettings.style.transition_duration}
+            value={stagedSettings.style.blur_radius}
             variant="standard"
           />
         }
       />
       <SettingsItem
-        defaultText="8px"
+        defaultText={defaultSettings.style.radius + "px"}
         description={
           <>
             <DevChip />
@@ -190,7 +191,62 @@ export const SettingsTabStyle: FC<SettingsTabStyleProps> = ({ sx }) => {
         }
       />
       <SettingsItem
-        defaultText="60%"
+        defaultText={defaultSettings.style.opacity.toString()}
+        description={
+          <>
+            <DevChip />
+            Opacity
+          </>
+        }
+        input={
+          <TextField
+            InputProps={{
+              inputProps: { min: 0, max: 1, step: 0.01 },
+            }}
+            name="opacity"
+            onChange={(e) => {
+              handleSettingsStyleValueChange(e.target.name, parseFloat(e.target.value));
+            }}
+            sx={{
+              width: "100%",
+            }}
+            size="small"
+            type="number"
+            value={stagedSettings.style.opacity}
+            variant="standard"
+          />
+        }
+      />
+      <SettingsItem
+        defaultText={defaultSettings.style.transition_duration.toString()}
+        description={
+          <>
+            <DevChip />
+            Transition duration
+          </>
+        }
+        input={
+          <TextField
+            InputProps={{
+              endAdornment: <InputAdornment position="end">ms</InputAdornment>,
+              inputProps: { min: 0, max: 100, step: 1 },
+            }}
+            name="transition_duration"
+            onChange={(e) => {
+              handleSettingsStyleValueChange(e.target.name, parseFloat(e.target.value));
+            }}
+            sx={{
+              width: "100%",
+            }}
+            size="small"
+            type="number"
+            value={stagedSettings.style.transition_duration}
+            variant="standard"
+          />
+        }
+      />
+      <SettingsItem
+        defaultText={defaultSettings.style.window_height + "%"}
         description={
           <>
             <DevChip />
@@ -218,7 +274,7 @@ export const SettingsTabStyle: FC<SettingsTabStyleProps> = ({ sx }) => {
         }
       />
       <SettingsItem
-        defaultText="400px"
+        defaultText={defaultSettings.style.window_width + "px"}
         description={
           <>
             <DevChip />
diff --git a/src/components/HeaderBar/Settings/SettingsTabs/SettingsTabWindow.tsx b/src/components/HeaderBar/Settings/SettingsTabs/Window.tsx
similarity index 83%
rename from src/components/HeaderBar/Settings/SettingsTabs/SettingsTabWindow.tsx
rename to src/components/HeaderBar/Settings/SettingsTabs/Window.tsx
index 71e8ce9..89dcf74 100644
--- a/src/components/HeaderBar/Settings/SettingsTabs/SettingsTabWindow.tsx
+++ b/src/components/HeaderBar/Settings/SettingsTabs/Window.tsx
@@ -4,12 +4,13 @@ import { FC } from "react";
 import { stagedSettingsAtom } from "../../../../lib/store/jotai/settings";
 import { CategoryTitle } from "../CategoryTitle";
 import { SettingsItem } from "../SettingsItem";
+import { defaultSettings } from "../../../../lib/settings";
 
-interface SettingsTabWindowProps {
+interface WindowProps {
   sx?: any;
 }
 
-export const SettingsTabWindow: FC<SettingsTabWindowProps> = ({ sx }) => {
+export const Window: FC<WindowProps> = ({ sx }) => {
   // atoms
   const [stagedSettings, setStagedSettings] = useAtom(stagedSettingsAtom);
 
@@ -30,7 +31,7 @@ export const SettingsTabWindow: FC<SettingsTabWindowProps> = ({ sx }) => {
     <Box sx={{ sx }}>
       <CategoryTitle title="Fullscreen" />
       <SettingsItem
-        defaultText="On"
+        defaultText={defaultSettings.window.start_fullscreen ? "On" : "Off"}
         description="Fullscreen on startup"
         input={
           <Switch
@@ -44,7 +45,7 @@ export const SettingsTabWindow: FC<SettingsTabWindowProps> = ({ sx }) => {
       />
       <CategoryTitle title="Titlebar Buttons" />
       <SettingsItem
-        defaultText="Off"
+        defaultText={defaultSettings.window.minimize_button ? "On" : "Off"}
         description="Minimize button"
         input={
           <Switch
@@ -57,7 +58,7 @@ export const SettingsTabWindow: FC<SettingsTabWindowProps> = ({ sx }) => {
         }
       />
       <SettingsItem
-        defaultText="Off"
+        defaultText={defaultSettings.window.maximize_button ? "On" : "Off"}
         description="Maximize button"
         input={
           <Switch
diff --git a/src/contexts/ThemeContext.tsx b/src/contexts/ThemeContext.tsx
index 2b9f792..5b09f16 100644
--- a/src/contexts/ThemeContext.tsx
+++ b/src/contexts/ThemeContext.tsx
@@ -60,8 +60,8 @@ export const UserThemeProvider: FC<UserThemeProviderProps> = ({ children }) => {
       A700: "#616161",
     },
     background: {
-      paper: settings.style.dark_mode ? "#303134" : "#fff",
-      default: settings.style.dark_mode ? "#202124" : "#fff",
+      paper: settings.style.dark_mode ? settings.background.background_color_popup : "#fff",
+      default: settings.style.dark_mode ? settings.background.background_color : "#fff",
     },
   };
 
diff --git a/src/lib/settings.ts b/src/lib/settings.ts
index 1467244..632cd0d 100644
--- a/src/lib/settings.ts
+++ b/src/lib/settings.ts
@@ -4,13 +4,16 @@ import { readTomlFile, writeTomlFile } from "./utils/toml";
 export const defaultSettings = {
   background: {
     background_color: "#202124" as string,
+    background_color_popup: "#303134" as string,
     background_image_path: "" as string,
   },
   style: {
     accent_color: "#8ab4f8" as string,
+    blur_radius: 10 as number,
     dark_mode: true as boolean,
     font_family: "monospace" as string,
     font_scaling: 100,
+    opacity: 0.8 as number,
     radius: 8 as number,
     transition_duration: 200 as number,
     window_height: 80 as number,
diff --git a/src/lib/utils/color.ts b/src/lib/utils/color.ts
new file mode 100644
index 0000000..5a2d0a1
--- /dev/null
+++ b/src/lib/utils/color.ts
@@ -0,0 +1,26 @@
+export const hexToRgba = (hex: string): { r: number; g: number; b: number; a: number } => {
+  // remove the hash at the start if it is there
+  hex = hex.replace("#", "");
+
+  let r, g, b, a;
+
+  if (hex.length === 8) {
+    // hex have alpha (rrggbbaa)
+    r = parseInt(hex.substring(0, 2), 16);
+    g = parseInt(hex.substring(2, 4), 16);
+    b = parseInt(hex.substring(4, 6), 16);
+    // convert alpha (from 0-255) to decimal (from 0-1)
+    a = parseInt(hex.substring(6, 8), 16) / 255;
+  } else if (hex.length === 6) {
+    // hex no have alpha
+    r = parseInt(hex.substring(0, 2), 16);
+    g = parseInt(hex.substring(2, 4), 16);
+    b = parseInt(hex.substring(4, 6), 16);
+    // default alpha is 1
+    a = 1;
+  } else {
+    throw new Error("Invalid hex color format. Must be #rrggbbaa or #rrggbb.");
+  }
+
+  return { r, g, b, a };
+};