Skip to content
Open
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
29 changes: 12 additions & 17 deletions apps/mobile/src/components/ui/AndroidScreenHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { AppActivityIndicator } from "./AppActivityIndicator";
import { Column, Row, Text as NativeText, RNHostView } from "@expo/ui/jetpack-compose";
import { weight } from "@expo/ui/jetpack-compose/modifiers";
import { Column, Text as NativeText, RNHostView } from "@expo/ui/jetpack-compose";
import { use, useState, type ReactNode } from "react";
import { View } from "react-native";

Expand Down Expand Up @@ -109,25 +108,21 @@ export function AndroidScreenHeader(props: {
{props.title}
</NativeText>
) : props.compact ? (
<Row verticalAlignment="center" horizontalArrangement={{ spacedBy: 8 }}>
<NativeText
color={colors["--color-header-foreground"]}
maxLines={1}
overflow="ellipsis"
style={titleTypography}
>
{props.title}
</NativeText>
// One paragraph, so the smaller subtitle shares the title's baseline.
<NativeText
color={colors["--color-header-foreground"]}
maxLines={1}
overflow="ellipsis"
style={titleTypography}
>
{props.title}
<NativeText
color={colors["--color-foreground-muted"]}
maxLines={1}
overflow="ellipsis"
style={subtitleTypography}
modifiers={[weight(1)]}
style={{ fontSize: subtitleTypography.fontSize }}
>
{props.subtitle}
{` ${props.subtitle}`}
</NativeText>
</Row>
</NativeText>
) : (
<Column>
<NativeText
Expand Down
Loading