Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2026-04-24 18:10:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use native tabs on android

Browse Source
This commit is contained in:
Zoe Roux 2026-04-18 16:36:54 +02:00
parent 12883ce423
commit e92d4e3f03
No known key found for this signature in database
2 changed files with 30 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
front/src/app/(app)/(tabs)/_layout.tsx
View File

@ -1,12 +1,7 @@
import Browse from "@material-symbols/svg-400/rounded/browse-fill.svg";
// import Downloading from "@material-symbols/svg-400/rounded/downloading-fill.svg";
import Home from "@material-symbols/svg-400/rounded/home-fill.svg";
import Person from "@material-symbols/svg-400/rounded/person-fill.svg";
import { Slot, Tabs } from "expo-router";
import { Slot } from "expo-router";
import { NativeTabs } from "expo-router/unstable-native-tabs";
import { useTranslation } from "react-i18next";
import { Platform } from "react-native";
import { Icon } from "~/primitives";
import { cn } from "~/utils";
export const unstable_settings = {
initialRouteName: "index",
@ -18,49 +13,32 @@ export default function TabsLayout() {
if (Platform.OS === "web") return <Slot />;
return (
<Tabs
screenOptions={{
headerShown: false,
}}
>
<Tabs.Screen
name="index"
options={{
tabBarLabel: t("navbar.home"),
tabBarIcon: ({ focused }) => {
return (
<Icon
icon={Home}
className={cn(focused && "fill-accent dark:fill-accent")}
/>
);
},
}}
/>
<Tabs.Screen
name="browse"
options={{
tabBarLabel: t("navbar.browse"),
tabBarIcon: ({ focused }) => (
<Icon
icon={Browse}
className={cn(focused && "fill-accent dark:fill-accent")}
/>
),
}}
/>
<Tabs.Screen
name="profile"
options={{
tabBarLabel: t("navbar.profile"),
tabBarIcon: ({ focused }) => (
<Icon
icon={Person}
className={cn(focused && "fill-accent dark:fill-accent")}
/>
),
}}
/>
</Tabs>
<NativeTabs>
<NativeTabs.Trigger name="index">
<NativeTabs.Trigger.Icon
sf={{ default: "house", selected: "house.fill" }}
md="home"
/>
<NativeTabs.Trigger.Label>{t("navbar.home")}</NativeTabs.Trigger.Label>
</NativeTabs.Trigger>
<NativeTabs.Trigger name="browse">
<NativeTabs.Trigger.Icon
sf={{ default: "square.grid.2x2", selected: "square.grid.2x2.fill" }}
md="browse"
/>
<NativeTabs.Trigger.Label>
{t("navbar.browse")}
</NativeTabs.Trigger.Label>
</NativeTabs.Trigger>
<NativeTabs.Trigger name="profile">
<NativeTabs.Trigger.Icon
sf={{ default: "person", selected: "person.fill" }}
md="person"
/>
<NativeTabs.Trigger.Label>
{t("navbar.profile")}
</NativeTabs.Trigger.Label>
</NativeTabs.Trigger>
</NativeTabs>
);
}

2
front/src/ui/login/oidc.tsx
View File

@ -55,5 +55,5 @@ export const OidcLogin = ({ apiUrl }: { apiUrl: string }) => {
OidcLogin.query = (apiUrl?: string): QueryIdentifier<AuthInfo> => ({
path: ["auth", "info"],
parser: AuthInfo,
options: { apiUrl },
options: { apiUrl, returnError: true },
});