From 34fe544480c1b73e1fcb717ada432c6115988d14 Mon Sep 17 00:00:00 2001 From: Der_Googler <54764558+DerGoogler@users.noreply.github.com> Date: Fri, 22 Sep 2023 17:48:25 +0200 Subject: [PATCH] Other fixes --- Website/package-lock.json | 16 +++++ Website/package.json | 1 + Website/src/activitys/ModuleTreeConf.tsx | 10 +++- Website/src/activitys/ModuleViewActivity.tsx | 62 +------------------- Website/src/activitys/SettingsActivity.tsx | 12 ++-- 5 files changed, 33 insertions(+), 68 deletions(-) diff --git a/Website/package-lock.json b/Website/package-lock.json index 9d157bb3..c0699e0e 100644 --- a/Website/package-lock.json +++ b/Website/package-lock.json @@ -39,6 +39,7 @@ "react-device-detect": "^2.2.2", "react-disappear": "^1.0.0", "react-dom": "^18.2.0", + "react-fast-marquee": "^1.6.1", "react-from-json": "^0.7.2", "react-jsx-parser": "^1.29.0", "react-onsenui": "^1.13.2", @@ -14840,6 +14841,15 @@ "react": "^18.2.0" } }, + "node_modules/react-fast-marquee": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/react-fast-marquee/-/react-fast-marquee-1.6.1.tgz", + "integrity": "sha512-SFY+FQectFXsuCrcJuIxrh34YzJ+TKH0Lp6BqZaalVhjdmu6Sx11rKKGQiC6vvC/q9ySXYVn9sozoOvPXFSMoQ==", + "peerDependencies": { + "react": ">= 16.8.0 || 18.0.0", + "react-dom": ">= 16.8.0 || 18.0.0" + } + }, "node_modules/react-from-json": { "version": "0.7.2", "resolved": "https://registry.npmjs.org/react-from-json/-/react-from-json-0.7.2.tgz", @@ -27715,6 +27725,12 @@ "scheduler": "^0.23.0" } }, + "react-fast-marquee": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/react-fast-marquee/-/react-fast-marquee-1.6.1.tgz", + "integrity": "sha512-SFY+FQectFXsuCrcJuIxrh34YzJ+TKH0Lp6BqZaalVhjdmu6Sx11rKKGQiC6vvC/q9ySXYVn9sozoOvPXFSMoQ==", + "requires": {} + }, "react-from-json": { "version": "0.7.2", "resolved": "https://registry.npmjs.org/react-from-json/-/react-from-json-0.7.2.tgz", diff --git a/Website/package.json b/Website/package.json index 00cb93e4..a5efd316 100644 --- a/Website/package.json +++ b/Website/package.json @@ -59,6 +59,7 @@ "react-device-detect": "^2.2.2", "react-disappear": "^1.0.0", "react-dom": "^18.2.0", + "react-fast-marquee": "^1.6.1", "react-from-json": "^0.7.2", "react-jsx-parser": "^1.29.0", "react-onsenui": "^1.13.2", diff --git a/Website/src/activitys/ModuleTreeConf.tsx b/Website/src/activitys/ModuleTreeConf.tsx index c29726b7..bd4f65d0 100644 --- a/Website/src/activitys/ModuleTreeConf.tsx +++ b/Website/src/activitys/ModuleTreeConf.tsx @@ -18,6 +18,7 @@ import { Shell } from "@Native/Shell"; import { DialogEditTextListItem } from "@Components/DialogEditTextListItem"; import { KernelSULogo } from "@Components/icon/KernelSULogo"; import React from "react"; +import Marquee from "react-fast-marquee"; function ModuleTreeConf() { const { context } = useActivity(); @@ -163,7 +164,14 @@ function ModuleTreeConf() { initialValue={_modConf.CONFIG} onSuccess={(value) => {}} > - + + {_modConf.CONFIG} + + } + /> diff --git a/Website/src/activitys/ModuleViewActivity.tsx b/Website/src/activitys/ModuleViewActivity.tsx index a71e0970..8f00e31a 100644 --- a/Website/src/activitys/ModuleViewActivity.tsx +++ b/Website/src/activitys/ModuleViewActivity.tsx @@ -1,22 +1,13 @@ import { Page } from "@Components/onsenui/Page"; import { Toolbar } from "@Components/onsenui/Toolbar"; import { useStrings } from "@Hooks/useStrings"; -import VerifiedIcon from "@mui/icons-material/Verified"; -import { DeleteRounded, RefreshRounded } from "@mui/icons-material"; -import LaunchIcon from "@mui/icons-material/Launch"; import Box from "@mui/material/Box"; import React from "react"; -import Fade from "@mui/material/Fade"; import IconButton from "@mui/material/IconButton"; import List from "@mui/material/List"; import ListItem from "@mui/material/ListItem"; -import CloseIcon from "@mui/icons-material/Close"; import ArrowForwardIcon from "@mui/icons-material/ArrowForward"; import Typography from "@mui/material/Typography"; -import Dialog, { DialogProps } from "@mui/material/Dialog"; -import DialogContent from "@mui/material/DialogContent"; -import DialogContentText from "@mui/material/DialogContentText"; -import DialogTitle from "@mui/material/DialogTitle"; import Button from "@mui/material/Button"; import Avatar from "@mui/material/Avatar"; import Card from "@mui/material/Card"; @@ -31,9 +22,7 @@ import { StyledListItemText } from "@Components/StyledListItemText"; import { parseAndroidVersion } from "@Util/parseAndroidVersion"; import { Magisk } from "@Native/Magisk"; import { useTheme } from "@Hooks/useTheme"; -import useShadeColor from "@Hooks/useShadeColor"; import { os } from "@Native/Os"; -import { Markup } from "@Components/Markdown"; import Alert from "@mui/material/Alert"; import AlertTitle from "@mui/material/AlertTitle"; import { useCategories } from "@Hooks/useCategories"; @@ -70,6 +59,7 @@ const ModuleViewActivity = () => { id, name, author, + description, mmrlAuthor, mmrlLogo, mmrlScreenshots, @@ -391,54 +381,8 @@ const ModuleViewActivity = () => { - - {data} + + {description} Updated on diff --git a/Website/src/activitys/SettingsActivity.tsx b/Website/src/activitys/SettingsActivity.tsx index 4409b179..ec51aa20 100644 --- a/Website/src/activitys/SettingsActivity.tsx +++ b/Website/src/activitys/SettingsActivity.tsx @@ -103,7 +103,7 @@ function SettingsActivity() { }} /> - {os.isAndroid && ( + {/* {os.isAndroid && ( */} <> { @@ -114,20 +114,16 @@ function SettingsActivity() { }); }} > - + - )} + {/* )} */} {os.isAndroid && ( - Allows you to install local *.zip files (Experimental). {Shell.isKernelSU() && Disabled due KernelSU.} - - } + secondary="Allows you to install local *.zip files (Experimental)." />