Skip to content

More consistent font & icons for headers of explore, profile and search tabs #84

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
Taffroi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

More consistent font & icons for headers of explore, profile and search tabs #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
73 changes: 37 additions & 36 deletions src/app/(tabs)/explore.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
getExploreTagsFeed,
postExploreAccountHideSuggestion,
} from '@/utils/requests';
import { Feather } from '@expo/vector-icons';
import { Feather, Ionicons } from '@expo/vector-icons';
import { useInfiniteQuery, useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
import { useRouter } from 'expo-router';
import React, { useMemo, useState } from 'react';
Expand Down Expand Up @@ -72,12 +72,7 @@ interface Video {

// Validation helpers
const isValidAccount = (account: Account | null | undefined): account is Account => {
return !!(
account?.id &&
account?.username &&
account?.avatar &&
account?.name
);
return !!(account?.id && account?.username && account?.avatar && account?.name);
};

const isValidVideo = (video: Video | null | undefined): video is Video => {
Expand All @@ -90,11 +85,7 @@ const isValidVideo = (video: Video | null | undefined): video is Video => {
};

const isValidTag = (tag: Tag | null | undefined): tag is Tag => {
return !!(
tag?.id &&
tag?.name &&
typeof tag?.count === 'number'
);
return !!(tag?.id && tag?.name && typeof tag?.count === 'number');
};

export default function ExploreScreen() {
Expand All @@ -107,13 +98,21 @@ export default function ExploreScreen() {
const queryClient = useQueryClient();
const { colorScheme } = useTheme();

const { data: tagsData, isLoading: tagsLoading, isError: tagsError } = useQuery({
const {
data: tagsData,
isLoading: tagsLoading,
isError: tagsError,
} = useQuery({
queryKey: ['explore', 'tags'],
queryFn: getExploreTags,
retry: 2,
});

const { data: accountsData, isLoading: accountsLoading, isError: accountsError } = useQuery({
const {
data: accountsData,
isLoading: accountsLoading,
isError: accountsError,
} = useQuery({
queryKey: ['accounts', 'suggested'],
queryFn: getExploreAccounts,
retry: 2,
Expand Down Expand Up @@ -187,9 +186,7 @@ export default function ExploreScreen() {

const allVideos = useMemo(() => {
if (!videosData?.pages) return [];
return videosData.pages
.flatMap((page) => page?.data || [])
.filter(isValidVideo);
return videosData.pages.flatMap((page) => page?.data || []).filter(isValidVideo);
}, [videosData]);

React.useEffect(() => {
Expand All @@ -209,7 +206,7 @@ export default function ExploreScreen() {
}) => {
const isFollowing = followingAccountId === item.id;
const isHiding = hidingAccountId === item.id;

return (
<View style={tw`mr-3 bg-gray-100 dark:bg-gray-800 rounded-xl overflow-hidden`}>
<View style={tw`w-[${ACCOUNT_CARD_WIDTH}px] p-3 items-center`}>
Expand Down Expand Up @@ -314,7 +311,10 @@ export default function ExploreScreen() {
source={{ uri: item.media.thumbnail }}
style={[
tw`rounded-lg bg-gray-900`,
{ width: VIDEO_THUMBNAIL_WIDTH, height: (VIDEO_THUMBNAIL_WIDTH * 16) / 9 },
{
width: VIDEO_THUMBNAIL_WIDTH,
height: (VIDEO_THUMBNAIL_WIDTH * 16) / 9,
},
]}
resizeMode="cover"
/>
Expand All @@ -338,17 +338,18 @@ export default function ExploreScreen() {

const renderEmptyState = (message: string) => (
<View style={tw`py-10 items-center px-4`}>
<Text style={tw`text-gray-500 dark:text-gray-400 text-center`}>
{message}
</Text>
<Text style={tw`text-gray-500 dark:text-gray-400 text-center`}>{message}</Text>
</View>
);

if (tagsLoading || accountsLoading) {
return (
<SafeAreaView edges={['top']} style={tw`flex-1 bg-white dark:bg-black`}>
<View style={tw`flex-1 items-center justify-center`}>
<ActivityIndicator size="large" color={colorScheme === 'dark' ? '#fff' : '#000'} />
<ActivityIndicator
size="large"
color={colorScheme === 'dark' ? '#fff' : '#000'}
/>
</View>
</SafeAreaView>
);
Expand All @@ -373,14 +374,14 @@ export default function ExploreScreen() {
}}
scrollEventThrottle={16}>
<View style={tw`px-4 pt-4 pb-3 flex justify-between items-center flex-row`}>
<Text style={tw`text-black text-4xl font-bold dark:text-white`}>
<Text style={tw`text-black text-24px font-bold dark:text-white`}>
Explore
</Text>
<Pressable onPress={() => router.push('/private/search')}>
<Feather
<Ionicons
name="search"
color={colorScheme === 'dark' ? '#fff' : '#000'}
size={30}
size={28}
/>
</Pressable>
</View>
Expand Down Expand Up @@ -409,9 +410,10 @@ export default function ExploreScreen() {
</View>
)}

{accountsError && (
renderEmptyState('Unable to load suggested accounts. Please try again later.')
)}
{accountsError &&
renderEmptyState(
'Unable to load suggested accounts. Please try again later.',
)}

{validTags.length > 0 && (
<View style={tw`mb-4`}>
Expand All @@ -430,9 +432,8 @@ export default function ExploreScreen() {
</View>
)}

{tagsError && (
renderEmptyState('Unable to load trending tags. Please try again later.')
)}
{tagsError &&
renderEmptyState('Unable to load trending tags. Please try again later.')}

{videosLoading ? (
<View style={tw`py-10 items-center`}>
Expand All @@ -454,9 +455,9 @@ export default function ExploreScreen() {
</View>
{isFetchingNextPage && (
<View style={tw`py-4 items-center`}>
<ActivityIndicator
size="small"
color={colorScheme === 'dark' ? '#fff' : '#000'}
<ActivityIndicator
size="small"
color={colorScheme === 'dark' ? '#fff' : '#000'}
/>
</View>
)}
Expand All @@ -468,4 +469,4 @@ export default function ExploreScreen() {
</View>
</SafeAreaView>
);
}
}
5 changes: 3 additions & 2 deletions src/app/(tabs)/profile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ export default function ProfileScreen() {
headerStyle: tw`bg-white dark:bg-black`,
headerTintColor: colorScheme === 'dark' ? '#fff' : '#000',
headerTitleStyle: {
fontSize: 24,
fontWeight: 'bold',
color: colorScheme === 'dark' ? '#fff' : '#000',
},
Expand All @@ -237,10 +238,10 @@ export default function ProfileScreen() {
accessibilityLabel="Settings"
accessibilityRole="button"
onPress={handleSettingsPress}
style={tw`mr-3`}>
style={tw`mr-4`}>
<Ionicons
name="menu"
size={30}
size={28}
color={colorScheme === 'dark' ? '#fff' : '#000'}
/>
</PressableHaptics>
Expand Down
4 changes: 2 additions & 2 deletions src/app/private/search/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ export default function SearchScreen() {
hitSlop={{ top: 10, bottom: 10, left: 10, right: 10 }}>
<Ionicons
name="chevron-back"
size={26}
size={24}
color={colorScheme === 'dark' ? 'white' : 'black'}
/>
</TouchableOpacity>
Expand Down Expand Up @@ -523,7 +523,7 @@ export default function SearchScreen() {
hitSlop={{ top: 10, bottom: 10, left: 10, right: 10 }}>
<Ionicons
name="ellipsis-horizontal"
size={26}
size={24}
color={colorScheme === 'dark' ? 'white' : 'black'}
/>
</TouchableOpacity>
Expand Down