Skip to content
Merged
Show file tree
Hide file tree
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
21 changes: 9 additions & 12 deletions app/(main)/(drawer)/(tabs)/_layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ import { FontAwesomeIcon } from "@fortawesome/react-native-fontawesome";
import {
faComment,
faFileLines,
faHeart,
faStar,
} from "@fortawesome/free-regular-svg-icons";
import {
faComment as faCommentSolid,
faHouseUser as faHouseUserSolid,
faHeart as faHeartSolid,
faFileLines as faFileLinesSolid,
faStar as faStarSolid,
} from "@fortawesome/free-solid-svg-icons";
import Header from "@/components/explore-influencers/header";
import ProfileIcon from "@/components/explore-influencers/profile-icon";
import HomeIcon from "@/assets/icons/home.svg";

const TabLayout = () => {
const { xl } = useBreakpoints();
Expand Down Expand Up @@ -50,16 +50,13 @@ const TabLayout = () => {
name="explore-influencers"
options={{
title: "Explore",
tabBarIcon: ({ color, focused }) =>
focused ? (
<FontAwesomeIcon
color={color}
icon={faHouseUserSolid}
size={24}
/>
) : (
<HomeIcon width={24} height={24} fill={Colors(theme).text} />
),
tabBarIcon: ({ color, focused }) => (
<FontAwesomeIcon
color={color}
icon={focused ? faHeartSolid : faHeart}
size={24}
/>
),
headerTitle() {
return <Header />;
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {
ActivityIndicator,
} from "react-native";
import {
Text,
List,
} from "react-native-paper";
import { useTheme } from "@react-navigation/native";
Expand All @@ -30,7 +29,7 @@ import { useSharedValue } from "react-native-reanimated";
import { processRawAttachment } from "@/utils/attachments";
import { Attachment } from "@/shared-libs/firestore/trendly-pro/constants/attachment";
import { User } from "@/types/User";
import { View } from "@/components/theme/Themed";
import { Text, View } from "@/components/theme/Themed";
import TextInput from "@/components/ui/text-input";
import Button from "@/components/ui/button";

Expand Down
12 changes: 6 additions & 6 deletions components/drawer-layout/DrawerMenuContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@ import { Searchbar } from "react-native-paper";
import {
faComment,
faFileLines,
faHeart,
faStar,
} from "@fortawesome/free-regular-svg-icons";
import {
faComment as faCommentSolid,
faBuilding,
faHouseUser as faHouseUserSolid,
faHeart as faHeartSolid,
faMagnifyingGlass,
faPlus,
faStar as faStarSolid,
Expand Down Expand Up @@ -87,13 +88,12 @@ const DRAWER_MENU_CONTENT_ITEMS = (
}: IconPropFn) => focused ? (
<DrawerIcon
href="/explore-influencers"
icon={faHouseUserSolid}
icon={faHeartSolid}
/>
) : (
<HomeIcon
width={28}
height={28}
fill={Colors(theme).text}
<DrawerIcon
href="/explore-influencers"
icon={faHeart}
/>
),
label: "Explore",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ export const stylesFn = (theme: Theme) =>
messageModalContent: {
width: "80%",
padding: 20,
backgroundColor: "white",
borderRadius: 10,
alignItems: "center",
},
Expand Down