diff --git a/Website/package.json b/Website/package.json index a8839571..f4514289 100644 --- a/Website/package.json +++ b/Website/package.json @@ -5,8 +5,8 @@ "application_id": "com.dergoogler.mmrl", "min_sdk": 26, "target_sdk": 34, - "version_name": "1.10.6", - "version_code": 1106 + "version_name": "1.10.7", + "version_code": 1107 }, "main": "index.tsx", "keywords": [], diff --git a/Website/src/activitys/RepoActivity/components/RecommendedRepo.tsx b/Website/src/activitys/RepoActivity/components/RecommendedRepo.tsx index defe0e7f..2d2dcf7f 100644 --- a/Website/src/activitys/RepoActivity/components/RecommendedRepo.tsx +++ b/Website/src/activitys/RepoActivity/components/RecommendedRepo.tsx @@ -11,7 +11,6 @@ import { StyledListItemText } from "@Components/StyledListItemText"; interface RecommendedRepoProps { name: string; - moduleCount: number; link: string; } @@ -38,7 +37,7 @@ export const RecommendedRepo = (props: RecommendedRepoProps) => { } > - + ); }; diff --git a/Website/src/activitys/RepoActivity/index.tsx b/Website/src/activitys/RepoActivity/index.tsx index 328e4b22..998fae4a 100644 --- a/Website/src/activitys/RepoActivity/index.tsx +++ b/Website/src/activitys/RepoActivity/index.tsx @@ -29,18 +29,15 @@ import { useNetwork } from "@Hooks/useNetwork"; const recommended_repos = [ { name: "Magisk Modules Alternative Repository", - module_count: 100, - link: "https://api.mmrl.dergoogler.com/json/mmar.json", + link: "https://gr.dergoogler.com/magisk/mmar.json", }, { name: "Googlers Magisk Repo", - module_count: 5, - link: "https://api.mmrl.dergoogler.com/json/gmr.json", + link: "https://gr.dergoogler.com/magisk/gmr.json", }, { name: "Magisk Modules Repo (Official)", - module_count: 100, - link: "https://api.mmrl.dergoogler.com/json/mmr.json", + link: "https://gr.dergoogler.com/magisk/mmr.json", }, ]; @@ -55,7 +52,7 @@ const MemoizdRecommendedRepos = React.memo<{ filteredRepos: StoredRepo[] }>((pro } > {recommended_repos.map((repo, index) => ( - + ))} diff --git a/Website/src/activitys/SettingsActivity.tsx b/Website/src/activitys/SettingsActivity.tsx index 143d209b..0f7ce94f 100644 --- a/Website/src/activitys/SettingsActivity.tsx +++ b/Website/src/activitys/SettingsActivity.tsx @@ -116,11 +116,6 @@ function SettingsActivity() { ({ bgcolor: theme.palette.background.default })}>{strings("terminal")} } > - - - {}} checked={false} /> - - { - const { moduleOptions } = useRepos(); - - if (moduleId) { - return { - isVerified: moduleOptions[moduleId]?.verified || false, - isHidden: moduleOptions[moduleId]?.hidden || false, - }; - } else { - return { - isVerified: false, - isHidden: false, - }; - } -}; diff --git a/Website/src/hooks/useRepos.tsx b/Website/src/hooks/useRepos.tsx index 049c9b39..eaed2502 100644 --- a/Website/src/hooks/useRepos.tsx +++ b/Website/src/hooks/useRepos.tsx @@ -1,8 +1,6 @@ import React from "react"; import { SetValue, useNativeStorage } from "./useNativeStorage"; -import axios from "axios"; import { link } from "googlers-tools"; -import localForage from "localforage"; import _ from "underscore"; import { useSettings } from "./useSettings"; import { os } from "@Native/Os"; @@ -17,14 +15,7 @@ export interface RepoContextActions { interface RepoContextInterface { repos: StoredRepo[]; setRepos: SetValue; - modulesLoading: boolean | undefined; modules: Module[]; - moduleOptions: { - [name: string]: { - verified?: boolean; - hidden?: boolean; - }; - }[]; actions: RepoContextActions; } @@ -32,8 +23,6 @@ export const RepoContext = React.createContext({ repos: [], setRepos: () => {}, modules: [], - modulesLoading: undefined, - moduleOptions: [], actions: { addRepo: (data: AddRepoData) => {}, removeRepo: (data: RemoveRepoData) => {}, @@ -60,7 +49,7 @@ type SetRepoStateData = { export const RepoProvider = (props: React.PropsWithChildren) => { const TAG = "RepoProvider"; const log = useLog(TAG); - const [repos, setRepos] = useNativeStorage("repos", [ + const [repos, setRepos] = useNativeStorage("repos_v2", [ { name: "Magisk Modules Alt Repo (pre-configured)", website: "", @@ -68,22 +57,13 @@ export const RepoProvider = (props: React.PropsWithChildren) => { donate: "", submitModule: "", last_update: 1690995729000, - modules: "https://api.mmrl.dergoogler.com/json/mmar.json", + modules: "https://gr.dergoogler.com/magisk/mmar.json", }, ]); const { settings, setSettings } = useSettings(); const [modules, setModules] = React.useState([]); - const [modulesLoading, setModulesLoading] = React.useState(); - const [moduleOptions, setModuleOptions] = React.useState([]); - - React.useEffect(() => { - axios.get("https://raw.githubusercontent.com/Googlers-Repo/googlers-repo.github.io/master/moduleOptions.json").then((response) => { - setModuleOptions(response.data); - }); - }, []); - const addRepo = (data: AddRepoData) => { if (!repos.some((repo) => repo.modules === data.url)) { if (repos.length <= 4) { @@ -167,7 +147,7 @@ export const RepoProvider = (props: React.PropsWithChildren) => { }, [repos, settings]); const contextValue = React.useMemo( - () => ({ repos, setRepos, modulesLoading, modules, moduleOptions, actions: { addRepo, removeRepo, setRepoEnabled } }), + () => ({ repos, setRepos, modules, actions: { addRepo, removeRepo, setRepoEnabled } }), [repos, modules, settings] );