diff --git a/apps/mobile/app/(app)/(tabs)/home/_layout.tsx b/apps/mobile/app/(app)/(tabs)/home/_layout.tsx
index 19de5fc..893a6c7 100644
--- a/apps/mobile/app/(app)/(tabs)/home/_layout.tsx
+++ b/apps/mobile/app/(app)/(tabs)/home/_layout.tsx
@@ -17,6 +17,16 @@ export default function HomeLayout() {
...baseOptions,
title: tabStackScreenTitles[route.name] ?? "Home",
headerRight: route.name === "settings" ? undefined : () => ,
+ unstable_headerRightItems:
+ route.name === "settings"
+ ? undefined
+ : () => [
+ {
+ type: "custom",
+ element: ,
+ hidesSharedBackground: true,
+ },
+ ],
})}
/>
)
diff --git a/apps/mobile/app/(app)/(tabs)/home/settings.tsx b/apps/mobile/app/(app)/(tabs)/home/settings.tsx
index 6764a4f..7324595 100644
--- a/apps/mobile/app/(app)/(tabs)/home/settings.tsx
+++ b/apps/mobile/app/(app)/(tabs)/home/settings.tsx
@@ -88,14 +88,13 @@ export default function SettingsScreen() {
]}
contentInsetAdjustmentBehavior="automatic"
>
-
-
{visibleSections.map((item) => {
const selected = section === item.id
return (
setSection(item.id)}
@@ -106,17 +105,9 @@ export default function SettingsScreen() {
>
-
- {item.label}
-
)
})}
@@ -129,37 +120,16 @@ export default function SettingsScreen() {
) : null}
- void handleChangeServer()}
- onSignOut={() => void handleSignOut()}
- />
+ {section === "profile" ? (
+ void handleChangeServer()}
+ onSignOut={() => void handleSignOut()}
+ />
+ ) : null}
)
}
-function AccountHero({ user }: { user: Doc<"users"> }) {
- const colors = useThemeColors()
-
- return (
-
-
-
-
- {user.name}
-
-
- {user.email}
-
- {user.isAdmin ? (
-
- Admin
-
- ) : null}
-
-
- )
-}
-
function ProfileSection({ user }: { user: Doc<"users"> }) {
const colors = useThemeColors()
const updateName = useMutation(api.users.updateProfileName)
@@ -673,24 +643,6 @@ const styles = StyleSheet.create({
paddingHorizontal: spacing.lg,
paddingTop: spacing.md,
},
- hero: {
- borderRadius: radius.xl,
- padding: spacing.lg,
- flexDirection: "row",
- alignItems: "center",
- gap: spacing.md,
- },
- heroCopy: {
- flex: 1,
- gap: spacing.xs,
- },
- heroTitle: {
- fontSize: 22,
- fontWeight: "800",
- },
- heroSubtitle: {
- fontSize: 15,
- },
badge: {
alignSelf: "flex-start",
borderRadius: radius.full,
@@ -705,21 +657,14 @@ const styles = StyleSheet.create({
borderRadius: radius.xl,
padding: spacing.xs,
flexDirection: "row",
- flexWrap: "wrap",
gap: spacing.xs,
},
pill: {
- minHeight: 40,
+ flex: 1,
+ minHeight: 48,
borderRadius: radius.full,
- paddingHorizontal: spacing.md,
- flexDirection: "row",
alignItems: "center",
justifyContent: "center",
- gap: spacing.xs,
- },
- pillText: {
- fontSize: 14,
- fontWeight: "700",
},
card: {
borderRadius: radius.xl,
diff --git a/apps/mobile/app/(app)/(tabs)/library/_layout.tsx b/apps/mobile/app/(app)/(tabs)/library/_layout.tsx
index c6d7651..c706300 100644
--- a/apps/mobile/app/(app)/(tabs)/library/_layout.tsx
+++ b/apps/mobile/app/(app)/(tabs)/library/_layout.tsx
@@ -17,6 +17,16 @@ export default function LibraryLayout() {
...baseOptions,
title: tabStackScreenTitles[route.name] ?? "Library",
headerRight: route.name === "settings" ? undefined : () => ,
+ unstable_headerRightItems:
+ route.name === "settings"
+ ? undefined
+ : () => [
+ {
+ type: "custom",
+ element: ,
+ hidesSharedBackground: true,
+ },
+ ],
})}
/>
)
diff --git a/apps/mobile/app/(app)/(tabs)/search/_layout.tsx b/apps/mobile/app/(app)/(tabs)/search/_layout.tsx
index 42add2d..a7103d1 100644
--- a/apps/mobile/app/(app)/(tabs)/search/_layout.tsx
+++ b/apps/mobile/app/(app)/(tabs)/search/_layout.tsx
@@ -17,6 +17,16 @@ export default function SearchLayout() {
...baseOptions,
title: tabStackScreenTitles[route.name] ?? "Search",
headerRight: route.name === "settings" ? undefined : () => ,
+ unstable_headerRightItems:
+ route.name === "settings"
+ ? undefined
+ : () => [
+ {
+ type: "custom",
+ element: ,
+ hidesSharedBackground: true,
+ },
+ ],
})}
/>
)
diff --git a/apps/mobile/app/(app)/_layout.tsx b/apps/mobile/app/(app)/_layout.tsx
index 9091dd0..033e690 100644
--- a/apps/mobile/app/(app)/_layout.tsx
+++ b/apps/mobile/app/(app)/_layout.tsx
@@ -67,6 +67,16 @@ export default function AppLayout() {
+
push("/settings")}
+ onPress={() => router.push("/(app)/settings")}
style={({ pressed }) => [styles.button, { opacity: pressed ? 0.75 : 1 }]}
>