Skip to content

Fixes Bug TODO: Check why is it not visible with the icon and the component has onPress handler already #4

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.

Sign up for GitHub

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

Open
dhruvAgarwal2173 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fixes Bug TODO: Check why is it not visible with the icon and the component has onPress handler already #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
260ec92
Added conditional to consider the case where both Icon and Text are p…
dhruvAgarwal2173 Oct 5, 2024
7f29dd1
Uncommented the text prop for the action
dhruvAgarwal2173 Oct 5, 2024
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
31 changes: 31 additions & 0 deletions app/components/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,27 @@ function HeaderAction(props: HeaderActionProps) {

if (ActionComponent) return ActionComponent

if (content && icon) {
return (
<TouchableOpacity
style={[$actionContainer, { backgroundColor }]}
onPress={onPress}
disabled={!onPress}
activeOpacity={0.8}
>
<Icon
size={24}
icon={icon}
color={iconColor}
onPress={onPress}
containerStyle={[$actionIconContainer, { backgroundColor }]}
style={isRTL ? { transform: [{ rotate: "180deg" }] } : {}}
/>
<Text weight="medium" size="md" text={content} style={$actionText} />
</TouchableOpacity>
)
}

if (content) {
return (
<TouchableOpacity
Expand Down Expand Up @@ -277,6 +298,16 @@ const $title: TextStyle = {
textAlign: "center",
}

const $actionContainer: ViewStyle = {
flexGrow: 0,
flexDirection: "row",
alignItems: "center",
justifyContent: "center",
height: "100%",
paddingHorizontal: spacing.md,
zIndex: 2,
}

const $actionTextContainer: ViewStyle = {
flexGrow: 0,
alignItems: "center",
Expand Down
2 changes: 1 addition & 1 deletion app/screens/ContentViewScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const ContentViewScreen: FC<ContentViewScreenProps> = observer(function C
<Screen style={$root} contentContainerStyle={$styles.flex1}>
<Header
onLeftPress={navigation.goBack}
// leftText="Back" // TODO: Check why is it not visible with the icon and the component has onPress handler already
leftText="Back"
backgroundColor={colors.background.primary}
leftIcon="caretLeft"
leftIconColor={colors.content.secondary}
Expand Down
2 changes: 1 addition & 1 deletion app/screens/VideoPlayerScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const VideoPlayerScreen: FC<VideoPlayerScreenProps> = observer(function V
<Screen style={$root} contentContainerStyle={$styles.flex1}>
<Header
onLeftPress={goBack}
// leftText="Back" // TODO: Check why is it not visible with the icon and the component has onPress handler already
leftText="Back"
backgroundColor={colors.background.primary}
leftIcon="caretLeft"
leftIconColor={colors.content.secondary}
Expand Down