diff --git a/app/(application)/announcement/[id].tsx b/app/(application)/announcement/[id].tsx index a3ec9a2..24e82b5 100644 --- a/app/(application)/announcement/[id].tsx +++ b/app/(application)/announcement/[id].tsx @@ -84,9 +84,9 @@ export default function DetailAnnouncement() { : <> - + - {data?.title} + {data?.title} { diff --git a/app/(application)/banner/index.tsx b/app/(application)/banner/index.tsx index b980fdd..e72d9a8 100644 --- a/app/(application)/banner/index.tsx +++ b/app/(application)/banner/index.tsx @@ -142,6 +142,7 @@ export default function BannerList() { /> } title={index.title} + width={65} /> ))} diff --git a/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/edit.tsx b/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/edit.tsx index ed62618..50020ca 100644 --- a/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/edit.tsx +++ b/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/edit.tsx @@ -9,10 +9,11 @@ import { valueTypeEventRepeat } from "@/constants/TypeEventRepeat" import { apiGetCalendarOne, apiUpdateCalendar } from "@/lib/api" import { stringToDateTime } from "@/lib/fun_stringToDate" import { useAuthSession } from "@/providers/AuthProvider" +import { useHeaderHeight } from "@react-navigation/elements" import { Stack, router, useLocalSearchParams } from "expo-router" import moment from "moment" import { useEffect, useState } from "react" -import { SafeAreaView, ScrollView, View } from "react-native" +import { KeyboardAvoidingView, Platform, SafeAreaView, ScrollView, View } from "react-native" import Toast from "react-native-toast-message" export default function EditEventCalendar() { @@ -22,6 +23,7 @@ export default function EditEventCalendar() { const { id, detail } = useLocalSearchParams<{ id: string, detail: string }>() const [idCalendar, setIdCalendar] = useState('') const [loading, setLoading] = useState(false) + const headerHeight = useHeaderHeight() const [error, setError] = useState({ title: false, @@ -176,94 +178,100 @@ export default function EditEventCalendar() { /> }} /> - - - validationForm("title", val)} - error={error.title} - errorText="Nama acara tidak boleh kosong" - /> - validationForm("dateStart", val)} - mode="date" - value={data.dateStart} - label="Tanggal Acara" - required - error={error.dateStart} - errorText="Tanggal acara tidak boleh kosong" - placeholder="Pilih Tanggal Acara" - /> - - - validationForm("timeStart", val)} - mode="time" - value={data.timeStart} - label="Waktu Awal" - required - error={error.timeStart} - errorText="Waktu awal tidak valid" - placeholder="--:--" - /> - - - validationForm("timeEnd", val)} - mode="time" - value={data.timeEnd} - label="Waktu Akhir" - required - error={error.timeEnd} - errorText="Waktu akhir tidak valid" - placeholder="--:--" - /> + + + + validationForm("title", val)} + error={error.title} + errorText="Nama acara tidak boleh kosong" + /> + validationForm("dateStart", val)} + mode="date" + value={data.dateStart} + label="Tanggal Acara" + required + error={error.dateStart} + errorText="Tanggal acara tidak boleh kosong" + placeholder="Pilih Tanggal Acara" + /> + + + validationForm("timeStart", val)} + mode="time" + value={data.timeStart} + label="Waktu Awal" + required + error={error.timeStart} + errorText="Waktu awal tidak valid" + placeholder="--:--" + /> + + + validationForm("timeEnd", val)} + mode="time" + value={data.timeEnd} + label="Waktu Akhir" + required + error={error.timeEnd} + errorText="Waktu akhir tidak valid" + placeholder="--:--" + /> + + validationForm("linkMeet", val)} + /> + { setSelect(true) }} + /> + validationForm("repeatValue", val)} + error={error.repeatValue} + errorText="Jumlah pengulangan tidak valid" + disable={choose.val == "once"} + /> + validationForm("desc", val)} + multiline + /> - validationForm("linkMeet", val)} - /> - { setSelect(true) }} - /> - validationForm("repeatValue", val)} - error={error.repeatValue} - errorText="Jumlah pengulangan tidak valid" - disable={choose.val == "once"} - /> - validationForm("desc", val)} - multiline - /> - - + + + - + { loading ? - : {data?.title} + : {data?.title} } @@ -219,13 +219,13 @@ export default function DetailEventCalendar() { {data?.linkMeet ? data.linkMeet : '-'} } - + { loading ? : - {data?.desc} + {data?.desc} } diff --git a/app/(application)/member/[id].tsx b/app/(application)/member/[id].tsx index f1de502..fbd1776 100644 --- a/app/(application)/member/[id].tsx +++ b/app/(application)/member/[id].tsx @@ -95,7 +95,7 @@ export default function MemberDetail() { : <> - {data?.name} + {data?.name} {data?.role} diff --git a/components/drawerBottom.tsx b/components/drawerBottom.tsx index 750df0b..009d2b0 100644 --- a/components/drawerBottom.tsx +++ b/components/drawerBottom.tsx @@ -44,7 +44,7 @@ export default function DrawerBottom({ isVisible, setVisible, title, children, a > - {title} + {title} setVisible(false)}> @@ -57,7 +57,7 @@ export default function DrawerBottom({ isVisible, setVisible, title, children, a : - {title} + {title} setVisible(false)}> diff --git a/components/eventItem.tsx b/components/eventItem.tsx index e6605d8..c2945d7 100644 --- a/components/eventItem.tsx +++ b/components/eventItem.tsx @@ -1,5 +1,5 @@ -import Styles from "@/constants/Styles" -import { Pressable, View } from "react-native" +import Styles from "@/constants/Styles"; +import { Pressable, View } from "react-native"; import Text from "./Text"; type Props = { @@ -17,8 +17,8 @@ export default function EventItem({ category, title, user, jamAwal, jamAkhir, on {jamAwal} - {jamAkhir} - {title} - Dibuat oleh : {user} + {title} + Dibuat oleh : {user} ) diff --git a/components/itemSectionTanggalTugas.tsx b/components/itemSectionTanggalTugas.tsx index 1c72d59..440b926 100644 --- a/components/itemSectionTanggalTugas.tsx +++ b/components/itemSectionTanggalTugas.tsx @@ -33,7 +33,7 @@ export default function ItemSectionTanggalTugas({ done, title, dateStart, dateEn - + {title} diff --git a/components/selectForm.tsx b/components/selectForm.tsx index 38cff88..a6775ac 100644 --- a/components/selectForm.tsx +++ b/components/selectForm.tsx @@ -34,9 +34,9 @@ export default function SelectForm({ label, value, placeholder, onPress, info, e { value ? ( - {value} + {value} ) : ( - {placeholder} + {placeholder} ) }