rework settings system

DerGoogler · Aug 29, 2024 · b19640e · b19640e
1 parent 136bdc7
commit b19640e
Show file tree

Hide file tree

Showing 23 changed files with 126 additions and 648 deletions.
diff --git a/src/activitys/AboutActivity.tsx b/src/activitys/AboutActivity.tsx
@@ -12,7 +12,6 @@ import Avatar from "@mui/material/Avatar";
 import Typography from "@mui/material/Typography";
 import Stack from "@mui/material/Stack";
 import CodeRoundedIcon from "@mui/icons-material/CodeRounded";
-import { useSettings } from "@Hooks/useSettings";
 import { Shell } from "@Native/Shell";
 import { ListSubheader } from "@mui/material";
 import React from "react";
@@ -33,7 +32,6 @@ const checkRoot = (): string | undefined => {
 
 const AboutActivity = () => {
   const { strings } = useStrings();
-  const { settings } = useSettings();
   const { context } = useActivity();
 
   const renderToolbar = () => {
@@ -102,9 +100,7 @@ const AboutActivity = () => {
                   bgcolor: "transparent",
                 })}
                 src={checkRoot()}
-              >
-
-              </Avatar>
+              ></Avatar>
             }
           >
             <Avatar sx={{ height: 100, width: 100, bgcolor: "#4a148c" }}>
@@ -115,7 +111,6 @@ const AboutActivity = () => {
           <Typography
             variant="h3"
             noWrap
-            color={settings.darkmode ? "text.primary" : undefined}
             sx={{
               display: "flex",
               fontFamily: "monospace",
@@ -137,7 +132,7 @@ const AboutActivity = () => {
                     primary={
                       <>
                         <Stack direction="row" justifyContent="space-between" alignItems="center" spacing={1}>
-                          <Typography sx={{ display: "inline" }} color={settings.darkmode ? "text.primary" : undefined} component="span">
+                          <Typography sx={{ display: "inline" }} component="span">
                             {c.primary}
                           </Typography>
                           <Typography sx={{ display: "inline" }} component="span" variant="body2" color="text.primary">

diff --git a/src/activitys/CommentsActivity.tsx b/src/activitys/CommentsActivity.tsx
@@ -5,16 +5,14 @@ import { useStrings } from "@Hooks/useStrings";
 import ArrowBackIcon from "@mui/icons-material/ArrowBack";
 import { useSettings } from "@Hooks/useSettings";
 import Giscus from "@giscus/react";
-import { useTheme } from "@Hooks/useTheme";
 
 type Extra = {
   id: string;
 };
 
 const CommentsActivity = () => {
   const { strings } = useStrings();
-  const { settings } = useSettings();
-  const { theme } = useTheme();
+  const [language] = useSettings("language");
   const { context, extra } = useActivity<Extra>();
 
   const renderToolbar = () => {
@@ -43,7 +41,7 @@ const CommentsActivity = () => {
           emitMetadata="0"
           inputPosition="bottom"
           // theme="preferred_color_scheme"
-          lang={settings.language.value}
+          lang={language.value}
           loading="lazy"
         />
       </Page.RelativeContent>