mirror of
https://github.com/zoriya/Kyoo.git
synced 2025-07-09 03:04:20 -04:00
Fix navbar on android
This commit is contained in:
parent
651475876b
commit
9fbddd7b58
@ -5,6 +5,7 @@
|
|||||||
"name": "kyoo",
|
"name": "kyoo",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@expo/html-elements": "^0.12.5",
|
"@expo/html-elements": "^0.12.5",
|
||||||
|
"@gorhom/portal": "^1.0.14",
|
||||||
"@material-symbols/svg-400": "^0.31.6",
|
"@material-symbols/svg-400": "^0.31.6",
|
||||||
"@radix-ui/react-dropdown-menu": "^2.1.15",
|
"@radix-ui/react-dropdown-menu": "^2.1.15",
|
||||||
"@react-navigation/bottom-tabs": "^7.3.10",
|
"@react-navigation/bottom-tabs": "^7.3.10",
|
||||||
@ -309,6 +310,8 @@
|
|||||||
|
|
||||||
"@floating-ui/utils": ["@floating-ui/utils@0.2.9", "", {}, "sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg=="],
|
"@floating-ui/utils": ["@floating-ui/utils@0.2.9", "", {}, "sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg=="],
|
||||||
|
|
||||||
|
"@gorhom/portal": ["@gorhom/portal@1.0.14", "", { "dependencies": { "nanoid": "^3.3.1" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-MXyL4xvCjmgaORr/rtryDNFy3kU4qUbKlwtQqqsygd0xX3mhKjOLn6mQK8wfu0RkoE0pBE0nAasRoHua+/QZ7A=="],
|
||||||
|
|
||||||
"@hapi/hoek": ["@hapi/hoek@9.3.0", "", {}, "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ=="],
|
"@hapi/hoek": ["@hapi/hoek@9.3.0", "", {}, "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ=="],
|
||||||
|
|
||||||
"@hapi/topo": ["@hapi/topo@5.1.0", "", { "dependencies": { "@hapi/hoek": "^9.0.0" } }, "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg=="],
|
"@hapi/topo": ["@hapi/topo@5.1.0", "", { "dependencies": { "@hapi/hoek": "^9.0.0" } }, "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg=="],
|
||||||
|
@ -14,6 +14,7 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@expo/html-elements": "^0.12.5",
|
"@expo/html-elements": "^0.12.5",
|
||||||
|
"@gorhom/portal": "^1.0.14",
|
||||||
"@material-symbols/svg-400": "^0.31.6",
|
"@material-symbols/svg-400": "^0.31.6",
|
||||||
"@radix-ui/react-dropdown-menu": "^2.1.15",
|
"@radix-ui/react-dropdown-menu": "^2.1.15",
|
||||||
"@react-navigation/bottom-tabs": "^7.3.10",
|
"@react-navigation/bottom-tabs": "^7.3.10",
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
import { Portal } from "@gorhom/portal";
|
import { Portal } from "@gorhom/portal";
|
||||||
import Check from "@material-symbols/svg-400/rounded/check-fill.svg";
|
import Check from "@material-symbols/svg-400/rounded/check-fill.svg";
|
||||||
import Close from "@material-symbols/svg-400/rounded/close-fill.svg";
|
import Close from "@material-symbols/svg-400/rounded/close-fill.svg";
|
||||||
|
import { useRouter } from "expo-router";
|
||||||
import {
|
import {
|
||||||
type ComponentType,
|
type ComponentType,
|
||||||
type ReactElement,
|
type ReactElement,
|
||||||
@ -18,8 +19,8 @@ import { percent, px, sm, useYoshiki, vh, xl } from "yoshiki/native";
|
|||||||
import { Icon, IconButton } from "./icons";
|
import { Icon, IconButton } from "./icons";
|
||||||
import { PressableFeedback } from "./links";
|
import { PressableFeedback } from "./links";
|
||||||
import { P } from "./text";
|
import { P } from "./text";
|
||||||
import { ts } from "./utils";
|
|
||||||
import { ContrastArea, SwitchVariant } from "./theme";
|
import { ContrastArea, SwitchVariant } from "./theme";
|
||||||
|
import { ts } from "./utils";
|
||||||
|
|
||||||
const MenuContext = createContext<((open: boolean) => void) | undefined>(undefined);
|
const MenuContext = createContext<((open: boolean) => void) | undefined>(undefined);
|
||||||
|
|
||||||
|
@ -6,10 +6,10 @@ import { createQueryClient } from "~/query";
|
|||||||
import { AccountProvider } from "./account-provider";
|
import { AccountProvider } from "./account-provider";
|
||||||
import { ErrorConsumer } from "./error-consumer";
|
import { ErrorConsumer } from "./error-consumer";
|
||||||
import { ErrorProvider } from "./error-provider";
|
import { ErrorProvider } from "./error-provider";
|
||||||
|
import { NativeProviders } from "./native-providers";
|
||||||
import { TranslationsProvider } from "./translations.native";
|
import { TranslationsProvider } from "./translations.native";
|
||||||
|
|
||||||
function getServerData(key: string) {
|
function getServerData(key: string) {}
|
||||||
}
|
|
||||||
|
|
||||||
const QueryProvider = ({ children }: { children: ReactNode }) => {
|
const QueryProvider = ({ children }: { children: ReactNode }) => {
|
||||||
const [queryClient] = useState(() => createQueryClient());
|
const [queryClient] = useState(() => createQueryClient());
|
||||||
@ -38,7 +38,9 @@ export const Providers = ({ children }: { children: ReactNode }) => {
|
|||||||
<ErrorProvider>
|
<ErrorProvider>
|
||||||
<AccountProvider>
|
<AccountProvider>
|
||||||
<TranslationsProvider>
|
<TranslationsProvider>
|
||||||
<ErrorConsumer scope="root">{children}</ErrorConsumer>
|
<NativeProviders>
|
||||||
|
<ErrorConsumer scope="root">{children}</ErrorConsumer>
|
||||||
|
</NativeProviders>
|
||||||
</TranslationsProvider>
|
</TranslationsProvider>
|
||||||
</AccountProvider>
|
</AccountProvider>
|
||||||
</ErrorProvider>
|
</ErrorProvider>
|
||||||
|
6
front/src/providers/native-providers.tsx
Normal file
6
front/src/providers/native-providers.tsx
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
import { PortalProvider } from "@gorhom/portal";
|
||||||
|
import type { ReactNode } from "react";
|
||||||
|
|
||||||
|
export const NativeProviders = ({ children }: { children: ReactNode }) => {
|
||||||
|
return <PortalProvider>{children}</PortalProvider>;
|
||||||
|
};
|
5
front/src/providers/native-providers.web.tsx
Normal file
5
front/src/providers/native-providers.web.tsx
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
import type { ReactNode } from "react";
|
||||||
|
|
||||||
|
export const NativeProviders = ({ children }: { children: ReactNode }) => {
|
||||||
|
return children;
|
||||||
|
};
|
Loading…
x
Reference in New Issue
Block a user