From ec1eda54d708472c6bef79ea96d16b4542ee888b Mon Sep 17 00:00:00 2001 From: amaliadwiy Date: Mon, 28 Jul 2025 10:15:27 +0800 Subject: [PATCH] upd: text warna hitam --- app/(application)/announcement/[id].tsx | 3 ++- app/(application)/announcement/edit/[id].tsx | 3 ++- app/(application)/announcement/index.tsx | 3 ++- app/(application)/discussion/[id].tsx | 3 ++- .../discussion/add-member/[id].tsx | 3 ++- app/(application)/discussion/create.tsx | 3 ++- app/(application)/discussion/member/[id].tsx | 3 ++- .../[id]/(fitur-division)/calendar/index.tsx | 2 ++ .../[id]/(fitur-division)/document/index.tsx | 2 +- app/(application)/division/index.tsx | 3 ++- app/(application)/search.tsx | 3 ++- app/index.tsx | 3 ++- app/verification.tsx | 3 ++- components/Text.tsx | 23 +++++++++++++++++++ components/borderBottomItem.tsx | 12 ++++++---- components/buttonFiturMenu.tsx | 3 ++- components/buttonForm.tsx | 3 ++- components/buttonSelect.tsx | 3 ++- components/buttonTab.tsx | 3 ++- components/buttonTabExpo.tsx | 3 ++- components/discussionItem.tsx | 3 ++- .../division/discussionDivisionDetail.tsx | 3 ++- components/division/fileDivisionDetail.tsx | 3 ++- components/division/fiturDivisionDetail.tsx | 3 ++- components/division/taskDivisionDetail.tsx | 3 ++- components/document/itemFile.tsx | 3 ++- components/drawerBottom.tsx | 3 ++- components/eventItem.tsx | 3 ++- components/home/chartDokumenHome.tsx | 3 ++- components/home/chartProgresHome.tsx | 3 ++- components/home/discussionHome.tsx | 3 ++- components/home/divisionHome.tsx | 3 ++- components/home/eventHome.tsx | 3 ++- components/home/fiturHome.tsx | 3 ++- components/home/projectHome.tsx | 3 ++- components/imageWithLabel.tsx | 3 ++- components/inputForm.tsx | 3 ++- components/itemDetailMember.tsx | 3 ++- components/itemSectionTanggalTugas.tsx | 4 ++-- components/labelStatus.tsx | 4 ++-- components/menuItemRow.tsx | 3 ++- components/modalFilter.tsx | 3 ++- components/modalFloat.tsx | 3 ++- components/modalSelect.tsx | 3 ++- components/modalSelectMultiple.tsx | 3 ++- components/paperGridContent.tsx | 3 ++- components/sectionCancel.tsx | 3 ++- components/sectionProgress.tsx | 3 ++- components/selectForm.tsx | 3 ++- 49 files changed, 123 insertions(+), 53 deletions(-) create mode 100644 components/Text.tsx diff --git a/app/(application)/announcement/[id].tsx b/app/(application)/announcement/[id].tsx index f59bae2..b63051e 100644 --- a/app/(application)/announcement/[id].tsx +++ b/app/(application)/announcement/[id].tsx @@ -1,13 +1,14 @@ import HeaderRightAnnouncementDetail from "@/components/announcement/headerAnnouncementDetail"; import ButtonBackHeader from "@/components/buttonBackHeader"; import Skeleton from "@/components/skeleton"; +import Text from '@/components/Text'; import Styles from "@/constants/Styles"; import { apiGetAnnouncementOne } from "@/lib/api"; import { useAuthSession } from "@/providers/AuthProvider"; import { Entypo, MaterialIcons } from "@expo/vector-icons"; import { router, Stack, useLocalSearchParams } from "expo-router"; import { useEffect, useState } from "react"; -import { Dimensions, SafeAreaView, ScrollView, Text, View } from "react-native"; +import { Dimensions, SafeAreaView, ScrollView, View } from "react-native"; import RenderHTML from 'react-native-render-html'; import { useSelector } from "react-redux"; diff --git a/app/(application)/announcement/edit/[id].tsx b/app/(application)/announcement/edit/[id].tsx index 9346b4f..b1ac9e7 100644 --- a/app/(application)/announcement/edit/[id].tsx +++ b/app/(application)/announcement/edit/[id].tsx @@ -3,6 +3,7 @@ import ButtonSaveHeader from "@/components/buttonSaveHeader"; import ButtonSelect from "@/components/buttonSelect"; import { InputForm } from "@/components/inputForm"; import ModalSelectMultiple from "@/components/modalSelectMultiple"; +import Text from '@/components/Text'; import Styles from "@/constants/Styles"; import { setUpdateAnnouncement } from "@/lib/announcementUpdate"; import { apiEditAnnouncement, apiGetAnnouncementOne } from "@/lib/api"; @@ -10,7 +11,7 @@ import { useAuthSession } from "@/providers/AuthProvider"; import { Entypo } from "@expo/vector-icons"; import { router, Stack, useLocalSearchParams } from "expo-router"; import { useEffect, useState } from "react"; -import { SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native"; +import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native"; import { useDispatch, useSelector } from "react-redux"; diff --git a/app/(application)/announcement/index.tsx b/app/(application)/announcement/index.tsx index 80eca00..a1fef5d 100644 --- a/app/(application)/announcement/index.tsx +++ b/app/(application)/announcement/index.tsx @@ -1,6 +1,7 @@ import BorderBottomItem from "@/components/borderBottomItem"; import InputSearch from "@/components/inputSearch"; import SkeletonContent from "@/components/skeletonContent"; +import Text from '@/components/Text'; import { ColorsStatus } from "@/constants/ColorsStatus"; import Styles from "@/constants/Styles"; import { apiGetAnnouncement } from "@/lib/api"; @@ -8,7 +9,7 @@ import { useAuthSession } from "@/providers/AuthProvider"; import { MaterialIcons } from "@expo/vector-icons"; import { router } from "expo-router"; import { useEffect, useState } from "react"; -import { RefreshControl, Text, View, VirtualizedList } from "react-native"; +import { RefreshControl, View, VirtualizedList } from "react-native"; import { useSelector } from "react-redux"; type Props = { diff --git a/app/(application)/discussion/[id].tsx b/app/(application)/discussion/[id].tsx index b82fcc1..36aee1e 100644 --- a/app/(application)/discussion/[id].tsx +++ b/app/(application)/discussion/[id].tsx @@ -14,7 +14,8 @@ import { Ionicons, MaterialIcons } from "@expo/vector-icons"; import { firebase } from '@react-native-firebase/database'; import { router, Stack, useLocalSearchParams } from "expo-router"; import { useEffect, useState } from "react"; -import { Pressable, ScrollView, Text, View } from "react-native"; +import { Pressable, ScrollView, View } from "react-native"; +import Text from '@/components/Text'; import { useSelector } from "react-redux"; type Props = { diff --git a/app/(application)/discussion/add-member/[id].tsx b/app/(application)/discussion/add-member/[id].tsx index 2770a41..d53bf68 100644 --- a/app/(application)/discussion/add-member/[id].tsx +++ b/app/(application)/discussion/add-member/[id].tsx @@ -3,6 +3,7 @@ import ButtonSaveHeader from "@/components/buttonSaveHeader"; import ImageUser from "@/components/imageNew"; import ImageWithLabel from "@/components/imageWithLabel"; import InputSearch from "@/components/inputSearch"; +import Text from '@/components/Text'; import Styles from "@/constants/Styles"; import { apiAddMemberDiscussionGeneral, apiGetDiscussionGeneralOne, apiGetUser } from "@/lib/api"; import { setUpdateDiscussionGeneralDetail } from "@/lib/discussionGeneralDetail"; @@ -10,7 +11,7 @@ import { useAuthSession } from "@/providers/AuthProvider"; import { AntDesign } from "@expo/vector-icons"; import { router, Stack, useLocalSearchParams } from "expo-router"; import { useEffect, useState } from "react"; -import { Pressable, SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native"; +import { Pressable, SafeAreaView, ScrollView, ToastAndroid, View } from "react-native"; import { useDispatch, useSelector } from "react-redux"; type Props = { diff --git a/app/(application)/discussion/create.tsx b/app/(application)/discussion/create.tsx index 0cccea1..f39ca3b 100644 --- a/app/(application)/discussion/create.tsx +++ b/app/(application)/discussion/create.tsx @@ -6,6 +6,7 @@ import ImageUser from "@/components/imageNew"; import { InputForm } from "@/components/inputForm"; import ModalSelect from "@/components/modalSelect"; import SelectForm from "@/components/selectForm"; +import Text from '@/components/Text'; import Styles from "@/constants/Styles"; import { apiCreateDiscussionGeneral } from "@/lib/api"; import { setUpdateDiscussionGeneralDetail } from "@/lib/discussionGeneralDetail"; @@ -13,7 +14,7 @@ import { setMemberChoose } from "@/lib/memberChoose"; import { useAuthSession } from "@/providers/AuthProvider"; import { router, Stack } from "expo-router"; import { useEffect, useState } from "react"; -import { SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native"; +import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native"; import { useDispatch, useSelector } from "react-redux"; diff --git a/app/(application)/discussion/member/[id].tsx b/app/(application)/discussion/member/[id].tsx index be66170..e1fc3a5 100644 --- a/app/(application)/discussion/member/[id].tsx +++ b/app/(application)/discussion/member/[id].tsx @@ -5,6 +5,7 @@ import DrawerBottom from "@/components/drawerBottom"; import ImageUser from "@/components/imageNew"; import MenuItemRow from "@/components/menuItemRow"; import SkeletonTwoItem from "@/components/skeletonTwoItem"; +import Text from '@/components/Text'; import { ColorsStatus } from "@/constants/ColorsStatus"; import Styles from "@/constants/Styles"; import { apiDeleteMemberDiscussionGeneral, apiGetDiscussionGeneralOne } from "@/lib/api"; @@ -12,7 +13,7 @@ import { useAuthSession } from "@/providers/AuthProvider"; import { Feather, MaterialCommunityIcons } from "@expo/vector-icons"; import { router, Stack, useLocalSearchParams } from "expo-router"; import { useEffect, useState } from "react"; -import { SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native"; +import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native"; import { useSelector } from "react-redux"; type Props = { diff --git a/app/(application)/division/[id]/(fitur-division)/calendar/index.tsx b/app/(application)/division/[id]/(fitur-division)/calendar/index.tsx index 7e8cb39..35d4d8a 100644 --- a/app/(application)/division/[id]/(fitur-division)/calendar/index.tsx +++ b/app/(application)/division/[id]/(fitur-division)/calendar/index.tsx @@ -1,3 +1,5 @@ +import 'intl'; +import 'intl/locale-data/jsonp/id'; import ButtonBackHeader from "@/components/buttonBackHeader"; import HeaderRightCalendarList from "@/components/calendar/headerCalendarList"; import ItemDateCalendar from "@/components/calendar/itemDateCalendar"; diff --git a/app/(application)/division/[id]/(fitur-division)/document/index.tsx b/app/(application)/division/[id]/(fitur-division)/document/index.tsx index 47cedc6..1b1bf61 100644 --- a/app/(application)/division/[id]/(fitur-division)/document/index.tsx +++ b/app/(application)/division/[id]/(fitur-division)/document/index.tsx @@ -11,6 +11,7 @@ import ModalFloat from "@/components/modalFloat"; import ModalLoading from "@/components/modalLoading"; import ModalSelectMultiple from "@/components/modalSelectMultiple"; import Skeleton from "@/components/skeleton"; +import Text from "@/components/Text"; import { ColorsStatus } from "@/constants/ColorsStatus"; import Styles from "@/constants/Styles"; import { @@ -38,7 +39,6 @@ import { RefreshControl, SafeAreaView, ScrollView, - Text, ToastAndroid, View, } from "react-native"; diff --git a/app/(application)/division/index.tsx b/app/(application)/division/index.tsx index e6fd720..9b59916 100644 --- a/app/(application)/division/index.tsx +++ b/app/(application)/division/index.tsx @@ -17,7 +17,8 @@ import { } from "@expo/vector-icons"; import { router, useLocalSearchParams } from "expo-router"; import { useEffect, useState } from "react"; -import { Pressable, RefreshControl, Text, View, VirtualizedList } from "react-native"; +import { Pressable, RefreshControl, View, VirtualizedList } from "react-native"; +import Text from "@/components/Text"; import { useSelector } from "react-redux"; type Props = { diff --git a/app/(application)/search.tsx b/app/(application)/search.tsx index d69c431..1155c29 100644 --- a/app/(application)/search.tsx +++ b/app/(application)/search.tsx @@ -8,7 +8,8 @@ import { useAuthSession } from "@/providers/AuthProvider"; import { AntDesign, MaterialIcons } from "@expo/vector-icons"; import { router, Stack } from "expo-router"; import { useState } from "react"; -import { FlatList, Image, SafeAreaView, Text, ToastAndroid, View } from "react-native"; +import { FlatList, Image, SafeAreaView, ToastAndroid, View } from "react-native"; +import Text from '@/components/Text'; type PropsUser = { id: string diff --git a/app/index.tsx b/app/index.tsx index 9a21c62..eea348b 100644 --- a/app/index.tsx +++ b/app/index.tsx @@ -4,7 +4,8 @@ import { requestPermission } from "@/lib/useNotification"; import { useAuthSession } from "@/providers/AuthProvider"; import { Redirect } from "expo-router"; import { useEffect, useState } from "react"; -import { Text } from "react-native"; +import { View } from "react-native"; +import Text from '@/components/Text'; export default function Index() { const [isValid, setValid] = useState(false) diff --git a/app/verification.tsx b/app/verification.tsx index 8a20bb3..5834043 100644 --- a/app/verification.tsx +++ b/app/verification.tsx @@ -1,9 +1,10 @@ import { ButtonForm } from "@/components/buttonForm"; +import Text from '@/components/Text'; import Styles from "@/constants/Styles"; import { useAuthSession } from "@/providers/AuthProvider"; import CryptoES from "crypto-es"; import React, { useState } from "react"; -import { Image, Text, View } from "react-native"; +import { Image, View } from "react-native"; import { CodeField, Cursor, useBlurOnFulfill, useClearByFocusCell, } from 'react-native-confirmation-code-field'; export default function Index() { diff --git a/components/Text.tsx b/components/Text.tsx new file mode 100644 index 0000000..1b66f53 --- /dev/null +++ b/components/Text.tsx @@ -0,0 +1,23 @@ +import React from 'react'; +import { Text as RNText, TextProps as RNTextProps, StyleSheet } from 'react-native'; + +type TextProps = RNTextProps & { + children: React.ReactNode; +}; + +const Text: React.FC = ({ style, ...props }) => { + return ( + + ); +}; + +const styles = StyleSheet.create({ + defaultText: { + color: 'black', + }, +}); + +export default Text; diff --git a/components/borderBottomItem.tsx b/components/borderBottomItem.tsx index 274964b..a615606 100644 --- a/components/borderBottomItem.tsx +++ b/components/borderBottomItem.tsx @@ -1,7 +1,8 @@ import { ColorsStatus } from "@/constants/ColorsStatus"; import Styles from "@/constants/Styles"; import React from "react"; -import { Dimensions, Pressable, Text, View } from "react-native"; +import { Dimensions, Pressable, View } from "react-native"; +import Text from "./Text"; type Props = { title?: string @@ -23,6 +24,7 @@ type Props = { export default function BorderBottomItem({ title, subtitle, icon, desc, onPress, rightTopInfo, borderType, leftBottomInfo, rightBottomInfo, titleWeight, bgColor, width, descEllipsize, textColor }: Props) { const lebarDim = Dimensions.get("window").width; const lebar = width ? lebarDim * width / 100 : 'auto'; + const textColorFix = textColor ? textColor : 'black'; return ( @@ -30,23 +32,23 @@ export default function BorderBottomItem({ title, subtitle, icon, desc, onPress, {icon} - {title} + {title} { subtitle && typeof subtitle == "string" - ? {subtitle} + ? {subtitle} : {subtitle} } { - rightTopInfo && {rightTopInfo} + rightTopInfo && {rightTopInfo} } - {desc && {desc}} + {desc && {desc}} { (leftBottomInfo || rightBottomInfo) && ( diff --git a/components/buttonFiturMenu.tsx b/components/buttonFiturMenu.tsx index eb57baa..d772fa2 100644 --- a/components/buttonFiturMenu.tsx +++ b/components/buttonFiturMenu.tsx @@ -1,6 +1,7 @@ import Styles from "@/constants/Styles"; import React from "react"; -import { Text, TouchableWithoutFeedback, View } from "react-native"; +import { TouchableWithoutFeedback, View } from "react-native"; +import Text from "./Text"; type Props = { onPress?: () => void; diff --git a/components/buttonForm.tsx b/components/buttonForm.tsx index 1aabe9b..551f60f 100644 --- a/components/buttonForm.tsx +++ b/components/buttonForm.tsx @@ -1,6 +1,7 @@ import { ColorsStatus } from "@/constants/ColorsStatus"; import Styles from "@/constants/Styles"; -import { Text, TouchableOpacity } from "react-native"; +import { TouchableOpacity } from "react-native"; +import Text from './Text'; type Props = { text: string; diff --git a/components/buttonSelect.tsx b/components/buttonSelect.tsx index 3d6fbb0..8bca73f 100644 --- a/components/buttonSelect.tsx +++ b/components/buttonSelect.tsx @@ -1,6 +1,7 @@ import Styles from "@/constants/Styles"; import { Feather } from "@expo/vector-icons"; -import { Pressable, Text, View } from "react-native"; +import { Pressable, View } from "react-native"; +import Text from "./Text"; type Props = { value: string diff --git a/components/buttonTab.tsx b/components/buttonTab.tsx index 843a6a1..501ef49 100644 --- a/components/buttonTab.tsx +++ b/components/buttonTab.tsx @@ -1,6 +1,7 @@ import { ColorsStatus } from "@/constants/ColorsStatus" import Styles from "@/constants/Styles" -import { Text, TouchableOpacity } from "react-native" +import { TouchableOpacity } from "react-native" +import Text from "./Text"; type Props = { active: string diff --git a/components/buttonTabExpo.tsx b/components/buttonTabExpo.tsx index 77efe01..a202f20 100644 --- a/components/buttonTabExpo.tsx +++ b/components/buttonTabExpo.tsx @@ -3,7 +3,8 @@ import Styles from '@/constants/Styles'; import { AntDesign, Feather, Ionicons, MaterialCommunityIcons } from '@expo/vector-icons'; import { TabTriggerSlotProps } from 'expo-router/ui'; import { ComponentProps, Ref } from 'react'; -import { Pressable, Text, View } from 'react-native'; +import { Pressable, View } from 'react-native'; +import Text from './Text'; type Feather = ComponentProps['name']; type Ionicons = ComponentProps['name']; diff --git a/components/discussionItem.tsx b/components/discussionItem.tsx index 6c138d9..1552715 100644 --- a/components/discussionItem.tsx +++ b/components/discussionItem.tsx @@ -1,6 +1,7 @@ import Styles from "@/constants/Styles"; import { Feather, Ionicons } from "@expo/vector-icons"; -import { Pressable, Text, View } from "react-native"; +import { Pressable, View } from "react-native"; +import Text from "./Text"; type Props = { title: string diff --git a/components/division/discussionDivisionDetail.tsx b/components/division/discussionDivisionDetail.tsx index 343d562..12a751d 100644 --- a/components/division/discussionDivisionDetail.tsx +++ b/components/division/discussionDivisionDetail.tsx @@ -3,7 +3,8 @@ import { apiGetDivisionOneFeature } from "@/lib/api"; import { useAuthSession } from "@/providers/AuthProvider"; import { router, useLocalSearchParams } from "expo-router"; import { useEffect, useState } from "react"; -import { Text, View } from "react-native"; +import { View } from "react-native"; +import Text from "../Text"; import DiscussionItem from "../discussionItem"; import Skeleton from "../skeleton"; diff --git a/components/division/fileDivisionDetail.tsx b/components/division/fileDivisionDetail.tsx index 7399e51..6a72315 100644 --- a/components/division/fileDivisionDetail.tsx +++ b/components/division/fileDivisionDetail.tsx @@ -7,7 +7,8 @@ import { startActivityAsync } from 'expo-intent-launcher'; import { useLocalSearchParams } from "expo-router"; import * as Sharing from 'expo-sharing'; import React, { useEffect, useState } from "react"; -import { Alert, Dimensions, Platform, Pressable, Text, View } from "react-native"; +import { Alert, Dimensions, Platform, Pressable, View } from "react-native"; +import Text from "../Text"; import * as mime from 'react-native-mime-types'; import { ICarouselInstance } from "react-native-reanimated-carousel"; import Skeleton from "../skeleton"; diff --git a/components/division/fiturDivisionDetail.tsx b/components/division/fiturDivisionDetail.tsx index 27463ba..d4682b0 100644 --- a/components/division/fiturDivisionDetail.tsx +++ b/components/division/fiturDivisionDetail.tsx @@ -5,8 +5,9 @@ import { useAuthSession } from "@/providers/AuthProvider" import { AntDesign, MaterialIcons, SimpleLineIcons } from "@expo/vector-icons" import { router, useLocalSearchParams } from "expo-router" import { useEffect, useState } from "react" -import { Text, View } from "react-native" +import { View } from "react-native" import BorderBottomItem from "../borderBottomItem" +import Text from "../Text" type Props = { tugas: number diff --git a/components/division/taskDivisionDetail.tsx b/components/division/taskDivisionDetail.tsx index 4f49bba..199a686 100644 --- a/components/division/taskDivisionDetail.tsx +++ b/components/division/taskDivisionDetail.tsx @@ -4,7 +4,8 @@ import { useAuthSession } from "@/providers/AuthProvider"; import { Feather } from "@expo/vector-icons"; import { useLocalSearchParams } from "expo-router"; import React, { useEffect, useState } from "react"; -import { Dimensions, Text, View } from "react-native"; +import { Dimensions, View } from "react-native"; +import Text from "../Text"; import Carousel, { ICarouselInstance } from "react-native-reanimated-carousel"; import Skeleton from "../skeleton"; diff --git a/components/document/itemFile.tsx b/components/document/itemFile.tsx index 4691c76..fcb2488 100644 --- a/components/document/itemFile.tsx +++ b/components/document/itemFile.tsx @@ -1,6 +1,7 @@ import Styles from "@/constants/Styles"; import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons"; -import { Pressable, Text, View } from "react-native"; +import { Pressable, View } from "react-native"; +import Text from "../Text"; type Props = { diff --git a/components/drawerBottom.tsx b/components/drawerBottom.tsx index 267a9f9..82734d2 100644 --- a/components/drawerBottom.tsx +++ b/components/drawerBottom.tsx @@ -1,6 +1,7 @@ import Styles from "@/constants/Styles"; import { MaterialIcons } from "@expo/vector-icons"; -import { Pressable, Text, View } from "react-native"; +import { Pressable, View } from "react-native"; +import Text from "./Text"; import Modal from 'react-native-modal'; type Props = { diff --git a/components/eventItem.tsx b/components/eventItem.tsx index 640415d..e6605d8 100644 --- a/components/eventItem.tsx +++ b/components/eventItem.tsx @@ -1,5 +1,6 @@ import Styles from "@/constants/Styles" -import { Pressable, Text, View } from "react-native" +import { Pressable, View } from "react-native" +import Text from "./Text"; type Props = { category: 'purple' | 'orange' diff --git a/components/home/chartDokumenHome.tsx b/components/home/chartDokumenHome.tsx index 95e9f66..abcb058 100644 --- a/components/home/chartDokumenHome.tsx +++ b/components/home/chartDokumenHome.tsx @@ -2,9 +2,10 @@ import Styles from "@/constants/Styles"; import { apiGetDataHome } from "@/lib/api"; import { useAuthSession } from "@/providers/AuthProvider"; import { useEffect, useState } from "react"; -import { Dimensions, Text, View } from "react-native"; +import { Dimensions, View } from "react-native"; import { BarChart } from "react-native-gifted-charts"; import Skeleton from "../skeleton"; +import Text from "../Text"; type Props = { value: number; diff --git a/components/home/chartProgresHome.tsx b/components/home/chartProgresHome.tsx index a9082f1..2746637 100644 --- a/components/home/chartProgresHome.tsx +++ b/components/home/chartProgresHome.tsx @@ -2,9 +2,10 @@ import Styles from "@/constants/Styles"; import { apiGetDataHome } from "@/lib/api"; import { useAuthSession } from "@/providers/AuthProvider"; import { useEffect, useState } from "react"; -import { Text, View } from "react-native"; +import { View } from "react-native"; import { PieChart } from "react-native-gifted-charts"; import Skeleton from "../skeleton"; +import Text from "../Text"; type Props = { value: number; diff --git a/components/home/discussionHome.tsx b/components/home/discussionHome.tsx index 0dccc6f..60bb524 100644 --- a/components/home/discussionHome.tsx +++ b/components/home/discussionHome.tsx @@ -3,9 +3,10 @@ import { apiGetDataHome } from "@/lib/api"; import { useAuthSession } from "@/providers/AuthProvider"; import { router } from "expo-router"; import { useEffect, useState } from "react"; -import { Text, View } from "react-native"; +import { View } from "react-native"; import DiscussionItem from "../discussionItem"; import Skeleton from "../skeleton"; +import Text from "../Text"; type Props = { id: string diff --git a/components/home/divisionHome.tsx b/components/home/divisionHome.tsx index 71d6493..a493c44 100644 --- a/components/home/divisionHome.tsx +++ b/components/home/divisionHome.tsx @@ -4,9 +4,10 @@ import { useAuthSession } from "@/providers/AuthProvider"; import { Feather } from "@expo/vector-icons"; import { router } from "expo-router"; import React, { useEffect, useState } from "react"; -import { Dimensions, Pressable, Text, View } from "react-native"; +import { Dimensions, Pressable, View } from "react-native"; import { ICarouselInstance } from "react-native-reanimated-carousel"; import Skeleton from "../skeleton"; +import Text from "../Text"; type Props = { id: string diff --git a/components/home/eventHome.tsx b/components/home/eventHome.tsx index b9fbe5f..3edaac0 100644 --- a/components/home/eventHome.tsx +++ b/components/home/eventHome.tsx @@ -3,9 +3,10 @@ import { apiGetDataHome } from "@/lib/api"; import { useAuthSession } from "@/providers/AuthProvider"; import { router } from "expo-router"; import { useEffect, useState } from "react"; -import { Text, View } from "react-native"; +import { View } from "react-native"; import EventItem from "../eventItem"; import Skeleton from "../skeleton"; +import Text from "../Text"; type Props = { id: string diff --git a/components/home/fiturHome.tsx b/components/home/fiturHome.tsx index c698e71..03878cf 100644 --- a/components/home/fiturHome.tsx +++ b/components/home/fiturHome.tsx @@ -1,9 +1,10 @@ import Styles from "@/constants/Styles" import { AntDesign, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons" import React from "react" -import { Text, View } from "react-native" +import { View } from "react-native" import { ButtonFiturMenu } from "../buttonFiturMenu" import { router } from "expo-router" +import Text from "../Text" export default function FiturHome() { return ( diff --git a/components/home/projectHome.tsx b/components/home/projectHome.tsx index acf4762..4916841 100644 --- a/components/home/projectHome.tsx +++ b/components/home/projectHome.tsx @@ -3,12 +3,13 @@ import { apiGetDataHome } from "@/lib/api"; import { useAuthSession } from "@/providers/AuthProvider"; import { router } from "expo-router"; import React, { useEffect, useState } from "react"; -import { Dimensions, Text, View } from "react-native"; +import { Dimensions, View } from "react-native"; import Carousel, { ICarouselInstance } from "react-native-reanimated-carousel"; import LabelStatus from "../labelStatus"; import PaperGridContent from "../paperGridContent"; import ProgressBar from "../progressBar"; import Skeleton from "../skeleton"; +import Text from "../Text"; type Props = { id: string diff --git a/components/imageWithLabel.tsx b/components/imageWithLabel.tsx index b02fd41..dddfcfe 100644 --- a/components/imageWithLabel.tsx +++ b/components/imageWithLabel.tsx @@ -1,6 +1,7 @@ import Styles from "@/constants/Styles"; -import { Text, TouchableOpacity } from "react-native"; +import { TouchableOpacity } from "react-native"; import ImageUser from "./imageNew"; +import Text from "./Text"; type Props = { src: string diff --git a/components/inputForm.tsx b/components/inputForm.tsx index e6cba6a..f246ad2 100644 --- a/components/inputForm.tsx +++ b/components/inputForm.tsx @@ -1,5 +1,6 @@ import Styles from "@/constants/Styles"; -import { Dimensions, Text, TextInput, View } from "react-native"; +import { Dimensions, TextInput, View } from "react-native"; +import Text from "./Text"; type Props = { label?: string; diff --git a/components/itemDetailMember.tsx b/components/itemDetailMember.tsx index 9651847..20fa869 100644 --- a/components/itemDetailMember.tsx +++ b/components/itemDetailMember.tsx @@ -1,6 +1,7 @@ import Styles from "@/constants/Styles"; import { AntDesign, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons"; -import { Text, View } from "react-native"; +import { View } from "react-native"; +import Text from "./Text"; type Props = { category: 'nik' | 'group' | 'position' | 'phone' | 'email' | 'gender' | 'dokumen' | 'type' | 'location' | 'owner' | 'calendar' | 'share' diff --git a/components/itemSectionTanggalTugas.tsx b/components/itemSectionTanggalTugas.tsx index 5ffedad..1c72d59 100644 --- a/components/itemSectionTanggalTugas.tsx +++ b/components/itemSectionTanggalTugas.tsx @@ -1,7 +1,7 @@ import Styles from "@/constants/Styles"; import { MaterialCommunityIcons } from "@expo/vector-icons"; -import { Pressable, Text, View } from "react-native"; - +import { Pressable, View } from "react-native"; +import Text from "./Text"; type Props = { done?: boolean diff --git a/components/labelStatus.tsx b/components/labelStatus.tsx index 24d89f5..84a330d 100644 --- a/components/labelStatus.tsx +++ b/components/labelStatus.tsx @@ -1,7 +1,7 @@ import { ColorsStatus } from "@/constants/ColorsStatus"; import Styles from "@/constants/Styles"; -import { Text, View } from "react-native"; - +import { View } from "react-native"; +import Text from "./Text"; type Props = { category: 'error' | 'success' | 'warning' | 'primary' | 'secondary' diff --git a/components/menuItemRow.tsx b/components/menuItemRow.tsx index 42b5bcd..4ca477a 100644 --- a/components/menuItemRow.tsx +++ b/components/menuItemRow.tsx @@ -1,5 +1,6 @@ import Styles from "@/constants/Styles" -import { Pressable, Text, View } from "react-native" +import { Pressable, View } from "react-native" +import Text from "./Text"; type Props = { onPress: () => void diff --git a/components/modalFilter.tsx b/components/modalFilter.tsx index 1fb3114..ee37eb8 100644 --- a/components/modalFilter.tsx +++ b/components/modalFilter.tsx @@ -5,7 +5,8 @@ import { useAuthSession } from "@/providers/AuthProvider" import { AntDesign } from "@expo/vector-icons" import { router } from "expo-router" import { useEffect, useState } from "react" -import { Pressable, ScrollView, Text, View } from "react-native" +import { Pressable, ScrollView, View } from "react-native" +import Text from './Text'; import { useDispatch, useSelector } from "react-redux" import { ButtonForm } from "./buttonForm" import DrawerBottom from "./drawerBottom" diff --git a/components/modalFloat.tsx b/components/modalFloat.tsx index d0f087e..58a26e9 100644 --- a/components/modalFloat.tsx +++ b/components/modalFloat.tsx @@ -1,5 +1,6 @@ import Styles from '@/constants/Styles'; -import { Pressable, Text, View } from 'react-native'; +import { Pressable, View } from 'react-native'; +import Text from './Text'; import Modal from 'react-native-modal'; type Props = { diff --git a/components/modalSelect.tsx b/components/modalSelect.tsx index 82762e2..4c892ea 100644 --- a/components/modalSelect.tsx +++ b/components/modalSelect.tsx @@ -8,7 +8,8 @@ import { setMemberChoose } from "@/lib/memberChoose" import { useAuthSession } from "@/providers/AuthProvider" import { AntDesign } from "@expo/vector-icons" import { useEffect, useState } from "react" -import { Pressable, ScrollView, Text, View } from "react-native" +import { Pressable, ScrollView, View } from "react-native" +import Text from "./Text"; import { useDispatch, useSelector } from "react-redux" import { ButtonForm } from "./buttonForm" import DrawerBottom from "./drawerBottom" diff --git a/components/modalSelectMultiple.tsx b/components/modalSelectMultiple.tsx index 3fd5fa7..b9ac851 100644 --- a/components/modalSelectMultiple.tsx +++ b/components/modalSelectMultiple.tsx @@ -3,7 +3,8 @@ import { apiGetDivisionGroup, apiGetDocumentInformasi, apiGetListDivisionByIdDiv import { useAuthSession } from "@/providers/AuthProvider" import { AntDesign } from "@expo/vector-icons" import { useEffect, useState } from "react" -import { Pressable, ScrollView, Text, ToastAndroid, View } from "react-native" +import { Pressable, ScrollView, ToastAndroid, View } from "react-native" +import Text from "./Text"; import { ButtonForm } from "./buttonForm" import DrawerBottom from "./drawerBottom" diff --git a/components/paperGridContent.tsx b/components/paperGridContent.tsx index b39a10a..647aa69 100644 --- a/components/paperGridContent.tsx +++ b/components/paperGridContent.tsx @@ -1,6 +1,7 @@ import { ColorsStatus } from "@/constants/ColorsStatus"; import Styles from "@/constants/Styles"; -import { Pressable, Text, View } from "react-native"; +import { Pressable, View } from "react-native"; +import Text from "./Text"; type Props = { content: 'carousel' | 'page'; diff --git a/components/sectionCancel.tsx b/components/sectionCancel.tsx index 01aa79f..527fb44 100644 --- a/components/sectionCancel.tsx +++ b/components/sectionCancel.tsx @@ -1,7 +1,8 @@ import { ColorsStatus } from "@/constants/ColorsStatus"; import Styles from "@/constants/Styles"; import { AntDesign } from "@expo/vector-icons"; -import { Text, View } from "react-native"; +import Text from "./Text"; +import { View } from "react-native"; type Props = { text?: string, diff --git a/components/sectionProgress.tsx b/components/sectionProgress.tsx index 09f9b61..7215cf2 100644 --- a/components/sectionProgress.tsx +++ b/components/sectionProgress.tsx @@ -1,7 +1,8 @@ import { ColorsStatus } from "@/constants/ColorsStatus"; import Styles from "@/constants/Styles"; import { AntDesign } from "@expo/vector-icons"; -import { Text, View } from "react-native"; +import Text from "./Text"; +import { View } from "react-native"; import ProgressBar from "./progressBar"; type Props = { diff --git a/components/selectForm.tsx b/components/selectForm.tsx index 50f7ff9..38cff88 100644 --- a/components/selectForm.tsx +++ b/components/selectForm.tsx @@ -1,6 +1,7 @@ import Styles from "@/constants/Styles"; import { Feather } from "@expo/vector-icons"; -import { Pressable, Text, View } from "react-native"; +import { Pressable, View } from "react-native"; +import Text from "./Text"; type Props = {