Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.10.7 #65

Merged
merged 4 commits into from
Dec 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { StyledListItemText } from "@Components/StyledListItemText";

interface RecommendedRepoProps {
name: string;
moduleCount: number;
link: string;
}

Expand All @@ -38,7 +37,7 @@ export const RecommendedRepo = (props: RecommendedRepoProps) => {
</IconButton>
}
>
<StyledListItemText primary={props.name} secondary={`More than ${props.moduleCount.toString()}+ modules`} />
<StyledListItemText primary={props.name} secondary={props.link} />
</ListItem>
);
};
11 changes: 4 additions & 7 deletions Website/src/activitys/RepoActivity/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
];

Expand All @@ -55,7 +52,7 @@ const MemoizdRecommendedRepos = React.memo<{ filteredRepos: StoredRepo[] }>((pro
}
>
{recommended_repos.map((repo, index) => (
<RecommendedRepo key={repo.name + "_" + index} name={repo.name} moduleCount={repo.module_count} link={repo.link} />
<RecommendedRepo key={repo.name + "_" + index} name={repo.name} link={repo.link} />
))}
</List>
</>
Expand Down
5 changes: 0 additions & 5 deletions Website/src/activitys/SettingsActivity.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,6 @@ function SettingsActivity() {
<ListSubheader sx={(theme) => ({ bgcolor: theme.palette.background.default })}>{strings("terminal")}</ListSubheader>
}
>
<ListItem>
<StyledListItemText primary={strings("enable_install")} secondary={strings("enable_install_subtitle")} />
<Android12Switch edge="end" disabled onChange={(e: any) => {}} checked={false} />
</ListItem>

<ListItem>
<StyledListItemText primary={strings("scroll_to_bottom")} secondary={strings("scroll_to_bottom_subtitle")} />
<Android12Switch
Expand Down
22 changes: 0 additions & 22 deletions Website/src/hooks/useModuleOptions.ts

This file was deleted.

26 changes: 3 additions & 23 deletions Website/src/hooks/useRepos.tsx
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -17,23 +15,14 @@ export interface RepoContextActions {
interface RepoContextInterface {
repos: StoredRepo[];
setRepos: SetValue<StoredRepo[]>;
modulesLoading: boolean | undefined;
modules: Module[];
moduleOptions: {
[name: string]: {
verified?: boolean;
hidden?: boolean;
};
}[];
actions: RepoContextActions;
}

export const RepoContext = React.createContext<RepoContextInterface>({
repos: [],
setRepos: () => {},
modules: [],
modulesLoading: undefined,
moduleOptions: [],
actions: {
addRepo: (data: AddRepoData) => {},
removeRepo: (data: RemoveRepoData) => {},
Expand All @@ -60,30 +49,21 @@ type SetRepoStateData = {
export const RepoProvider = (props: React.PropsWithChildren) => {
const TAG = "RepoProvider";
const log = useLog(TAG);
const [repos, setRepos] = useNativeStorage<StoredRepo[]>("repos", [
const [repos, setRepos] = useNativeStorage<StoredRepo[]>("repos_v2", [
{
name: "Magisk Modules Alt Repo (pre-configured)",
website: "",
support: "",
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<Module[]>([]);

const [modulesLoading, setModulesLoading] = React.useState<boolean | undefined>();
const [moduleOptions, setModuleOptions] = React.useState<any[]>([]);

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) {
Expand Down Expand Up @@ -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]
);

Expand Down
Loading