From f68deab8c01d4e21763e86580570991af86c844b Mon Sep 17 00:00:00 2001 From: bagasbanuna Date: Fri, 13 Mar 2026 16:41:34 +0800 Subject: [PATCH] Fix App Header MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Layouts & Navigation - app/(application)/_layout.tsx - app/(application)/(user)/_layout.tsx - app/(application)/(user)/event/(tabs)/_layout.tsx - app/(application)/(user)/job/(tabs)/_layout.tsx - app/(application)/(user)/voting/(tabs)/_layout.tsx - app/(application)/(user)/portofolio/_layout.tsx - app/(application)/(user)/profile/_layout.tsx - app/(application)/admin/_layout.tsx - app/+not-found.tsx User – File - app/(application)/(file)/[id].tsx User – Collaboration - app/(application)/(user)/collaboration/[id]/index.tsx - app/(application)/(user)/collaboration/[id]/detail-project-main.tsx - app/(application)/(user)/collaboration/[id]/detail-participant.tsx - app/(application)/(user)/collaboration/[id]/[detail]/info.tsx - app/(application)/(user)/collaboration/[id]/[detail]/room-chat.tsx User – Donation - app/(application)/(user)/donation/[id]/index.tsx - app/(application)/(user)/donation/[id]/[status]/detail.tsx - app/(application)/(user)/donation/[id]/(news)/[news]/index.tsx User – Event - app/(application)/(user)/event/[id]/[status]/detail-event.tsx - app/(application)/(user)/event/[id]/confirmation.tsx - app/(application)/(user)/event/[id]/contribution.tsx - app/(application)/(user)/event/[id]/history.tsx - app/(application)/(user)/event/[id]/publish.tsx User – Investment - app/(application)/(user)/investment/[id]/index.tsx - app/(application)/(user)/investment/[id]/[status]/detail.tsx - app/(application)/(user)/investment/[id]/(my-holding)/[id].tsx - app/(application)/(user)/investment/[id]/(news)/[news]/index.tsx User – Job - app/(application)/(user)/job/[id]/[status]/detail.tsx User – Portofolio - app/(application)/(user)/portofolio/[id]/index.tsx User – Profile - app/(application)/(user)/profile/[id]/index.tsx User – Voting - app/(application)/(user)/voting/[id]/index.tsx - app/(application)/(user)/voting/[id]/[status]/detail.tsx - app/(application)/(user)/voting/[id]/contribution.tsx - app/(application)/(user)/voting/[id]/history.tsx Components - components/Button/BackButtonFromNotification.tsx - components/_ShareComponent/AppHeader.tsx Admin Screens - screens/Admin/Notification-Admin/ScreenNotificationAdmin.tsx - screens/Admin/Notification-Admin/ScreenNotificationAdmin2.tsx Screens – Donation - screens/Donation/ScreenListOfNews.tsx - screens/Donation/ScreenRecapOfNews.tsx Screens – Forum - screens/Forum/ViewBeranda.tsx - screens/Forum/ViewBeranda2.tsx - screens/Forum/ViewBeranda3.tsx Screens – Investment - screens/Invesment/Document/ScreenRecapOfDocument.tsx - screens/Invesment/News/ScreenListOfNews.tsx - screens/Invesment/News/ScreenRecapOfNews.tsx Screens – Notification - screens/Notification/ScreenNotification_V1.tsx - screens/Notification/ScreenNotification_V2.tsx iOS - ios/HIPMIBadungConnect.xcodeproj/project.pbxproj Docs - QWEN.md ### Issue: Tabs can't clicked --- QWEN.md | 2 +- app/(application)/(file)/[id].tsx | 6 +- app/(application)/(user)/_layout.tsx | 299 ++++++++---------- .../collaboration/[id]/[detail]/info.tsx | 4 +- .../collaboration/[id]/[detail]/room-chat.tsx | 21 +- .../collaboration/[id]/detail-participant.tsx | 13 +- .../[id]/detail-project-main.tsx | 11 +- .../(user)/collaboration/[id]/index.tsx | 13 +- .../donation/[id]/(news)/[news]/index.tsx | 18 +- .../(user)/donation/[id]/[status]/detail.tsx | 22 +- .../(user)/donation/[id]/index.tsx | 18 +- .../(user)/event/(tabs)/_layout.tsx | 38 ++- .../event/[id]/[status]/detail-event.tsx | 18 +- .../(user)/event/[id]/confirmation.tsx | 19 +- .../(user)/event/[id]/contribution.tsx | 11 +- .../(user)/event/[id]/history.tsx | 11 +- .../(user)/event/[id]/publish.tsx | 11 +- .../investment/[id]/(my-holding)/[id].tsx | 28 +- .../investment/[id]/(news)/[news]/index.tsx | 18 +- .../investment/[id]/[status]/detail.tsx | 22 +- .../(user)/investment/[id]/index.tsx | 22 +- .../(user)/job/(tabs)/_layout.tsx | 30 +- .../(user)/job/[id]/[status]/detail.tsx | 18 +- .../(user)/portofolio/[id]/index.tsx | 32 +- .../(user)/portofolio/_layout.tsx | 7 +- .../(user)/profile/[id]/index.tsx | 23 +- app/(application)/(user)/profile/_layout.tsx | 24 +- .../(user)/voting/(tabs)/_layout.tsx | 38 ++- .../(user)/voting/[id]/[status]/detail.tsx | 22 +- .../(user)/voting/[id]/contribution.tsx | 13 +- .../(user)/voting/[id]/history.tsx | 13 +- .../(user)/voting/[id]/index.tsx | 13 +- app/(application)/_layout.tsx | 10 +- app/(application)/admin/_layout.tsx | 62 +++- app/+not-found.tsx | 3 +- .../Button/BackButtonFromNotification.tsx | 7 +- components/_ShareComponent/AppHeader.tsx | 3 +- .../project.pbxproj | 36 +++ .../ScreenNotificationAdmin.tsx | 17 +- .../ScreenNotificationAdmin2.tsx | 17 +- screens/Donation/ScreenListOfNews.tsx | 9 +- screens/Donation/ScreenRecapOfNews.tsx | 11 +- screens/Forum/ViewBeranda.tsx | 19 +- screens/Forum/ViewBeranda2.tsx | 19 +- screens/Forum/ViewBeranda3.tsx | 29 +- .../Document/ScreenRecapOfDocument.tsx | 21 +- screens/Invesment/News/ScreenListOfNews.tsx | 11 +- screens/Invesment/News/ScreenRecapOfNews.tsx | 11 +- .../Notification/ScreenNotification_V1.tsx | 17 +- .../Notification/ScreenNotification_V2.tsx | 17 +- 50 files changed, 686 insertions(+), 491 deletions(-) diff --git a/QWEN.md b/QWEN.md index 8ee1eca..376b7fb 100644 --- a/QWEN.md +++ b/QWEN.md @@ -387,7 +387,7 @@ apiConfig.interceptors.request.use(async (config) => { ### Deep Linking - Scheme: `hipmimobile://` -- HTTPS: `cld-dkr-staging-hipmi.wibudev.com` +- HTTPS: `cld-dkr-hipmi-stg.wibudev.com` - Configured for both platforms ### Camera diff --git a/app/(application)/(file)/[id].tsx b/app/(application)/(file)/[id].tsx index b7c5784..07f999c 100644 --- a/app/(application)/(file)/[id].tsx +++ b/app/(application)/(file)/[id].tsx @@ -1,4 +1,5 @@ import { BackButton } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import PdfViewer from "@/components/_ShareComponent/PdfViewer"; import API_STRORAGE from "@/constants/base-url-api-strorage"; import { Stack, useLocalSearchParams } from "expo-router"; @@ -7,13 +8,12 @@ import { SafeAreaView } from "react-native-safe-area-context"; export default function FileScreen() { const { id } = useLocalSearchParams(); const url = API_STRORAGE.GET({ fileId: id as string }); - + return ( <> , + header: () => } />, }} /> diff --git a/app/(application)/(user)/_layout.tsx b/app/(application)/(user)/_layout.tsx index c86ae22..8eefcd6 100644 --- a/app/(application)/(user)/_layout.tsx +++ b/app/(application)/(user)/_layout.tsx @@ -1,22 +1,21 @@ import { BackButton } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { IconPlus } from "@/components/_Icon"; import { IconDot } from "@/components/_Icon/IconComponent"; import LeftButtonCustom from "@/components/Button/BackButton"; import { MainColor } from "@/constants/color-palet"; import { ICON_SIZE_SMALL } from "@/constants/constans-value"; -import { HeaderStyles } from "@/styles/header-styles"; import { Ionicons } from "@expo/vector-icons"; import { router, Stack } from "expo-router"; export default function UserLayout() { return ( <> - + , + header: () => , }} /> , + header: () => , }} /> @@ -71,10 +69,18 @@ export default function UserLayout() { {/* ========== Event Section ========= */} + {/* } />, + }} + /> */} + } />, // NOTE: DIPINDAH DI FILE /Event/(Tabs)/_layout.tsx // headerLeft: () => ( // @@ -85,32 +91,28 @@ export default function UserLayout() { , + header: () => , }} /> , + header: () => } />, }} /> , + header: () => , }} /> , + header: () => , }} /> {/* ========== End Event Section ========= */} @@ -119,22 +121,19 @@ export default function UserLayout() { , + header: () => } />, }} /> , + header: () => , }} /> , + header: () => , }} /> {/* , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> @@ -172,29 +168,25 @@ export default function UserLayout() { , + header: () => , }} /> , + header: () => } />, }} /> , + header: () => , }} /> , + header: () => , }} /> @@ -204,8 +196,7 @@ export default function UserLayout() { , + header: () => } />, }} /> @@ -215,103 +206,95 @@ export default function UserLayout() { , + header: () => } />, }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> ( - - router.navigate(`/investment/(tabs)/transaction`) + header: () => ( + + router.navigate(`/investment/(tabs)/transaction`) + } + /> } /> ), @@ -320,14 +303,18 @@ export default function UserLayout() { ( - - router.navigate(`/investment/(tabs)/transaction`) + header: () => ( + + router.navigate(`/investment/(tabs)/transaction`) + } + /> } /> ), @@ -336,23 +323,20 @@ export default function UserLayout() { , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> {/* ========== End Investment Section ========= */} @@ -361,122 +345,111 @@ export default function UserLayout() { , + header: () => } />, }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> ( - router.navigate(`/donation/(tabs)/my-donation`)} + header: () => ( + router.navigate(`/donation/(tabs)/my-donation`)} + /> + } /> ), }} @@ -484,13 +457,17 @@ export default function UserLayout() { ( - router.navigate(`/donation/(tabs)/my-donation`)} + header: () => ( + router.navigate(`/donation/(tabs)/my-donation`)} + /> + } /> ), }} @@ -498,55 +475,51 @@ export default function UserLayout() { , + header: () => , }} /> , + header: () => , }} /> {/* ========== End Donation Section ========= */} {/* ========== Job Section ========= */} + + , + header: () => , }} /> , // NOTE: headerLeft di pindahkan ke Tabs Layout + header: () => } />, }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> @@ -556,78 +529,67 @@ export default function UserLayout() { , + header: () => , }} /> , + header: () => , }} /> , + header: () => } />, }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> @@ -635,29 +597,25 @@ export default function UserLayout() { , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> , + header: () => , }} /> @@ -665,8 +623,7 @@ export default function UserLayout() { , + header: () => , }} /> diff --git a/app/(application)/(user)/collaboration/[id]/[detail]/info.tsx b/app/(application)/(user)/collaboration/[id]/[detail]/info.tsx index 316245b..8815f76 100644 --- a/app/(application)/(user)/collaboration/[id]/[detail]/info.tsx +++ b/app/(application)/(user)/collaboration/[id]/[detail]/info.tsx @@ -10,6 +10,7 @@ import { TextCustom, ViewWrapper, } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { apiCollaborationGroup } from "@/service/api-client/api-collaboration"; import { Stack, useFocusEffect, useLocalSearchParams } from "expo-router"; import { useState, useCallback } from "react"; @@ -40,8 +41,7 @@ export default function CollaborationRoomInfo() { <> , + header: () => } />, }} /> diff --git a/app/(application)/(user)/collaboration/[id]/[detail]/room-chat.tsx b/app/(application)/(user)/collaboration/[id]/[detail]/room-chat.tsx index b9d1602..31aaf52 100644 --- a/app/(application)/(user)/collaboration/[id]/[detail]/room-chat.tsx +++ b/app/(application)/(user)/collaboration/[id]/[detail]/room-chat.tsx @@ -1,4 +1,5 @@ import { BackButton } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { MainColor } from "@/constants/color-palet"; import { ICON_SIZE_SMALL } from "@/constants/constans-value"; import ChatScreen from "@/screens/Collaboration/GroupChatSection"; @@ -12,14 +13,18 @@ export default function CollaborationRoomChat() { <> , - headerRight: () => ( - router.push(`/collaboration/${id}/${detail}/info`)} + header: () => ( + } + right={ + router.push(`/collaboration/${id}/${detail}/info`)} + /> + } /> ), }} diff --git a/app/(application)/(user)/collaboration/[id]/detail-participant.tsx b/app/(application)/(user)/collaboration/[id]/detail-participant.tsx index e7bd6b8..7f7afaa 100644 --- a/app/(application)/(user)/collaboration/[id]/detail-participant.tsx +++ b/app/(application)/(user)/collaboration/[id]/detail-participant.tsx @@ -6,6 +6,7 @@ import { MenuDrawerDynamicGrid, ViewWrapper } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import Collaboration_BoxDetailSection from "@/screens/Collaboration/BoxDetailSection"; import { apiCollaborationGetOne } from "@/service/api-client/api-collaboration"; import { Ionicons } from "@expo/vector-icons"; @@ -38,10 +39,14 @@ export default function CollaborationDetailParticipant() { <> , - headerRight: () => ( - setOpenDrawerParticipant(true)} /> + header: () => ( + } + right={ + setOpenDrawerParticipant(true)} /> + } + /> ), }} /> diff --git a/app/(application)/(user)/collaboration/[id]/detail-project-main.tsx b/app/(application)/(user)/collaboration/[id]/detail-project-main.tsx index 04d704a..729a105 100644 --- a/app/(application)/(user)/collaboration/[id]/detail-project-main.tsx +++ b/app/(application)/(user)/collaboration/[id]/detail-project-main.tsx @@ -8,6 +8,7 @@ import { Spacing, ViewWrapper } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { IconEdit } from "@/components/_Icon"; import Collaboration_BoxDetailSection from "@/screens/Collaboration/BoxDetailSection"; import { @@ -66,9 +67,13 @@ export default function CollaborationDetailProjectMain() { <> , - headerRight: () => setOpenDrawer(true)} />, + header: () => ( + } + right={ setOpenDrawer(true)} />} + /> + ), }} /> diff --git a/app/(application)/(user)/collaboration/[id]/index.tsx b/app/(application)/(user)/collaboration/[id]/index.tsx index 5d5800d..93a2a89 100644 --- a/app/(application)/(user)/collaboration/[id]/index.tsx +++ b/app/(application)/(user)/collaboration/[id]/index.tsx @@ -9,6 +9,7 @@ import { MenuDrawerDynamicGrid, ViewWrapper, } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { useAuth } from "@/hooks/use-auth"; import Collaboration_BoxDetailSection from "@/screens/Collaboration/BoxDetailSection"; import { @@ -74,10 +75,14 @@ export default function CollaborationDetail() { <> , - headerRight: () => ( - setOpenDrawerMenu(true)} /> + header: () => ( + } + right={ + setOpenDrawerMenu(true)} /> + } + /> ), }} /> diff --git a/app/(application)/(user)/donation/[id]/(news)/[news]/index.tsx b/app/(application)/(user)/donation/[id]/(news)/[news]/index.tsx index 8fa1f70..4d9b4cd 100644 --- a/app/(application)/(user)/donation/[id]/(news)/[news]/index.tsx +++ b/app/(application)/(user)/donation/[id]/(news)/[news]/index.tsx @@ -11,6 +11,7 @@ import { TextCustom, ViewWrapper, } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { IconEdit } from "@/components/_Icon"; import { IconTrash } from "@/components/_Icon/IconTrash"; import { useAuth } from "@/hooks/use-auth"; @@ -57,12 +58,17 @@ export default function DonationNews() { <> , - headerRight: () => - user?.id === data?.authorId && ( - setOpenDrawer(true)} /> - ), + header: () => ( + } + right={ + user?.id === data?.authorId && ( + setOpenDrawer(true)} /> + ) + } + /> + ), }} /> diff --git a/app/(application)/(user)/donation/[id]/[status]/detail.tsx b/app/(application)/(user)/donation/[id]/[status]/detail.tsx index 8f94345..a67320f 100644 --- a/app/(application)/(user)/donation/[id]/[status]/detail.tsx +++ b/app/(application)/(user)/donation/[id]/[status]/detail.tsx @@ -7,6 +7,7 @@ import { NewWrapper, Spacing, } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { IconEdit, IconNews } from "@/components/_Icon"; import { IMenuDrawerItem } from "@/components/_Interface/types"; import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom"; @@ -97,14 +98,19 @@ export default function DonasiDetailStatus() { <> , - headerRight: () => - status === "draft" ? ( - setOpenDrawer(true)} /> - ) : status === "publish" ? ( - setOpenDrawerPublish(true)} /> - ) : null, + header: () => ( + } + right={ + status === "draft" ? ( + setOpenDrawer(true)} /> + ) : status === "publish" ? ( + setOpenDrawerPublish(true)} /> + ) : null + } + /> + ), }} /> , - headerRight: () => - user?.id === data?.Author?.id ? ( - setOpenDrawer(true)} /> - ) : null, + header: () => ( + } + right={ + user?.id === data?.Author?.id ? ( + setOpenDrawer(true)} /> + ) : null + } + /> + ), }} /> diff --git a/app/(application)/(user)/event/(tabs)/_layout.tsx b/app/(application)/(user)/event/(tabs)/_layout.tsx index b96a825..7c079a4 100644 --- a/app/(application)/(user)/event/(tabs)/_layout.tsx +++ b/app/(application)/(user)/event/(tabs)/_layout.tsx @@ -4,36 +4,34 @@ import { IconHome, IconStatus, } from "@/components/_Icon"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import BackButtonFromNotification from "@/components/Button/BackButtonFromNotification"; import { TabsStyles } from "@/styles/tabs-styles"; -import { router, Tabs, useLocalSearchParams, useNavigation } from "expo-router"; -import { useLayoutEffect } from "react"; +import { router, Tabs, useLocalSearchParams } from "expo-router"; export default function EventTabsLayout() { - const navigation = useNavigation(); - const { from, category } = useLocalSearchParams<{ from?: string; category?: string; }>(); - console.log("from", from); - console.log("category", category); - - // Atur header secara dinamis - useLayoutEffect(() => { - navigation.setOptions({ - headerLeft: () => ( - - ), - }); - }, [from, router, navigation]); - return ( - + ( + + } + /> + ), + }} + > , - headerRight: () => - status === "draft" ? ( - setOpenDrawer(true)} /> - ) : null, + header: () => ( + } + right={ + status === "draft" ? ( + setOpenDrawer(true)} /> + ) : null + } + /> + ), }} /> diff --git a/app/(application)/(user)/event/[id]/confirmation.tsx b/app/(application)/(user)/event/[id]/confirmation.tsx index 3f70f92..46348ac 100644 --- a/app/(application)/(user)/event/[id]/confirmation.tsx +++ b/app/(application)/(user)/event/[id]/confirmation.tsx @@ -9,6 +9,7 @@ import { TextCustom, ViewWrapper, } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { MainColor } from "@/constants/color-palet"; import { useAuth } from "@/hooks/use-auth"; import { @@ -265,13 +266,17 @@ export default function UserEventConfirmation() { <> ( - router.navigate("/")} + header: () => ( + router.navigate("/")} + /> + } /> ), }} diff --git a/app/(application)/(user)/event/[id]/contribution.tsx b/app/(application)/(user)/event/[id]/contribution.tsx index 6b8099d..5608d21 100644 --- a/app/(application)/(user)/event/[id]/contribution.tsx +++ b/app/(application)/(user)/event/[id]/contribution.tsx @@ -7,6 +7,7 @@ import { Spacing, ViewWrapper, } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { IMenuDrawerItem } from "@/components/_Interface/types"; import LeftButtonCustom from "@/components/Button/BackButton"; import Event_BoxDetailPublishSection from "@/screens/Event/BoxDetailPublishSection"; @@ -49,9 +50,13 @@ export default function EventDetailContribution() { <> , - headerRight: () => setOpenDrawer(true)} />, + header: () => ( + } + right={ setOpenDrawer(true)} />} + /> + ), }} /> diff --git a/app/(application)/(user)/event/[id]/history.tsx b/app/(application)/(user)/event/[id]/history.tsx index 30ad6b3..344d6b8 100644 --- a/app/(application)/(user)/event/[id]/history.tsx +++ b/app/(application)/(user)/event/[id]/history.tsx @@ -6,6 +6,7 @@ import { ViewWrapper, Spacing, } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { IMenuDrawerItem } from "@/components/_Interface/types"; import LeftButtonCustom from "@/components/Button/BackButton"; import Event_BoxDetailPublishSection from "@/screens/Event/BoxDetailPublishSection"; @@ -44,9 +45,13 @@ export default function EventDetailHistory() { <> , - headerRight: () => setOpenDrawer(true)} />, + header: () => ( + } + right={ setOpenDrawer(true)} />} + /> + ), }} /> diff --git a/app/(application)/(user)/event/[id]/publish.tsx b/app/(application)/(user)/event/[id]/publish.tsx index 8c2ae6f..24f5b1b 100644 --- a/app/(application)/(user)/event/[id]/publish.tsx +++ b/app/(application)/(user)/event/[id]/publish.tsx @@ -8,6 +8,7 @@ import { MenuDrawerDynamicGrid, ViewWrapper, } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { IMenuDrawerItem } from "@/components/_Interface/types"; import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom"; import LeftButtonCustom from "@/components/Button/BackButton"; @@ -156,9 +157,13 @@ export default function EventDetailPublish() { <> router.back()} />, - headerRight: () => setOpenDrawer(true)} />, + header: () => ( + router.back()} />} + right={ setOpenDrawer(true)} />} + /> + ), }} /> diff --git a/app/(application)/(user)/investment/[id]/(my-holding)/[id].tsx b/app/(application)/(user)/investment/[id]/(my-holding)/[id].tsx index 95a6fc0..37b14b3 100644 --- a/app/(application)/(user)/investment/[id]/(my-holding)/[id].tsx +++ b/app/(application)/(user)/investment/[id]/(my-holding)/[id].tsx @@ -10,6 +10,7 @@ import { TextCustom, ViewWrapper, } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { IconDocument, IconEdit, IconNews } from "@/components/_Icon"; import { IMenuDrawerItem } from "@/components/_Interface/types"; import { MainColor } from "@/constants/color-palet"; @@ -30,13 +31,13 @@ export default function InvestmentDetailHolding() { const [openDrawerDraft, setOpenDrawerDraft] = useState(false); const [openDrawerPublish, setOpenDrawerPublish] = useState(false); const [data, setData] = useState(null); - + useFocusEffect( useCallback(() => { onLoadData(); }, [id, status]) ); - + const onLoadData = async () => { try { const response = await apiInvestmentGetInvoice({ @@ -44,7 +45,7 @@ export default function InvestmentDetailHolding() { authorId: user?.id, category: "invoice", }); - + console.log("[DATA]", JSON.stringify(response.data, null, 2)); setData(response.data); } catch (error) { @@ -76,14 +77,19 @@ export default function InvestmentDetailHolding() { <> , - headerRight: () => - status === "draft" ? ( - setOpenDrawerDraft(true)} /> - ) : status === "publish" ? ( - setOpenDrawerPublish(true)} /> - ) : null, + header: () => ( + } + right={ + status === "draft" ? ( + setOpenDrawerDraft(true)} /> + ) : status === "publish" ? ( + setOpenDrawerPublish(true)} /> + ) : null + } + /> + ), }} /> diff --git a/app/(application)/(user)/investment/[id]/(news)/[news]/index.tsx b/app/(application)/(user)/investment/[id]/(news)/[news]/index.tsx index 50d6920..40adde1 100644 --- a/app/(application)/(user)/investment/[id]/(news)/[news]/index.tsx +++ b/app/(application)/(user)/investment/[id]/(news)/[news]/index.tsx @@ -11,6 +11,7 @@ import { TextCustom, ViewWrapper, } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { IconTrash } from "@/components/_Icon/IconTrash"; import { useAuth } from "@/hooks/use-auth"; import { @@ -56,12 +57,17 @@ export default function InvestmentNews() { <> , - headerRight: () => - user?.id === data?.authorId && ( - setOpenDrawer(true)} /> - ), + header: () => ( + } + right={ + user?.id === data?.authorId && ( + setOpenDrawer(true)} /> + ) + } + /> + ), }} /> diff --git a/app/(application)/(user)/investment/[id]/[status]/detail.tsx b/app/(application)/(user)/investment/[id]/[status]/detail.tsx index f402178..6fe973c 100644 --- a/app/(application)/(user)/investment/[id]/[status]/detail.tsx +++ b/app/(application)/(user)/investment/[id]/[status]/detail.tsx @@ -6,6 +6,7 @@ import { MenuDrawerDynamicGrid, ViewWrapper, } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { IconDocument, IconEdit, IconNews } from "@/components/_Icon"; import { IMenuDrawerItem } from "@/components/_Interface/types"; import { MainColor } from "@/constants/color-palet"; @@ -106,14 +107,19 @@ export default function InvestmentDetailStatus() { <> , - headerRight: () => - status === "draft" ? ( - setOpenDrawerDraft(true)} /> - ) : status === "publish" ? ( - setOpenDrawerPublish(true)} /> - ) : null, + header: () => ( + } + right={ + status === "draft" ? ( + setOpenDrawerDraft(true)} /> + ) : status === "publish" ? ( + setOpenDrawerPublish(true)} /> + ) : null + } + /> + ), }} /> diff --git a/app/(application)/(user)/investment/[id]/index.tsx b/app/(application)/(user)/investment/[id]/index.tsx index fdd9aa9..8c98aa5 100644 --- a/app/(application)/(user)/investment/[id]/index.tsx +++ b/app/(application)/(user)/investment/[id]/index.tsx @@ -6,6 +6,7 @@ import { MenuDrawerDynamicGrid, ViewWrapper, } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { IconDocument, IconEdit, IconNews } from "@/components/_Icon"; import { IMenuDrawerItem } from "@/components/_Interface/types"; import { MainColor } from "@/constants/color-palet"; @@ -105,14 +106,19 @@ export default function InvestmentDetail() { <> , - headerRight: () => - status === "draft" ? ( - setOpenDrawerDraft(true)} /> - ) : status === "publish" ? ( - setOpenDrawerPublish(true)} /> - ) : null, + header: () => ( + } + right={ + status === "draft" ? ( + setOpenDrawerDraft(true)} /> + ) : status === "publish" ? ( + setOpenDrawerPublish(true)} /> + ) : null + } + /> + ), }} /> diff --git a/app/(application)/(user)/job/(tabs)/_layout.tsx b/app/(application)/(user)/job/(tabs)/_layout.tsx index fedfb7c..e6acb74 100644 --- a/app/(application)/(user)/job/(tabs)/_layout.tsx +++ b/app/(application)/(user)/job/(tabs)/_layout.tsx @@ -1,5 +1,6 @@ /* eslint-disable react-hooks/exhaustive-deps */ import { BackButton } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { IconHome, IconStatus } from "@/components/_Icon"; import BackButtonFromNotification from "@/components/Button/BackButtonFromNotification"; import { TabsStyles } from "@/styles/tabs-styles"; @@ -7,31 +8,30 @@ import { Ionicons } from "@expo/vector-icons"; import { router, Tabs, - useLocalSearchParams, - useNavigation + useLocalSearchParams } from "expo-router"; -import { useLayoutEffect } from "react"; export default function JobTabsLayout() { - const navigation = useNavigation(); - const { from, category } = useLocalSearchParams<{ from?: string; category?: string; }>(); - // Atur header secara dinamis - useLayoutEffect(() => { - navigation.setOptions({ - headerLeft: () => ( - - ), - }); - }, [from, router, navigation]); - return ( <> - + ( + + } + /> + ), + }} + > , - headerRight: () => - status === "draft" ? ( - setOpenDrawer(true)} /> - ) : null, + header: () => ( + } + right={ + status === "draft" ? ( + setOpenDrawer(true)} /> + ) : null + } + /> + ), }} /> diff --git a/app/(application)/(user)/portofolio/[id]/index.tsx b/app/(application)/(user)/portofolio/[id]/index.tsx index 5169bf9..ed2c2d3 100644 --- a/app/(application)/(user)/portofolio/[id]/index.tsx +++ b/app/(application)/(user)/portofolio/[id]/index.tsx @@ -8,6 +8,7 @@ import { StackCustom, TextCustom, } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import LeftButtonCustom from "@/components/Button/BackButton"; import GridTwoView from "@/components/_ShareComponent/GridTwoView"; import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom"; @@ -72,20 +73,23 @@ export default function Portofolio() { {/* Header */} , - headerRight: () => - data?.Profile?.id !== profileId ? null : ( - - - - ), - headerStyle: GStyles.headerStyle, - headerTitleStyle: GStyles.headerTitleStyle, + header: () => ( + } + right={ + data?.Profile?.id !== profileId ? null : ( + + + + ) + } + /> + ), }} /> diff --git a/app/(application)/(user)/portofolio/_layout.tsx b/app/(application)/(user)/portofolio/_layout.tsx index 9e4797e..d9f7ce3 100644 --- a/app/(application)/(user)/portofolio/_layout.tsx +++ b/app/(application)/(user)/portofolio/_layout.tsx @@ -1,5 +1,5 @@ +import AppHeader from "@/components/_ShareComponent/AppHeader"; import LeftButtonCustom from "@/components/Button/BackButton"; -import { HeaderStyles } from "@/styles/header-styles"; import { Stack } from "expo-router"; export default function PortofolioLayout() { @@ -7,8 +7,9 @@ export default function PortofolioLayout() { <> , + header: () => ( + } /> + ), }} > {/* */} diff --git a/app/(application)/(user)/profile/[id]/index.tsx b/app/(application)/(user)/profile/[id]/index.tsx index 06c3339..c552806 100644 --- a/app/(application)/(user)/profile/[id]/index.tsx +++ b/app/(application)/(user)/profile/[id]/index.tsx @@ -1,5 +1,6 @@ /* eslint-disable react-hooks/exhaustive-deps */ import { NewWrapper, StackCustom } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom"; import LeftButtonCustom from "@/components/Button/BackButton"; import DrawerCustom from "@/components/Drawer/DrawerCustom"; @@ -101,18 +102,20 @@ export default function Profile() { <> , - headerRight: () => ( - ( + } + right={ + + } /> ), - headerStyle: GStyles.headerStyle, - headerTitleStyle: GStyles.headerTitleStyle, }} /> {/* Main View */} diff --git a/app/(application)/(user)/profile/_layout.tsx b/app/(application)/(user)/profile/_layout.tsx index 107b2ca..9faf16b 100644 --- a/app/(application)/(user)/profile/_layout.tsx +++ b/app/(application)/(user)/profile/_layout.tsx @@ -1,47 +1,39 @@ import { BackButton } from "@/components"; -import { GStyles } from "@/styles/global-styles"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { Stack } from "expo-router"; export default function ProfileLayout() { return ( <> - + {/* */} }} + options={{ header: () => }} /> }} + options={{ header: () => }} /> , + header: () => , }} /> }} + options={{ header: () => }} /> }} + options={{ header: () => }} /> diff --git a/app/(application)/(user)/voting/(tabs)/_layout.tsx b/app/(application)/(user)/voting/(tabs)/_layout.tsx index cfa2e40..449129a 100644 --- a/app/(application)/(user)/voting/(tabs)/_layout.tsx +++ b/app/(application)/(user)/voting/(tabs)/_layout.tsx @@ -4,36 +4,34 @@ import { IconHome, IconStatus, } from "@/components/_Icon"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import BackButtonFromNotification from "@/components/Button/BackButtonFromNotification"; import { TabsStyles } from "@/styles/tabs-styles"; -import { Tabs, useLocalSearchParams, useNavigation, router } from "expo-router"; -import { useLayoutEffect } from "react"; +import { router, Tabs, useLocalSearchParams } from "expo-router"; export default function VotingTabsLayout() { - const navigation = useNavigation(); - const { from, category } = useLocalSearchParams<{ from?: string; category?: string; }>(); - console.log("from", from); - console.log("category", category); - - // Atur header secara dinamis - useLayoutEffect(() => { - navigation.setOptions({ - headerLeft: () => ( - - ), - }); - }, [from, router, navigation]); - return ( - + ( + + } + /> + ), + }} + > , - headerRight: () => - status === "draft" ? ( - setOpenDrawerDraft(true)} /> - ) : status === "publish" ? ( - setOpenDrawerPublish(true)} /> - ) : null, + header: () => ( + } + right={ + status === "draft" ? ( + setOpenDrawerDraft(true)} /> + ) : status === "publish" ? ( + setOpenDrawerPublish(true)} /> + ) : null + } + /> + ), }} /> diff --git a/app/(application)/(user)/voting/[id]/contribution.tsx b/app/(application)/(user)/voting/[id]/contribution.tsx index 5b4d063..09bdf22 100644 --- a/app/(application)/(user)/voting/[id]/contribution.tsx +++ b/app/(application)/(user)/voting/[id]/contribution.tsx @@ -9,6 +9,7 @@ import { Spacing, ViewWrapper, } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { IconContribution } from "@/components/_Icon"; import { IMenuDrawerItem } from "@/components/_Interface/types"; import { useAuth } from "@/hooks/use-auth"; @@ -81,10 +82,14 @@ export default function VotingDetailContribution() { <> , - headerRight: () => ( - setOpenDrawerPublish(true)} /> + header: () => ( + } + right={ + setOpenDrawerPublish(true)} /> + } + /> ), }} /> diff --git a/app/(application)/(user)/voting/[id]/history.tsx b/app/(application)/(user)/voting/[id]/history.tsx index b0c6892..fe1449d 100644 --- a/app/(application)/(user)/voting/[id]/history.tsx +++ b/app/(application)/(user)/voting/[id]/history.tsx @@ -9,6 +9,7 @@ import { Spacing, ViewWrapper, } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { IconContribution } from "@/components/_Icon"; import { IMenuDrawerItem } from "@/components/_Interface/types"; import { useAuth } from "@/hooks/use-auth"; @@ -82,10 +83,14 @@ export default function VotingDetailHistory() { <> , - headerRight: () => ( - setOpenDrawerPublish(true)} /> + header: () => ( + } + right={ + setOpenDrawerPublish(true)} /> + } + /> ), }} /> diff --git a/app/(application)/(user)/voting/[id]/index.tsx b/app/(application)/(user)/voting/[id]/index.tsx index 83a7209..7c5b0ce 100644 --- a/app/(application)/(user)/voting/[id]/index.tsx +++ b/app/(application)/(user)/voting/[id]/index.tsx @@ -11,6 +11,7 @@ import { StackCustom, ViewWrapper, } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { IconArchive, IconContribution } from "@/components/_Icon"; import { IMenuDrawerItem } from "@/components/_Interface/types"; import CustomSkeleton from "@/components/_ShareComponent/SkeletonCustom"; @@ -142,10 +143,14 @@ export default function VotingDetail() { <> , - headerRight: () => ( - setOpenDrawerPublish(true)} /> + header: () => ( + } + right={ + setOpenDrawerPublish(true)} /> + } + /> ), }} /> diff --git a/app/(application)/_layout.tsx b/app/(application)/_layout.tsx index 58cecd3..85a98d0 100644 --- a/app/(application)/_layout.tsx +++ b/app/(application)/_layout.tsx @@ -1,8 +1,8 @@ import { BackButton } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import BackgroundNotificationHandler from "@/components/Notification/BackgroundNotificationHandler"; import NotificationInitializer from "@/components/Notification/NotificationInitializer"; import { NotificationProvider } from "@/hooks/use-notification-store"; -import { HeaderStyles } from "@/styles/header-styles"; import { Stack } from "expo-router"; export default function ApplicationLayout() { @@ -20,7 +20,7 @@ export default function ApplicationLayout() { function ApplicationStack() { return ( <> - + @@ -28,8 +28,7 @@ function ApplicationStack() { , + header: () => , }} /> @@ -37,8 +36,7 @@ function ApplicationStack() { , + header: () => , }} /> diff --git a/app/(application)/admin/_layout.tsx b/app/(application)/admin/_layout.tsx index 6749e9b..8a1cea0 100644 --- a/app/(application)/admin/_layout.tsx +++ b/app/(application)/admin/_layout.tsx @@ -6,6 +6,7 @@ import { StackCustom, TextCustom, } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import DrawerAdmin from "@/components/Drawer/DrawerAdmin"; import NavbarMenu from "@/components/Drawer/NavbarMenu"; import NavbarMenu_V2 from "@/components/Drawer/NavbarMenu_V2"; @@ -35,12 +36,28 @@ import { useState } from "react"; export default function AdminLayout() { const [openDrawerNavbar, setOpenDrawerNavbar] = useState(false); const [openDrawerUser, setOpenDrawerUser] = useState(false); - // const [user, setUser] = useState(null); - const { logout, user } = useAuth(); console.log("[USER LAYOUT]", JSON.stringify(user, null, 2)); + const headerLeft = () => ( + setOpenDrawerNavbar(true)} + /> + ); + + const headerRight = () => ( + setOpenDrawerUser(true)} + /> + ); + return ( <> ( - setOpenDrawerNavbar(true)} - /> - ), - headerRight: () => ( - setOpenDrawerUser(true)} + + // headerLeft: () => ( + // setOpenDrawerNavbar(true)} + // /> + // ), + // headerRight: () => ( + // setOpenDrawerUser(true)} + // /> + // ), + + + + + header: () => ( + ), }} diff --git a/app/+not-found.tsx b/app/+not-found.tsx index dc6c3a8..8df0f46 100644 --- a/app/+not-found.tsx +++ b/app/+not-found.tsx @@ -1,4 +1,5 @@ import { BackButton, StackCustom, TextCustom, ViewWrapper } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { router, Stack } from "expo-router"; export default function NotFoundScreen() { @@ -15,7 +16,7 @@ export default function NotFoundScreen() { return ( <> handleBack()} /> }} + options={{ header: () => handleBack()} />} /> }} /> { if (from === "notifications") { - router.replace(`/notifications?category=${category}`); + router.push(`/notifications?category=${category}`); } else { if (from) { - router.replace(`/${from}` as any); + router.back(); } else { - router.navigate("/home"); + router.back(); } } }} diff --git a/components/_ShareComponent/AppHeader.tsx b/components/_ShareComponent/AppHeader.tsx index 0f318a2..789b815 100644 --- a/components/_ShareComponent/AppHeader.tsx +++ b/components/_ShareComponent/AppHeader.tsx @@ -43,9 +43,10 @@ export default function AppHeader({ paddingBottom, }, ]} + pointerEvents="box-none" > {/* Header Container dengan absolute positioning untuk title center */} - + {/* Left Section - Absolute Left */} {showBack ? ( diff --git a/ios/HIPMIBadungConnect.xcodeproj/project.pbxproj b/ios/HIPMIBadungConnect.xcodeproj/project.pbxproj index aa8f16f..840f66d 100644 --- a/ios/HIPMIBadungConnect.xcodeproj/project.pbxproj +++ b/ios/HIPMIBadungConnect.xcodeproj/project.pbxproj @@ -195,6 +195,8 @@ 6ECA5F81B0BC4C70A91BE265 /* Remove signature files (Xcode workaround) */, 44265583B67C48F2A24BA93E /* Remove signature files (Xcode workaround) */, D5CA1D54CFF74AB4B8B5B583 /* Remove signature files (Xcode workaround) */, + 97C01196E2194AF5A13C7773 /* Remove signature files (Xcode workaround) */, + EB19F4C53C8B434CBAD50897 /* Remove signature files (Xcode workaround) */, ); buildRules = ( ); @@ -1211,6 +1213,40 @@ rm -rf \"$CONFIGURATION_BUILD_DIR/MapLibre.xcframework-ios.signature\"; "; }; + 97C01196E2194AF5A13C7773 /* Remove signature files (Xcode workaround) */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + name = "Remove signature files (Xcode workaround)"; + inputPaths = ( + ); + outputPaths = ( + ); + shellPath = /bin/sh; + shellScript = " + echo \"Remove signature files (Xcode workaround)\"; + rm -rf \"$CONFIGURATION_BUILD_DIR/MapLibre.xcframework-ios.signature\"; + "; + }; + EB19F4C53C8B434CBAD50897 /* Remove signature files (Xcode workaround) */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + name = "Remove signature files (Xcode workaround)"; + inputPaths = ( + ); + outputPaths = ( + ); + shellPath = /bin/sh; + shellScript = " + echo \"Remove signature files (Xcode workaround)\"; + rm -rf \"$CONFIGURATION_BUILD_DIR/MapLibre.xcframework-ios.signature\"; + "; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/screens/Admin/Notification-Admin/ScreenNotificationAdmin.tsx b/screens/Admin/Notification-Admin/ScreenNotificationAdmin.tsx index 5a36598..32d2c78 100644 --- a/screens/Admin/Notification-Admin/ScreenNotificationAdmin.tsx +++ b/screens/Admin/Notification-Admin/ScreenNotificationAdmin.tsx @@ -9,6 +9,7 @@ import { StackCustom, TextCustom, } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { IconPlus } from "@/components/_Icon"; import { IconDot } from "@/components/_Icon/IconComponent"; import ListSkeletonComponent from "@/components/_ShareComponent/ListSkeletonComponent"; @@ -121,12 +122,16 @@ export default function Admin_ScreenNotification() { <> , - headerRight: () => ( - setOpenDrawer(true)} + header: () => ( + } + right={ + setOpenDrawer(true)} + /> + } /> ), }} diff --git a/screens/Admin/Notification-Admin/ScreenNotificationAdmin2.tsx b/screens/Admin/Notification-Admin/ScreenNotificationAdmin2.tsx index 6ef400a..0579312 100644 --- a/screens/Admin/Notification-Admin/ScreenNotificationAdmin2.tsx +++ b/screens/Admin/Notification-Admin/ScreenNotificationAdmin2.tsx @@ -11,6 +11,7 @@ import { } from "@/components"; import { IconPlus } from "@/components/_Icon"; import { IconDot } from "@/components/_Icon/IconComponent"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { AccentColor, MainColor } from "@/constants/color-palet"; import { ICON_SIZE_SMALL, PAGINATION_DEFAULT_TAKE } from "@/constants/constans-value"; import { createPaginationComponents } from "@/helpers/paginationHelpers"; @@ -169,12 +170,16 @@ export default function Admin_ScreenNotification2() { <> , - headerRight: () => ( - setOpenDrawer(true)} + // title: "Admin Notifikasi", + header: () => ( + setOpenDrawer(true)} + /> + } /> ), }} diff --git a/screens/Donation/ScreenListOfNews.tsx b/screens/Donation/ScreenListOfNews.tsx index baeaf40..efd6689 100644 --- a/screens/Donation/ScreenListOfNews.tsx +++ b/screens/Donation/ScreenListOfNews.tsx @@ -1,5 +1,6 @@ /* eslint-disable react-hooks/exhaustive-deps */ import { BackButton, DrawerCustom, MenuDrawerDynamicGrid } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { IconPlus } from "@/components/_Icon"; import NewWrapper from "@/components/_ShareComponent/NewWrapper"; import { MainColor } from "@/constants/color-palet"; @@ -52,8 +53,12 @@ export default function Donation_ScreenListOfNews({ <> , + header: () => ( + } + /> + ), }} /> , - headerRight: () => setOpenDrawer(true)} />, + header: () => ( + } + right={ setOpenDrawer(true)} />} + /> + ), }} /> , - headerRight: () => ( - ( + } + right={ + + } /> ), }} diff --git a/screens/Forum/ViewBeranda2.tsx b/screens/Forum/ViewBeranda2.tsx index 5e88267..2a7c482 100644 --- a/screens/Forum/ViewBeranda2.tsx +++ b/screens/Forum/ViewBeranda2.tsx @@ -8,6 +8,7 @@ import { StackCustom, TextCustom, // ← gunakan NewWrapper yang sudah diperbaiki } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import SkeletonCustom from "@/components/_ShareComponent/SkeletonCustom"; import NewWrapper from "@/components/_ShareComponent/NewWrapper"; import { useAuth } from "@/hooks/use-auth"; @@ -155,13 +156,17 @@ export default function Forum_ViewBeranda2() { {/* 🔹 Header Navigation */} , - headerRight: () => ( - ( + } + right={ + + } /> ), }} diff --git a/screens/Forum/ViewBeranda3.tsx b/screens/Forum/ViewBeranda3.tsx index 2cb8471..2d8c551 100644 --- a/screens/Forum/ViewBeranda3.tsx +++ b/screens/Forum/ViewBeranda3.tsx @@ -4,6 +4,7 @@ import { FloatingButton, SearchInput, } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import NewWrapper from "@/components/_ShareComponent/NewWrapper"; import { MainColor } from "@/constants/color-palet"; import { createPaginationComponents } from "@/helpers/paginationHelpers"; @@ -84,18 +85,22 @@ export default function Forum_ViewBeranda3() { <> , - headerRight: () => ( - router.navigate(`/forum/${user?.id}/forumku`)} - > - - + header: () => ( + } + right={ + router.navigate(`/forum/${user?.id}/forumku`)} + > + + + } + /> ), }} /> diff --git a/screens/Invesment/Document/ScreenRecapOfDocument.tsx b/screens/Invesment/Document/ScreenRecapOfDocument.tsx index f84de59..822619a 100644 --- a/screens/Invesment/Document/ScreenRecapOfDocument.tsx +++ b/screens/Invesment/Document/ScreenRecapOfDocument.tsx @@ -6,6 +6,7 @@ import { DrawerCustom, MenuDrawerDynamicGrid } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { IconEdit } from "@/components/_Icon"; import NewWrapper from "@/components/_ShareComponent/NewWrapper"; import { MainColor } from "@/constants/color-palet"; @@ -125,14 +126,18 @@ export default function Investment_ScreenRecapOfDocument() { <> , - headerRight: () => ( - { - setOpenDrawer(true); - setOpenDrawerBox(false); - }} + header: () => ( + } + right={ + { + setOpenDrawer(true); + setOpenDrawerBox(false); + }} + /> + } /> ), }} diff --git a/screens/Invesment/News/ScreenListOfNews.tsx b/screens/Invesment/News/ScreenListOfNews.tsx index 37da0d7..e8e6c63 100644 --- a/screens/Invesment/News/ScreenListOfNews.tsx +++ b/screens/Invesment/News/ScreenListOfNews.tsx @@ -7,6 +7,7 @@ import { MenuDrawerDynamicGrid, TextCustom, } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { IconPlus } from "@/components/_Icon"; import NewWrapper from "@/components/_ShareComponent/NewWrapper"; import { usePagination } from "@/hooks/use-pagination"; @@ -64,9 +65,13 @@ export default function Investment_ScreenListOfNews({ <> , - // headerRight: () => setOpenDrawer(true)} />, + header: () => ( + } + // headerRight: () => setOpenDrawer(true)} />, + /> + ), }} /> diff --git a/screens/Invesment/News/ScreenRecapOfNews.tsx b/screens/Invesment/News/ScreenRecapOfNews.tsx index 157ca9b..bda8b2b 100644 --- a/screens/Invesment/News/ScreenRecapOfNews.tsx +++ b/screens/Invesment/News/ScreenRecapOfNews.tsx @@ -9,6 +9,7 @@ import { Spacing, TextCustom, } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { IconPlus } from "@/components/_Icon"; import NewWrapper from "@/components/_ShareComponent/NewWrapper"; import { usePagination } from "@/hooks/use-pagination"; @@ -66,9 +67,13 @@ export default function Investment_ScreenRecapOfNews({ <> , - headerRight: () => setOpenDrawer(true)} />, + header: () => ( + } + right={ setOpenDrawer(true)} />} + /> + ), }} /> , - headerRight: () => ( - setOpenDrawer(true)} + header: () => ( + } + right={ + setOpenDrawer(true)} + /> + } /> ), }} diff --git a/screens/Notification/ScreenNotification_V2.tsx b/screens/Notification/ScreenNotification_V2.tsx index a58878d..6c9b17d 100644 --- a/screens/Notification/ScreenNotification_V2.tsx +++ b/screens/Notification/ScreenNotification_V2.tsx @@ -10,6 +10,7 @@ import { StackCustom, TextCustom, } from "@/components"; +import AppHeader from "@/components/_ShareComponent/AppHeader"; import { IconDot } from "@/components/_Icon/IconComponent"; import { AccentColor, MainColor } from "@/constants/color-palet"; import { @@ -182,12 +183,16 @@ export default function ScreenNotification_V2() { <> , - headerRight: () => ( - setOpenDrawer(true)} + header: () => ( + } + right={ + setOpenDrawer(true)} + /> + } /> ), }}