remove accent colors and add error print to terminal

DerGoogler · May 15, 2024 · 927112d · 927112d
1 parent da351c1
commit 927112d
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 275 deletions.
diff --git a/Website/src/activitys/MainActivity.tsx b/Website/src/activitys/MainActivity.tsx
@@ -28,7 +28,6 @@ import UnverifiedHostActivity from "./UnverifiedHostActivity";
 import { useModFS } from "@Hooks/useModFS";
 import { SuFile } from "@Native/SuFile";
 import { LogcatActivity } from "./LogcatActivity";
-import { view } from "@Native/View";
 
 const getLocation = () => {
   if (window.location !== window.parent.location) {
@@ -285,18 +284,6 @@ const MainActivity = (): JSX.Element => {
       <Splitter>
         <Splitter.Side
           side="left"
-          sx={{
-            borderColor: theme.palette.menuoutline,
-            borderStyle: "solid",
-            borderLeft: "0px",
-            borderWidth: "1px",
-            borderRadius: `0px ${theme.shape.borderRadius}px ${theme.shape.borderRadius}px 0px`,
-            mt: `calc(${view.getWindowTopInsets() || 8}px + 0.5% - 2px)`,
-            mb: `calc(${view.getWindowBottomInsets() || 8}px + 0.5% - 2px)`,
-            ".page--material": {
-              borderRadius: `0px ${theme.shape.borderRadius}px ${theme.shape.borderRadius}px 0px`,
-            },
-          }}
           width={250}
           collapse={true}
           swipeable={false}

diff --git a/Website/src/activitys/SettingsActivity.tsx b/Website/src/activitys/SettingsActivity.tsx
@@ -144,6 +144,16 @@ function SettingsActivity() {
                   checked={settings.term_scroll_bottom}
                 />
               </ListItem>
+              <ListItem>
+                <ListItemText primary={strings("print_errors")} secondary={strings("print_errors_desc")} />
+                <Switch
+                  edge="end"
+                  onChange={(e) => {
+                    setSettings("term_scroll_bottom", e.target.checked);
+                  }}
+                  checked={settings.term_scroll_bottom}
+                />
+              </ListItem>
               <ListPickerItem
                 id="term-scroll-behavior"
                 targetSetting="term_scroll_behavior"

diff --git a/Website/src/activitys/TerminalActivity.tsx b/Website/src/activitys/TerminalActivity.tsx
@@ -140,6 +140,7 @@ const TerminalActivity = () => {
         }),
         cwd: "/data/local/tmp",
         env: envp_explore,
+        printError: settings.print_terminal_error,
         onLine: (line) => {
           if (line.startsWith("#!mmrl:")) {
             processCommand(line.substring(7));
@@ -234,6 +235,7 @@ const TerminalActivity = () => {
           ZIPFILE: path,
         }),
         env: envp_local,
+        printError: settings.print_terminal_error,
         cwd: "/data/local/tmp",
         onLine: (line) => {
           if (line.startsWith("#!mmrl:")) {

diff --git a/Website/src/components/DialogEditTextListItem.tsx b/Website/src/components/DialogEditTextListItem.tsx
@@ -29,7 +29,6 @@ export interface DialogEditTextListItemProps extends React.PropsWithChildren {
 
 export const DialogEditTextListItem = (props: DialogEditTextListItemProps) => {
   const { strings } = useStrings();
-  const { scheme, shade } = useTheme();
 
   const [textInput, setTextInput] = React.useState(props.initialValue);
   const [open, setOpen] = React.useState(false);

diff --git a/Website/src/components/ListPickerItem.tsx b/Website/src/components/ListPickerItem.tsx
@@ -20,7 +20,7 @@ interface PickerItemProps {
   id: string;
   disabled?: boolean;
   contentMap: ContentMap[];
-  targetSetting: "language" | "accent_scheme" | "term_scroll_behavior";
+  targetSetting: "language" | "term_scroll_behavior";
   title: React.ReactNode;
 }
 

diff --git a/Website/src/components/Markdown/StyledMarkdown.tsx b/Website/src/components/Markdown/StyledMarkdown.tsx
@@ -9,7 +9,7 @@ interface Props {
 }
 
 export const StyledMarkdown = styled("article")(() => {
-  const { theme, scheme, shade } = useTheme();
+  const { theme } = useTheme();
   const { settings } = useSettings();
 
   return {

diff --git a/Website/src/hooks/useModulesFilter.tsx b/Website/src/hooks/useModulesFilter.tsx
@@ -87,7 +87,7 @@ interface FilterDialogProps {
 }
 
 export const FilterDialog = (props: FilterDialogProps) => {
-  const { scheme, theme } = useTheme();
+  const { theme } = useTheme();
   const { onClose, selectedValue, open } = props;
 
   const handleClose = () => {
@@ -106,13 +106,7 @@ export const FilterDialog = (props: FilterDialogProps) => {
           <ListItem disableGutters key={filter.value}>
             <ListItemButton onClick={() => handleListItemClick(filter.value)}>
               <ListItemAvatar>
-                <Avatar
-                  sx={{
-                    bgcolor: scheme[100],
-                    color: scheme[600],
-                    border: filter.value === selectedValue ? `2px solid ${scheme[600]}` : "unset",
-                  }}
-                >
+                <Avatar>
                   <filter.icon />
                 </Avatar>
               </ListItemAvatar>

diff --git a/Website/src/hooks/useSettings.tsx b/Website/src/hooks/useSettings.tsx
@@ -1,152 +1,9 @@
 import React, { createContext, useContext } from "react";
-import { colors as kolors } from "@mui/material";
 import { defaultComposer } from "default-composer";
-import { os } from "@Native/Os";
 import { SetStateAction } from "./useStateCallback";
 import { useLanguageMap } from "./../locales/declaration";
-import { useNativeStorage } from "./useNativeStorage";
 import { useNativeFileStorage } from "./useNativeFileStorage";
 
-export const accent_colors: Picker<string, any>[] = [
-  {
-    name: "Purple",
-    value: "purple",
-  },
-  {
-    name: "Amber",
-    value: "amber",
-  },
-  {
-    name: "Blue",
-    value: "blue",
-  },
-  {
-    name: "Blue & Grey",
-    value: "blueGrey",
-  },
-  {
-    name: "Dark & Grey",
-    value: "darkGrey",
-  },
-  {
-    name: "Cyan",
-    value: "cyan",
-  },
-  {
-    name: "Deep Orange",
-    value: "deepOrange",
-  },
-
-  {
-    name: "Deep Purple",
-    value: "deepPurple",
-  },
-  {
-    name: "Green",
-    value: "green",
-  },
-  {
-    name: "Indigo",
-    value: "indigo",
-  },
-  {
-    name: "Light Blue",
-    value: "lightBlue",
-  },
-
-  {
-    name: "Light Green",
-    value: "lightGreen",
-  },
-  {
-    name: "Lime",
-    value: "lime",
-  },
-  {
-    name: "Orange",
-    value: "orange",
-  },
-  {
-    name: "Pink",
-    value: "pink",
-  },
-
-  {
-    name: "Red",
-    value: "red",
-  },
-  {
-    name: "Teal",
-    value: "teal",
-  },
-  {
-    name: "Yellow",
-    value: "yellow",
-  },
-  // Only load if it is android platform and above android 12
-  ...(os.isAndroid
-    ? os.sdk >= 31
-      ? [
-          {
-            name: "Monet (Android 12+)",
-            value: "monet",
-          },
-        ]
-      : []
-    : []),
-];
-
-const monet = {
-  50: os.getMonetColor("system_accent2_50"),
-  100: os.getMonetColor("system_accent2_100"),
-  200: os.getMonetColor("system_accent2_200"),
-  300: os.getMonetColor("system_accent2_300"),
-  400: os.getMonetColor("system_accent2_400"),
-  500: os.getMonetColor("system_accent2_500"),
-  600: os.getMonetColor("system_accent2_600"),
-  700: os.getMonetColor("system_accent2_700"),
-  800: os.getMonetColor("system_accent2_800"),
-  900: os.getMonetColor("system_accent2_900"),
-};
-
-const darkGrey = {
-  50: "#bcc8d4",
-  100: "#a9b4be",
-  200: "#96a0a9",
-  300: "#838c94",
-  400: "#70787f",
-  500: "#5e646a",
-  600: "#4b5054",
-  700: "#383c3f",
-  800: "#25282a",
-  900: "#121415",
-};
-
-export const colors = {
-  amber: kolors.amber,
-  blue: kolors.blue,
-  blueGrey: kolors.blueGrey,
-  darkGrey: darkGrey,
-  brown: kolors.brown,
-  cyan: kolors.cyan,
-  deepOrange: kolors.deepOrange,
-  deepPurple: kolors.deepPurple,
-  green: kolors.green,
-  grey: kolors.grey,
-  indigo: kolors.indigo,
-  lightBlue: kolors.lightBlue,
-  lightGreen: kolors.lightGreen,
-  lime: kolors.lime,
-  orange: kolors.orange,
-  pink: kolors.pink,
-  purple: kolors.purple,
-  red: kolors.red,
-  teal: kolors.teal,
-  yellow: kolors.yellow,
-  // Only load if it is android platform and above android 12
-  ...(os.isAndroid ? (os.sdk >= 31 ? { monet: monet } : {}) : {}),
-};
-
 export interface Picker<N, V> {
   name: N;
   value: V;
@@ -155,7 +12,6 @@ export interface Picker<N, V> {
 export interface StorageDeclaration {
   darkmode: boolean;
   language: Picker<string, string>;
-  accent_scheme: Picker<string, any>;
   eruda_console_enabled: boolean;
   disabled_repos: string[];
   _low_quality_module: boolean;
@@ -165,6 +21,7 @@ export interface StorageDeclaration {
   term_scroll_behavior: { name: string; value: ScrollBehavior };
   link_protection: boolean;
   swipeable_tabs: boolean;
+  print_terminal_error: boolean;
 }
 
 export const termScrollBehaviors: StorageDeclaration["term_scroll_behavior"][] = [
@@ -210,7 +67,6 @@ export const SettingsProvider = (props: React.PropsWithChildren) => {
     () => ({
       darkmode: false,
       language: availableLangs[0],
-      accent_scheme: accent_colors[0],
       eruda_console_enabled: false,
       disabled_repos: [],
       _low_quality_module: true,
@@ -220,11 +76,12 @@ export const SettingsProvider = (props: React.PropsWithChildren) => {
       term_scroll_behavior: termScrollBehaviors[0],
       link_protection: true,
       swipeable_tabs: false,
+      print_terminal_error: false,
     }),
     []
   );
 
-  const [settings, setSettings] = useNativeFileStorage("/data/adb/mmrl/settings.v1.json", INITIAL_SETTINGS, { loader: "json" });
+  const [settings, setSettings] = useNativeFileStorage("/data/adb/mmrl/settings.v2.json", INITIAL_SETTINGS, { loader: "json" });
 
   const _setSettings = (name, state, callback) => {
     setSettings(

diff --git a/Website/src/hooks/useShadeColor.ts b/Website/src/hooks/useShadeColor.ts