diff --git a/app/(application)/discussion/index.tsx b/app/(application)/discussion/index.tsx index 4d94adb..55f30cd 100644 --- a/app/(application)/discussion/index.tsx +++ b/app/(application)/discussion/index.tsx @@ -4,6 +4,7 @@ import InputSearch from "@/components/inputSearch"; import LabelStatus from "@/components/labelStatus"; import SkeletonContent from "@/components/skeletonContent"; import Text from "@/components/Text"; +import WrapTab from "@/components/wrapTab"; import { ColorsStatus } from "@/constants/ColorsStatus"; import Styles from "@/constants/Styles"; import { apiGetDiscussionGeneral } from "@/lib/api"; @@ -102,22 +103,22 @@ export default function Discussion() { { entityUser.role != "user" && entityUser.role != "coadmin" && - + { setStatus("true") }} label="Aktif" - icon={} + icon={} n={2} /> { setStatus("false") }} label="Arsip" - icon={} + icon={} n={2} /> - + } diff --git a/app/(application)/division/[id]/(fitur-division)/discussion/index.tsx b/app/(application)/division/[id]/(fitur-division)/discussion/index.tsx index 777a0a0..09271c1 100644 --- a/app/(application)/division/[id]/(fitur-division)/discussion/index.tsx +++ b/app/(application)/division/[id]/(fitur-division)/discussion/index.tsx @@ -5,6 +5,7 @@ import InputSearch from "@/components/inputSearch"; import LabelStatus from "@/components/labelStatus"; import SkeletonContent from "@/components/skeletonContent"; import Text from "@/components/Text"; +import WrapTab from "@/components/wrapTab"; import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiGetDiscussion, apiGetDivisionOneFeature } from "@/lib/api"; @@ -134,22 +135,22 @@ export default function DiscussionDivision() { { ((entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision) && - + { setStatus("true") }} label="Aktif" - icon={} + icon={} n={2} /> { setStatus("false") }} label="Arsip" - icon={} + icon={} n={2} /> - + } diff --git a/app/(application)/division/[id]/(fitur-division)/task/index.tsx b/app/(application)/division/[id]/(fitur-division)/task/index.tsx index 700011d..77df27f 100644 --- a/app/(application)/division/[id]/(fitur-division)/task/index.tsx +++ b/app/(application)/division/[id]/(fitur-division)/task/index.tsx @@ -123,7 +123,7 @@ export default function ListTask() { icon={ } @@ -137,7 +137,7 @@ export default function ListTask() { icon={ } @@ -151,7 +151,7 @@ export default function ListTask() { icon={ } @@ -165,7 +165,7 @@ export default function ListTask() { icon={ } diff --git a/app/(application)/division/index.tsx b/app/(application)/division/index.tsx index c7c9a37..860beb5 100644 --- a/app/(application)/division/index.tsx +++ b/app/(application)/division/index.tsx @@ -6,6 +6,7 @@ import PaperGridContent from "@/components/paperGridContent"; import Skeleton from "@/components/skeleton"; import SkeletonTwoItem from "@/components/skeletonTwoItem"; import Text from "@/components/Text"; +import WrapTab from "@/components/wrapTab"; import { ColorsStatus } from "@/constants/ColorsStatus"; import Styles from "@/constants/Styles"; import { apiGetDivision } from "@/lib/api"; @@ -121,7 +122,7 @@ export default function ListDivision() { { entityUser.role != "user" && entityUser.role != "coadmin" ? - + } @@ -144,15 +145,15 @@ export default function ListDivision() { icon={ } n={2} /> - + : - + } @@ -175,13 +176,13 @@ export default function ListDivision() { icon={ } n={2} /> - + } diff --git a/app/(application)/feature.tsx b/app/(application)/feature.tsx index 2ffd15a..494cbb0 100644 --- a/app/(application)/feature.tsx +++ b/app/(application)/feature.tsx @@ -2,7 +2,7 @@ import AppHeader from "@/components/AppHeader"; import { ButtonFiturMenu } from "@/components/buttonFiturMenu"; import Styles from "@/constants/Styles"; import { useTheme } from "@/providers/ThemeProvider"; -import { AntDesign, Entypo, Ionicons, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons"; +import { AntDesign, Entypo, Feather, Ionicons, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons"; import { router, Stack } from "expo-router"; import { SafeAreaView, View } from "react-native"; import { useSelector } from "react-redux"; @@ -24,23 +24,23 @@ export default function Feature() { /> - } text="Divisi" onPress={() => { router.push('/division?active=true') }} /> - } text="Kegiatan" onPress={() => { router.push('/project?status=0') }} /> - } text="Pengumuman" onPress={() => { router.push('/announcement') }} /> - } text="Diskusi" onPress={() => { router.push('/discussion?active=true') }} /> + } text="Divisi" onPress={() => { router.push('/division?active=true') }} /> + } text="Kegiatan" onPress={() => { router.push('/project?status=0') }} /> + } text="Pengumuman" onPress={() => { router.push('/announcement') }} /> + } text="Diskusi" onPress={() => { router.push('/discussion?active=true') }} /> - } text="Anggota" onPress={() => { router.push('/member') }} /> - } text="Jabatan" onPress={() => { router.push('/position') }} /> + } text="Anggota" onPress={() => { router.push('/member') }} /> + } text="Jabatan" onPress={() => { router.push('/position') }} /> { - entityUser.role == "cosupadmin" && } text="Banner" onPress={() => { router.push('/banner') }} /> + entityUser.role == "cosupadmin" && } text="Banner" onPress={() => { router.push('/banner') }} /> } { (entityUser.role == "supadmin" || entityUser.role == "developer") && <> - } text="Lembaga Desa" onPress={() => { router.push('/group') }} /> - {/* } text="Tema" onPress={() => { }} /> */} - } text="Banner" onPress={() => { router.push('/banner') }} /> + } text="Lembaga Desa" onPress={() => { router.push('/group') }} /> + {/* } text="Tema" onPress={() => { }} /> */} + } text="Banner" onPress={() => { router.push('/banner') }} /> } diff --git a/app/(application)/group/index.tsx b/app/(application)/group/index.tsx index f94d6b1..2097ba5 100644 --- a/app/(application)/group/index.tsx +++ b/app/(application)/group/index.tsx @@ -8,6 +8,7 @@ import InputSearch from "@/components/inputSearch"; import MenuItemRow from "@/components/menuItemRow"; import SkeletonTwoItem from "@/components/skeletonTwoItem"; import Text from "@/components/Text"; +import WrapTab from "@/components/wrapTab"; import { ColorsStatus } from "@/constants/ColorsStatus"; import Styles from "@/constants/Styles"; import { apiDeleteGroup, apiEditGroup, apiGetGroup } from "@/lib/api"; @@ -131,22 +132,22 @@ export default function Index() { return ( - + { setStatus("true") }} label="Aktif" - icon={} + icon={} n={2} /> { setStatus("false") }} label="Tidak Aktif" - icon={} + icon={} n={2} /> - + diff --git a/app/(application)/home.tsx b/app/(application)/home.tsx index 785226c..e8f0dc5 100644 --- a/app/(application)/home.tsx +++ b/app/(application)/home.tsx @@ -1,10 +1,9 @@ -import CaraouselHome from "@/components/home/carouselHome"; +import CaraouselHome2 from "@/components/home/carouselHome2"; import ChartDokumenHome from "@/components/home/chartDokumenHome"; import ChartProgresHome from "@/components/home/chartProgresHome"; import DisccussionHome from "@/components/home/discussionHome"; import DivisionHome from "@/components/home/divisionHome"; import EventHome from "@/components/home/eventHome"; -import FiturHome from "@/components/home/fiturHome"; import { HeaderRightHome } from "@/components/home/headerRightHome"; import ProjectHome from "@/components/home/projectHome"; import Text from "@/components/Text"; @@ -13,9 +12,10 @@ import { apiGetProfile } from "@/lib/api"; import { setEntities } from "@/lib/entitiesSlice"; import { useAuthSession } from "@/providers/AuthProvider"; import { useTheme } from "@/providers/ThemeProvider"; +import { LinearGradient } from "expo-linear-gradient"; import { Stack } from "expo-router"; import { useEffect, useState } from "react"; -import { Platform, RefreshControl, SafeAreaView, ScrollView, View } from "react-native"; +import { Dimensions, Platform, RefreshControl, SafeAreaView, ScrollView, View } from "react-native"; import { useSafeAreaInsets } from "react-native-safe-area-context"; import { useDispatch, useSelector } from "react-redux"; @@ -55,7 +55,7 @@ export default function Home() { title: 'Home', headerTitle: entities.village, header: () => ( - + {entities.village} @@ -73,9 +73,22 @@ export default function Home() { showsVerticalScrollIndicator={false} style={{ backgroundColor: colors.background }} > - - - + + {/* */} + + + {/* */} diff --git a/app/(application)/member/[id].tsx b/app/(application)/member/[id].tsx index 2844c89..ae575cf 100644 --- a/app/(application)/member/[id].tsx +++ b/app/(application)/member/[id].tsx @@ -11,6 +11,7 @@ import { valueRoleUser } from "@/constants/RoleUser"; import Styles from "@/constants/Styles"; import { apiGetProfile } from "@/lib/api"; import { useTheme } from "@/providers/ThemeProvider"; +import { LinearGradient } from "expo-linear-gradient"; import { router, Stack, useLocalSearchParams } from "expo-router"; import React, { useEffect, useState } from "react"; import { Pressable, RefreshControl, SafeAreaView, ScrollView, View } from "react-native"; @@ -102,7 +103,10 @@ export default function MemberDetail() { /> } > - + { loading ? <> @@ -120,7 +124,7 @@ export default function MemberDetail() { } - + Informasi diff --git a/app/(application)/member/index.tsx b/app/(application)/member/index.tsx index b7573ef..ed3734f 100644 --- a/app/(application)/member/index.tsx +++ b/app/(application)/member/index.tsx @@ -5,6 +5,7 @@ import InputSearch from "@/components/inputSearch"; import LabelStatus from "@/components/labelStatus"; import SkeletonTwoItem from "@/components/skeletonTwoItem"; import Text from "@/components/Text"; +import WrapTab from "@/components/wrapTab"; import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiGetUser } from "@/lib/api"; @@ -108,22 +109,22 @@ export default function Index() { return ( - + { setStatus("true") }} label="Aktif" - icon={} + icon={} n={2} /> { setStatus("false") }} label="Tidak Aktif" - icon={} + icon={} n={2} /> - + { (entityUser.role == "supadmin" || entityUser.role == "developer") && diff --git a/app/(application)/position/index.tsx b/app/(application)/position/index.tsx index d80fb0c..aa3ef55 100644 --- a/app/(application)/position/index.tsx +++ b/app/(application)/position/index.tsx @@ -9,6 +9,7 @@ import LabelStatus from "@/components/labelStatus"; import MenuItemRow from "@/components/menuItemRow"; import SkeletonTwoItem from "@/components/skeletonTwoItem"; import Text from "@/components/Text"; +import WrapTab from "@/components/wrapTab"; import { ColorsStatus } from "@/constants/ColorsStatus"; import Styles from "@/constants/Styles"; import { apiDeletePosition, apiEditPosition, apiGetPosition } from "@/lib/api"; @@ -150,22 +151,22 @@ export default function Index() { return ( - + { setStatus("true") }} label="Aktif" - icon={} + icon={} n={2} /> { setStatus("false") }} label="Tidak Aktif" - icon={} + icon={} n={2} /> - + { (entityUser.role == "supadmin" || entityUser.role == "developer") && diff --git a/app/(application)/profile.tsx b/app/(application)/profile.tsx index 537054d..24f1b8a 100644 --- a/app/(application)/profile.tsx +++ b/app/(application)/profile.tsx @@ -10,6 +10,7 @@ import { useAuthSession } from "@/providers/AuthProvider"; import { useTheme } from "@/providers/ThemeProvider"; import { AntDesign, Ionicons } from "@expo/vector-icons"; import { router, Stack } from "expo-router"; +import { LinearGradient } from "expo-linear-gradient"; import { useState } from "react"; import { Image, Modal, Pressable, SafeAreaView, ScrollView, TouchableOpacity, View } from "react-native"; import ImageViewing from 'react-native-image-viewing'; @@ -68,7 +69,10 @@ export default function Profile() { /> - + setPreview(true)}> {entities.name} {entities.role} - + Tampilan diff --git a/app/(application)/project/index.tsx b/app/(application)/project/index.tsx index d640f8c..93d55b8 100644 --- a/app/(application)/project/index.tsx +++ b/app/(application)/project/index.tsx @@ -136,7 +136,7 @@ export default function ListProject() { icon={ } @@ -150,7 +150,7 @@ export default function ListProject() { icon={ } @@ -164,7 +164,7 @@ export default function ListProject() { icon={ } @@ -178,7 +178,7 @@ export default function ListProject() { icon={ } diff --git a/components/AppHeader.tsx b/components/AppHeader.tsx index b5b6995..eba9a76 100644 --- a/components/AppHeader.tsx +++ b/components/AppHeader.tsx @@ -1,4 +1,5 @@ import Styles from '@/constants/Styles'; +import { useTheme } from "@/providers/ThemeProvider"; import { useRouter } from 'expo-router'; import { Platform, Text, View } from 'react-native'; import { useSafeAreaInsets } from 'react-native-safe-area-context'; @@ -15,20 +16,22 @@ type Props = { export default function AppHeader({ title, right, showBack = true, onPressLeft, left }: Props) { const insets = useSafeAreaInsets(); const router = useRouter(); + const { colors } = useTheme(); return ( - + - {showBack ? ( - - ) : - left ? left : - ( - - )} - - {title} + + {showBack ? ( + + ) : + left ? left : + ( + + )} + {title} + {right} diff --git a/components/buttonBackHeader.tsx b/components/buttonBackHeader.tsx index 86fdb79..bb4e317 100644 --- a/components/buttonBackHeader.tsx +++ b/components/buttonBackHeader.tsx @@ -9,7 +9,7 @@ export default function ButtonBackHeader({ onPress }: Props) { return ( <> } + item={} onPress={() => { onPress && onPress() }} /> diff --git a/components/buttonFiturMenu.tsx b/components/buttonFiturMenu.tsx index 3687b68..d9c3533 100644 --- a/components/buttonFiturMenu.tsx +++ b/components/buttonFiturMenu.tsx @@ -18,7 +18,7 @@ export function ButtonFiturMenu({ onPress, icon, text }: Props) { {icon} - {text} + {text} ) diff --git a/components/buttonTab.tsx b/components/buttonTab.tsx index 746a7a4..9004b39 100644 --- a/components/buttonTab.tsx +++ b/components/buttonTab.tsx @@ -1,7 +1,6 @@ -import { ColorsStatus } from "@/constants/ColorsStatus" -import Styles from "@/constants/Styles" +import Styles from "@/constants/Styles"; import { useTheme } from "@/providers/ThemeProvider"; -import { TouchableOpacity } from "react-native" +import { TouchableOpacity } from "react-native"; import Text from "./Text"; type Props = { @@ -17,9 +16,9 @@ type Props = { export default function ButtonTab({ active, value, onPress, label, n, icon }: Props) { const { colors } = useTheme(); return ( - { onPress() }}> + { onPress() }}> {icon} - {label} + {label} ) } \ No newline at end of file diff --git a/components/discussionItem.tsx b/components/discussionItem.tsx index 1b6fc3b..a572f5b 100644 --- a/components/discussionItem.tsx +++ b/components/discussionItem.tsx @@ -14,7 +14,7 @@ type Props = { export default function DiscussionItem({ title, user, date, onPress }: Props) { const { colors } = useTheme(); return ( - + @@ -23,12 +23,12 @@ export default function DiscussionItem({ title, user, date, onPress }: Props) { - - {user} + + {user} - - {date} + + {date} diff --git a/components/home/carouselHome2.tsx b/components/home/carouselHome2.tsx new file mode 100644 index 0000000..3225d18 --- /dev/null +++ b/components/home/carouselHome2.tsx @@ -0,0 +1,143 @@ +import { ConstEnv } from "@/constants/ConstEnv"; +import Styles from "@/constants/Styles"; +import { apiGetBanner, apiGetProfile } from "@/lib/api"; +import { setEntities } from "@/lib/bannerSlice"; +import { setEntityUser } from "@/lib/userSlice"; +import { useAuthSession } from "@/providers/AuthProvider"; +import { useTheme } from "@/providers/ThemeProvider"; +import { AntDesign, Feather, FontAwesome5, Ionicons, MaterialCommunityIcons, MaterialIcons, } from "@expo/vector-icons"; +import { router } from "expo-router"; +import React, { useEffect } from "react"; +import { Dimensions, Image, View } from "react-native"; +import { useSharedValue } from "react-native-reanimated"; +import Carousel, { ICarouselInstance } from "react-native-reanimated-carousel"; +import { useDispatch, useSelector } from "react-redux"; +import { ButtonFiturMenu } from "../buttonFiturMenu"; +import Text from "../Text"; + +export default function CaraouselHome2({ refreshing }: { refreshing: boolean }) { + const { decryptToken, token } = useAuthSession() + const { colors } = useTheme(); + const ref = React.useRef(null); + const width = Dimensions.get("window").width; + const progress = useSharedValue(0); + const dispatch = useDispatch() + const entities = useSelector((state: any) => state.banner) + const entityUser = useSelector((state: any) => state.user) + + async function handleBannerView() { + const hasil = await decryptToken(String(token?.current)) + apiGetBanner({ user: hasil }).then((data) => { + if (data.data.length > 0) { + dispatch(setEntities(data.data)) + } else { + dispatch(setEntities([])) + } + }) + } + + async function handleUser() { + const hasil = await decryptToken(String(token?.current)) + const response = await apiGetProfile({ id: hasil }) + dispatch(setEntityUser({ role: response.data.idUserRole, admin: false })) + } + + useEffect(() => { + if (refreshing) + handleBannerView() + }, [refreshing]); + + useEffect(() => { + handleBannerView() + }, [dispatch]); + + useEffect(() => { + handleUser() + }, []); + + return ( + + {/* WRAPPER CAROUSEL */} + + {entities.length > 0 ? ( + ( + + )} + /> + ) : ( + + BANNER + + )} + + + {/* FITUR */} + + + } + text="Divisi" + onPress={() => router.push('/division?active=true')} + /> + } + text="Kegiatan" + onPress={() => router.push('/project?status=0')} + /> + } + text="Pengumuman" + onPress={() => router.push('/announcement')} + /> + } + text="Semua" + onPress={() => router.push('/feature')} + /> + + + + ) +} \ No newline at end of file diff --git a/components/home/chartProgresHome.tsx b/components/home/chartProgresHome.tsx index ec352aa..f4a6c5f 100644 --- a/components/home/chartProgresHome.tsx +++ b/components/home/chartProgresHome.tsx @@ -58,7 +58,7 @@ export default function ChartProgresHome({ refreshing }: { refreshing: boolean } data={data} showText showValuesAsTooltipText - textColor={colors.text} + textColor={'black'} radius={120} textSize={15} focusOnPress={false} diff --git a/components/home/discussionHome.tsx b/components/home/discussionHome.tsx index 1a15e4d..2dc7f25 100644 --- a/components/home/discussionHome.tsx +++ b/components/home/discussionHome.tsx @@ -7,6 +7,7 @@ import { View } from "react-native"; import DiscussionItem from "../discussionItem"; import Skeleton from "../skeleton"; import Text from "../Text"; +import { useTheme } from "@/providers/ThemeProvider"; type Props = { id: string @@ -21,6 +22,7 @@ export default function DisccussionHome({ refreshing }: { refreshing: boolean }) const { decryptToken, token } = useAuthSession() const [data, setData] = useState([]) const [loading, setLoading] = useState(true) + const { colors } = useTheme(); async function handleData(loading: boolean) { @@ -48,7 +50,7 @@ export default function DisccussionHome({ refreshing }: { refreshing: boolean }) return ( Diskusi - + { loading ? <> diff --git a/components/home/fiturHome.tsx b/components/home/fiturHome.tsx index 43004c7..3ddec5c 100644 --- a/components/home/fiturHome.tsx +++ b/components/home/fiturHome.tsx @@ -13,10 +13,10 @@ export default function FiturHome() { Fitur - } text="Divisi" onPress={() => { router.push('/division?active=true') }} /> - } text="Kegiatan" onPress={() => { router.push('/project?status=0') }} /> - } text="Pengumuman" onPress={() => { router.push('/announcement') }} /> - } text="Semua" onPress={() => { router.push('/feature') }} /> + } text="Divisi" onPress={() => { router.push('/division?active=true') }} /> + } text="Kegiatan" onPress={() => { router.push('/project?status=0') }} /> + } text="Pengumuman" onPress={() => { router.push('/announcement') }} /> + } text="Semua" onPress={() => { router.push('/feature') }} /> ) diff --git a/components/home/headerRightHome.tsx b/components/home/headerRightHome.tsx index f74f4f0..c146e68 100644 --- a/components/home/headerRightHome.tsx +++ b/components/home/headerRightHome.tsx @@ -29,7 +29,7 @@ export function HeaderRightHome() { return ( - + } onPress={() => { router.push('/search') }} /> 0 ? true : false} item={} onPress={() => { router.push('/notification') }} /> } onPress={() => { router.push('/profile') }} /> diff --git a/components/home/projectHome.tsx b/components/home/projectHome.tsx index 47a4431..fa7ea0a 100644 --- a/components/home/projectHome.tsx +++ b/components/home/projectHome.tsx @@ -10,6 +10,7 @@ import PaperGridContent from "../paperGridContent"; import ProgressBar from "../progressBar"; import Skeleton from "../skeleton"; import Text from "../Text"; +import { useTheme } from "@/providers/ThemeProvider"; type Props = { id: string @@ -26,6 +27,7 @@ export default function ProjectHome({ refreshing }: { refreshing: boolean }) { const width = Dimensions.get("window").width; const [data, setData] = useState([]) const [loading, setLoading] = useState(true) + const { colors } = useTheme(); async function handleData(loading: boolean) { try { @@ -72,7 +74,7 @@ export default function ProjectHome({ refreshing }: { refreshing: boolean }) { { router.push(`/project/${data[index].id}`) }} title={data[index].title} headerColor="primary"> - {data[index].createdAt} + {data[index].createdAt} } export default function LabelStatus({ category, text, size, style }: Props) { + const { colors } = useTheme(); + + const backgroundColor = { + primary: colors.primary, + success: colors.success, + warning: colors.warning, + error: colors.error, + secondary: colors.dimmed, + }[category] || 'gray'; // Removed ColorsStatus[category]?.backgroundColor as ColorsStatus is removed + return ( - - + + {title} + {children} + + ) +} \ No newline at end of file diff --git a/constants/Colors.ts b/constants/Colors.ts index 0996736..34d6f22 100644 --- a/constants/Colors.ts +++ b/constants/Colors.ts @@ -4,22 +4,34 @@ const tintColorDark = '#fff'; export const Colors = { light: { text: '#11181C', - background: '#f4f9fd', + background: '#f7f7f7ff', tint: tintColorLight, primary: '#19345E', - icon: '#687076', + icon: '#1F3C88', card: '#ffffff', tabIconDefault: '#687076', - tabIconSelected: tintColorLight, + tabActive: '#2563EB', + header: '#234881', + homeGradient: '#346CC4', + dimmed: '#6B7280', + success: '#40C057', + warning: '#FBBF24', + error: '#F87171', }, dark: { text: '#ECEDEE', - background: '#151718', + background: '#0F1B2D', tint: tintColorDark, primary: '#19345E', - icon: '#9BA1A6', - card: '#232526', // slightly lighter than background #151718 + icon: '#9DB9E8', + card: '#16233A', // slightly lighter than background #151718 tabIconDefault: '#9BA1A6', - tabIconSelected: tintColorDark, + tabActive: '#0166FE', + header: '#0E294C', + homeGradient: '#123A6F', + dimmed: '#9AAED1', + success: '#1F6F43', + warning: '#D97706', + error: '#DC2626', }, }; diff --git a/constants/Headers.ts b/constants/Headers.ts index 52db3fb..9632f06 100644 --- a/constants/Headers.ts +++ b/constants/Headers.ts @@ -1,4 +1,4 @@ -const bgColorDefault = '#19345E'; +const bgColorDefault = '#a5e816ff'; export const Headers = { shadow: { diff --git a/constants/Styles.ts b/constants/Styles.ts index 688c9eb..84ad5ef 100644 --- a/constants/Styles.ts +++ b/constants/Styles.ts @@ -151,6 +151,9 @@ const Styles = StyleSheet.create({ ml25: { marginLeft: 25 }, + p0: { + padding: 0 + }, pb05: { paddingBottom: 5 }, @@ -202,9 +205,18 @@ const Styles = StyleSheet.create({ p20: { padding: 20 }, + round05: { + borderRadius: 5 + }, + round08: { + borderRadius: 8 + }, round10: { borderRadius: 10 }, + round15: { + borderRadius: 15 + }, h100: { height: '100%' }, @@ -265,14 +277,12 @@ const Styles = StyleSheet.create({ flexDirection: 'row' }, btnIconHeader: { - backgroundColor: '#384288', - padding: 7, - borderRadius: 100, + padding: 3, }, btnFiturMenu: { - backgroundColor: '#FCAA4B', - padding: 10, - borderRadius: 100, + padding: 13, + borderRadius: 15, + borderWidth: 1, }, btnRound: { backgroundColor: '#19345E', @@ -285,7 +295,7 @@ const Styles = StyleSheet.create({ }, btnTab: { alignItems: 'center', - paddingVertical: 10, + paddingVertical: 5, paddingHorizontal: 15, borderRadius: 20, flexDirection: 'row', @@ -352,35 +362,36 @@ const Styles = StyleSheet.create({ }, wrapGridContent: { shadowColor: '#171717', - shadowOffset: { width: -2, height: 4 }, - shadowOpacity: 0.2, - shadowRadius: 3, - elevation: 10, - borderRadius: 15, + shadowOffset: { width: 0, height: 4 }, + shadowOpacity: 0.1, + shadowRadius: 10, + elevation: 5, + borderRadius: 5, marginBottom: 15 }, wrapGridCaraousel: { width: '95%', height: 200, shadowColor: '#171717', - shadowOffset: { width: -2, height: 4 }, - shadowOpacity: 0.2, - shadowRadius: 3, - elevation: 10, - borderRadius: 15, + shadowOffset: { width: 0, height: 4 }, + shadowOpacity: 0.1, + shadowRadius: 4, + elevation: 5, + borderRadius: 5, + marginLeft: 5 }, headerPaperGrid: { paddingVertical: 25, paddingHorizontal: 20, alignItems: 'center', - borderTopStartRadius: 15, - borderTopEndRadius: 15 + borderTopStartRadius: 5, + borderTopEndRadius: 5 }, contentPaperGrid: { backgroundColor: 'white', height: 150, - borderBottomEndRadius: 15, - borderBottomStartRadius: 15, + borderBottomEndRadius: 5, + borderBottomStartRadius: 5, paddingHorizontal: 20, justifyContent: 'space-evenly' }, @@ -402,15 +413,20 @@ const Styles = StyleSheet.create({ }, contentBar: { height: 20, - backgroundColor: 'orange', + backgroundColor: '#3B82F6', borderRadius: 10, }, wrapPaper: { - padding: 15, + padding: 10, backgroundColor: 'white', - borderRadius: 10, - borderWidth: 1, - borderColor: '#d6d8f6', + borderRadius: 5, + // borderWidth: 1, + // borderColor: '#d6d8f6', + shadowColor: '#171717', + shadowOffset: { width: 0, height: 0 }, + shadowOpacity: 0.1, + shadowRadius: 4, + elevation: 5, }, contentItemCenter: { justifyContent: 'center', @@ -429,11 +445,10 @@ const Styles = StyleSheet.create({ marginRight: 10 }, wrapItemDiscussion: { - padding: 10, - borderRadius: 10, + padding: 15, + borderRadius: 5, borderColor: '#d6d8f6', - borderWidth: 1, - marginBottom: 10 + borderBottomWidth: 1, }, wrapItemBorderBottom: { padding: 10, @@ -543,7 +558,7 @@ const Styles = StyleSheet.create({ marginBottom: 10, borderRadius: 20, padding: 5, - backgroundColor: 'white', + borderWidth: 1, }, itemSelectModal: { padding: 10, @@ -644,7 +659,7 @@ const Styles = StyleSheet.create({ }, headerTitle: { color: '#fff', - fontSize: 16, + fontSize: 18, fontWeight: '600', }, headerSide: { @@ -686,6 +701,13 @@ const Styles = StyleSheet.create({ flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center', + }, + wrapHomeCarousel: { + shadowColor: '#171717', + shadowOffset: { width: 0, height: 5 }, + shadowOpacity: 0.2, + shadowRadius: 5, + elevation: 50, } })