Merge pull request 'amalia/18-feb-26' (#25) from amalia/18-feb-26 into join

Reviewed-on: #25

app.config.js

@@ -79,6 +79,12 @@ export default {
          URL_FIREBASE_DB: process.env.URL_FIREBASE_DB,
          PASS_ENC: process.env.PASS_ENC,
          WA_SERVER_TOKEN: process.env.WA_SERVER_TOKEN,
+         FIREBASE_API_KEY: process.env.FIREBASE_API_KEY,
+         FIREBASE_AUTH_DOMAIN: process.env.FIREBASE_AUTH_DOMAIN,
+         FIREBASE_PROJECT_ID: process.env.FIREBASE_PROJECT_ID,
+         FIREBASE_STORAGE_BUCKET: process.env.FIREBASE_STORAGE_BUCKET,
+         FIREBASE_MESSAGING_SENDER_ID: process.env.FIREBASE_MESSAGING_SENDER_ID,
+         FIREBASE_APP_ID: process.env.FIREBASE_APP_ID,
       }
    }
 };

app/(application)/_layout.tsx

@@ -112,6 +112,18 @@ export default function RootLayout() {
                )
             }} />
             <Stack.Screen name="profile" options={{ title: 'Profile' }} />
+            <Stack.Screen name="setting/index" options={{
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               title: 'Pengaturan',
+               headerTitleAlign: 'center',
+               // headerRight: () => <HeaderRightProjectList />
+               header: () => (
+                  <AppHeader title="Pengaturan"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                  />
+               )
+            }} />
             <Stack.Screen name="member/index" options={{
                // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                title: 'Anggota',

app/(application)/announcement/[id].tsx

@@ -200,12 +200,12 @@ export default function DetailAnnouncement() {
                <RefreshControl
                   refreshing={refreshing}
                   onRefresh={() => handleRefresh()}
-                  tintColor={colors.primary}
+                  tintColor={colors.icon}
                />
             }
          >
             <View style={[Styles.p15, Styles.mb50]}>
-               <View style={[Styles.wrapPaper, { backgroundColor: colors.card, borderColor: colors.background }]}>
+               <View style={[Styles.wrapPaper, Styles.borderAll, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
                   {
                      loading ?
                         <View>
@@ -243,7 +243,7 @@ export default function DetailAnnouncement() {
                </View>
                {
                   dataFile.length > 0 && (
-                     <View style={[Styles.wrapPaper, Styles.mt10, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                     <View style={[Styles.wrapPaper, Styles.borderAll, Styles.mt10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
                         <View style={[Styles.mb05]}>
                            <Text style={[Styles.textDefaultSemiBold]}>File</Text>
                         </View>
@@ -268,7 +268,7 @@ export default function DetailAnnouncement() {
                      </View>
                   )
                }
-               <View style={[Styles.wrapPaper, Styles.mt10, { backgroundColor: colors.card, borderColor: colors.background }]}>
+               <View style={[Styles.wrapPaper, Styles.borderAll, Styles.mt10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
                   {
                      loading ?
                         arrSkeleton.map((item, index) => {
@@ -328,7 +328,7 @@ export default function DetailAnnouncement() {
                      accessibilityLabel="Download or share image"
                      disabled={loadingOpen}
                   >
-                     <Text style={{ color: loadingOpen ? 'gray' : 'white', fontSize: 22 }}>⋯</Text>
+                     <Text style={{ color: loadingOpen ? 'gray' : 'white', fontSize: 26 }}>⋯</Text>
                   </Pressable>
                </View>
             )}

app/(application)/announcement/create.tsx

@@ -205,15 +205,16 @@ export default function CreateAnnouncement() {
                {
                   fileForm.length > 0
                   &&
-                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
+                  <View style={[Styles.borderAll, Styles.round05, Styles.p10, Styles.mb10, { borderColor: colors.icon + '20' }]}>
                      <Text style={[Styles.textDefaultSemiBold]}>File</Text>
                      {
                         fileForm.map((item, index) => (
                            <BorderBottomItem
                               key={index}
-                              borderType={fileForm.length > 1 ? "bottom" : "none"}
+                              borderType={fileForm.length - 1 == index ? "none" : "bottom"}
                               icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
                               title={item.name}
+                              bgColor="transparent"
                               titleWeight="normal"
                               onPress={() => { setIndexDelFile(index); setModalFile(true) }}
                            />
@@ -232,7 +233,7 @@ export default function CreateAnnouncement() {
                {
                   divisionMember.length > 0
                   &&
-                  <View style={[Styles.borderAll, Styles.round10, Styles.p10]}>
+                  <View style={[Styles.borderAll, Styles.round05, Styles.p10, { borderColor: colors.icon + '20' }]}>
                      {
                         divisionMember.map((item: { name: any; Division: any }, index: any) => {
                            return (
@@ -270,7 +271,7 @@ export default function CreateAnnouncement() {
          <DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<Ionicons name="trash" color={colors.text} size={25} />}
+                  icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
                   title="Hapus"
                   onPress={() => { deleteFile(indexDelFile) }}
                />

app/(application)/announcement/edit/[id].tsx

@@ -258,7 +258,7 @@ export default function EditAnnouncement() {
                {
                   (fileForm.length > 0 || dataFile.filter((val) => !val.delete).length > 0)
                   &&
-                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
+                  <View style={[Styles.borderAll, Styles.round05, Styles.p10, Styles.mb10, { borderColor: colors.icon + '20' }]}>
                      <Text style={[Styles.textDefaultSemiBold]}>File</Text>
                      {
                         dataFile.filter((val) => !val.delete).map((item, index) => (
@@ -268,6 +268,7 @@ export default function EditAnnouncement() {
                               icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
                               title={item.name + '.' + item.extension}
                               titleWeight="normal"
+                              bgColor="transparent"
                               onPress={() => { setIndexDelFile({ id: item.id, cat: "oldFile" }); setModalFile(true) }}
                            />
                         ))
@@ -280,6 +281,7 @@ export default function EditAnnouncement() {
                               icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
                               title={item.name}
                               titleWeight="normal"
+                              bgColor="transparent"
                               onPress={() => { setIndexDelFile({ id: index, cat: "newFile" }); setModalFile(true) }}
                            />
                         ))
@@ -295,7 +297,7 @@ export default function EditAnnouncement() {
                {
                   dataMember.length > 0
                   &&
-                  <View style={[Styles.borderAll, Styles.round10, Styles.p10]}>
+                  <View style={[Styles.borderAll, Styles.round05, Styles.p10, { borderColor: colors.icon + '20' }]}>
                      {
                         dataMember.map((item: { name: any; Division: any }, index: any) => {
                            return (
@@ -334,7 +336,7 @@ export default function EditAnnouncement() {
          <DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<Ionicons name="trash" color={colors.text} size={25} />}
+                  icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
                   title="Hapus"
                   onPress={() => { deleteFile(indexDelFile.id, indexDelFile.cat) }}
                />

app/(application)/announcement/index.tsx

@@ -110,10 +110,11 @@ export default function Announcement() {
                                  key={index}
                                  onPress={() => { router.push(`/announcement/${item.id}`) }}
                                  borderType="bottom"
+                                 bgColor="transparent"
                                  icon={
-                                    <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                                       <MaterialIcons name="campaign" size={25} color={'#384288'} />
-                                    </View>
+                                    // <View style={[Styles.iconContent]}>
+                                       <MaterialIcons name="campaign" size={25} color={'white'} />
+                                    // </View>
                                  }
                                  title={item.title}
                                  desc={item.desc.replace(/<[^>]*>?/gm, '').replace(/\r?\n|\r/g, ' ')}
@@ -129,12 +130,12 @@ export default function Announcement() {
                            <RefreshControl
                               refreshing={refreshing}
                               onRefresh={handleRefresh}
-                              tintColor={colors.primary}
+                              tintColor={colors.icon}
                            />
                         }
                      />
                      :
-                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada pengumuman</Text>
+                     <Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada pengumuman</Text>
             }
          </View>
       </View>

app/(application)/banner/index.tsx

@@ -1,9 +1,9 @@
-import AlertKonfirmasi from "@/components/alertKonfirmasi"
 import AppHeader from "@/components/AppHeader"
 import HeaderRightBannerList from "@/components/banner/headerBannerList"
 import BorderBottomItem from "@/components/borderBottomItem"
 import DrawerBottom from "@/components/drawerBottom"
 import MenuItemRow from "@/components/menuItemRow"
+import ModalConfirmation from "@/components/ModalConfirmation"
 import ModalLoading from "@/components/modalLoading"
 import Text from "@/components/Text"
 import { ConstEnv } from "@/constants/ConstEnv"
@@ -42,6 +42,7 @@ export default function BannerList() {
    const [refreshing, setRefreshing] = useState(false)
    const [loadingOpen, setLoadingOpen] = useState(false)
    const [viewImg, setViewImg] = useState(false)
+   const [showDeleteModal, setShowDeleteModal] = useState(false)
 
    const handleDeleteEntity = async () => {
       try {
@@ -132,7 +133,7 @@ export default function BannerList() {
                <RefreshControl
                   refreshing={refreshing}
                   onRefresh={handleRefresh}
-                  tintColor={colors.primary}
+                  tintColor={colors.icon}
                />
             }
             style={[Styles.h100, { backgroundColor: colors.background }]}
@@ -163,7 +164,7 @@ export default function BannerList() {
                   </View>
                   :
                   <View style={[Styles.p15, Styles.mb100]}>
-                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
+                     <Text style={[Styles.textDefault, { textAlign: 'center' }]}>Tidak ada data</Text>
                   </View>
             }
 
@@ -192,15 +193,13 @@ export default function BannerList() {
                   }}
                />
                <MenuItemRow
-                  icon={<Ionicons name="trash" color={colors.text} size={25} />}
+                  icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
                   title="Hapus"
                   onPress={() => {
                      setModal(false)
-                     AlertKonfirmasi({
-                        title: 'Konfirmasi',
-                        desc: 'Apakah anda yakin ingin menghapus data?',
-                        onPress: () => { handleDeleteEntity() }
-                     })
+                     setTimeout(() => {
+                        setShowDeleteModal(true)
+                     }, 600)
                   }}
                />
             </View>
@@ -213,6 +212,19 @@ export default function BannerList() {
             onRequestClose={() => setViewImg(false)}
             doubleTapToZoomEnabled
          />
+
+         <ModalConfirmation
+            visible={showDeleteModal}
+            title="Konfirmasi"
+            message="Apakah anda yakin ingin menghapus data?"
+            onConfirm={() => {
+               setShowDeleteModal(false)
+               handleDeleteEntity()
+            }}
+            onCancel={() => setShowDeleteModal(false)}
+            confirmText="Hapus"
+            cancelText="Batal"
+         />
       </SafeAreaView>
    )
 }

app/(application)/discussion/[id].tsx

@@ -1,4 +1,3 @@
-import AlertKonfirmasi from "@/components/alertKonfirmasi";
 import AppHeader from "@/components/AppHeader";
 import BorderBottomItem from "@/components/borderBottomItem";
 import BorderBottomItem2 from "@/components/borderBottomItem2";
@@ -8,10 +7,10 @@ import ImageUser from "@/components/imageNew";
 import { InputForm } from "@/components/inputForm";
 import LabelStatus from "@/components/labelStatus";
 import MenuItemRow from "@/components/menuItemRow";
+import ModalConfirmation from "@/components/ModalConfirmation";
 import Skeleton from "@/components/skeleton";
 import SkeletonContent from "@/components/skeletonContent";
 import Text from '@/components/Text';
-import { ColorsStatus } from "@/constants/ColorsStatus";
 import { ConstEnv } from "@/constants/ConstEnv";
 import { regexOnlySpacesOrEnter } from "@/constants/OnlySpaceOrEnter";
 import Styles from "@/constants/Styles";
@@ -81,6 +80,7 @@ export default function DetailDiscussionGeneral() {
       comment: ''
    })
    const [viewEdit, setViewEdit] = useState(false)
+   const [showDeleteModal, setShowDeleteModal] = useState(false)
 
    useEffect(() => {
       const onValueChange = reference.on('value', snapshot => {
@@ -247,7 +247,7 @@ export default function DetailDiscussionGeneral() {
                   <RefreshControl
                      refreshing={refreshing}
                      onRefresh={() => handleRefresh()}
-                     tintColor={colors.primary}
+                     tintColor={colors.icon}
                   />
                }
             >
@@ -261,8 +261,8 @@ export default function DetailDiscussionGeneral() {
                            descEllipsize={false}
                            borderType="bottom"
                            icon={
-                              <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                                 <MaterialIcons name="chat" size={25} color={'#384288'} />
+                              <View style={[Styles.iconContent]}>
+                                 <MaterialIcons name="chat" size={25} color={'black'} />
                               </View>
                            }
                            title={data?.title}
@@ -276,13 +276,13 @@ export default function DetailDiscussionGeneral() {
                            desc={data?.desc}
                            leftBottomInfo={
                               <View style={[Styles.rowItemsCenter]}>
-                                 <Ionicons name="chatbox-ellipses-outline" size={18} color="grey" style={Styles.mr05} />
-                                 <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>{dataKomentar.length} Komentar</Text>
+                                 <Ionicons name="chatbox-ellipses-outline" size={18} color={colors.dimmed} style={Styles.mr05} />
+                                 <Text style={[Styles.textInformation, { color: colors.dimmed }, Styles.mb05]}>{dataKomentar.length} Komentar</Text>
                               </View>
                            }
                            rightBottomInfo={
                               <View style={[Styles.rowItemsCenter]}>
-                                 <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>{data?.createdAt}</Text>
+                                 <Text style={[Styles.textInformation, { color: colors.dimmed }, Styles.mb05]}>{data?.createdAt}</Text>
                               </View>
                            }
                         />
@@ -310,6 +310,7 @@ export default function DetailDiscussionGeneral() {
                                     desc={item.comment}
                                     rightBottomInfo={item.isEdited ? "Edited" : ""}
                                     descEllipsize={detailMore.includes(item.id) ? false : true}
+                                    bgColor="transparent"
                                     onPress={() => {
                                        setDetailMore((prev: any) => {
                                           if (prev.includes(item.id)) {
@@ -336,7 +337,7 @@ export default function DetailDiscussionGeneral() {
                <View style={[
                   Styles.contentItemCenter,
                   Styles.w100,
-                  { backgroundColor: colors.card },
+                  { backgroundColor: colors.background },
                   viewEdit && Styles.borderTop
                ]}>
                   {
@@ -356,7 +357,6 @@ export default function DetailDiscussionGeneral() {
                               type="default"
                               round
                               placeholder="Kirim Komentar"
-                              bg="white"
                               onChange={(val: string) => setSelectKomentar({ ...selectKomentar, comment: val })}
                               value={selectKomentar.comment}
                               multiline
@@ -370,7 +370,7 @@ export default function DetailDiscussionGeneral() {
                                        Platform.OS == 'android' && Styles.mb12,
                                     ]}
                                  >
-                                    <MaterialIcons name="send" size={25} style={(loadingSendKomentar || selectKomentar.comment == '' || regexOnlySpacesOrEnter.test(selectKomentar.comment) || data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin"))) ? Styles.cGray : Styles.cDefault} />
+                                    <MaterialIcons name="send" size={25} style={(loadingSendKomentar || selectKomentar.comment == '' || regexOnlySpacesOrEnter.test(selectKomentar.comment) || data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin"))) ? { color: colors.dimmed } : { color: colors.tint }} />
                                  </Pressable>
                               }
                            />
@@ -383,7 +383,6 @@ export default function DetailDiscussionGeneral() {
                               type="default"
                               round
                               placeholder="Kirim Komentar"
-                              bg="white"
                               onChange={setKomentar}
                               value={komentar}
                               multiline
@@ -397,13 +396,13 @@ export default function DetailDiscussionGeneral() {
                                        Platform.OS == 'android' && Styles.mb12,
                                     ]}
                                  >
-                                    <MaterialIcons name="send" size={25} style={(loadingSendKomentar || komentar == '' || regexOnlySpacesOrEnter.test(komentar) || data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin"))) ? Styles.cGray : Styles.cDefault} />
+                                    <MaterialIcons name="send" size={25} style={(loadingSendKomentar || komentar == '' || regexOnlySpacesOrEnter.test(komentar) || data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin"))) ? { color: colors.dimmed } : { color: colors.tint }} />
                                  </Pressable>
                               }
                            />
                            :
                            <View style={[Styles.pv20, { alignItems: 'center' }]}>
-                              <Text style={[Styles.textInformation, Styles.cGray]}>
+                              <Text style={[Styles.textInformation, { color: colors.dimmed }]}>
                                  {
                                     data?.status == 2 ? "Diskusi telah ditutup" : data?.isActive == false ? "Diskusi telah diarsipkan" : "Hanya anggota diskusi yang dapat memberikan komentar"
                                  }
@@ -423,20 +422,30 @@ export default function DetailDiscussionGeneral() {
                   onPress={() => { handleViewEditKomentar() }}
                />
                <MenuItemRow
-                  icon={<MaterialIcons name="delete" color={colors.text} size={25} />}
+                  icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
                   title="Hapus"
                   onPress={() => {
-                     AlertKonfirmasi({
-                        title: 'Konfirmasi',
-                        desc: 'Apakah anda yakin ingin menghapus komentar?',
-                        onPress: () => {
-                           handleDeleteKomentar()
-                        }
-                     })
+                     setVisible(false)
+                     setTimeout(() => {
+                        setShowDeleteModal(true)
+                     }, 600)
                   }}
                />
             </View>
          </DrawerBottom>
+
+         <ModalConfirmation
+            visible={showDeleteModal}
+            title="Konfirmasi"
+            message="Apakah anda yakin ingin menghapus komentar?"
+            onConfirm={() => {
+               setShowDeleteModal(false)
+               handleDeleteKomentar()
+            }}
+            onCancel={() => setShowDeleteModal(false)}
+            confirmText="Hapus"
+            cancelText="Batal"
+         />
       </>
    )
 }

app/(application)/discussion/add-member/[id].tsx

@@ -94,7 +94,7 @@ export default function AddMemberDiscussionDetail() {
 
 
    return (
-      <SafeAreaView>
+      <>
          <Stack.Screen
             options={{
                // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -127,7 +127,7 @@ export default function AddMemberDiscussionDetail() {
                )
             }}
          />
-         <View style={[Styles.p15, { backgroundColor: colors.background }]}>
+         <View style={[Styles.p15, {flex: 1,  backgroundColor: colors.background }]}>
             <InputSearch onChange={setSearch} value={search} />
 
             {
@@ -149,7 +149,7 @@ export default function AddMemberDiscussionDetail() {
                   </View>
 
                   :
-                  <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
+                  <Text style={[Styles.textDefault, Styles.pv05, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada member yang dipilih</Text>
             }
             <ScrollView
                showsVerticalScrollIndicator={false}
@@ -162,7 +162,7 @@ export default function AddMemberDiscussionDetail() {
                         return (
                            <Pressable
                               key={index}
-                              style={[Styles.itemSelectModal]}
+                              style={[Styles.itemSelectModal, { borderColor: colors.icon + '20' }]}
                               onPress={() => {
                                  !found && onChoose(item.id, item.name, item.img)
                               }}
@@ -172,7 +172,7 @@ export default function AddMemberDiscussionDetail() {
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]}>{item.name}</Text>
                                     {
-                                       found && <Text style={[Styles.textInformation, Styles.cGray]}>sudah menjadi anggota</Text>
+                                       found && <Text style={[Styles.textInformation, {color: colors.dimmed}]}>sudah menjadi anggota</Text>
                                     }
                                  </View>
                               </View>
@@ -188,6 +188,6 @@ export default function AddMemberDiscussionDetail() {
                }
             </ScrollView>
          </View>
-      </SafeAreaView>
+      </>
    )
 }

app/(application)/discussion/create.tsx

@@ -253,15 +253,16 @@ export default function CreateDiscussionGeneral() {
                {
                   fileForm.length > 0
                   &&
-                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10, { borderColor: colors.icon }]}>
+                  <View style={[Styles.borderAll, Styles.round05, Styles.p10, Styles.mb10, { borderColor: colors.icon + '20' }]}>
                      <Text style={[Styles.textDefaultSemiBold]}>File</Text>
                      {
                         fileForm.map((item, index) => (
                            <BorderBottomItem
                               key={index}
-                              borderType={fileForm.length > 1 ? "bottom" : "none"}
+                              borderType={fileForm.length - 1 == index ? "none" : "bottom"}
                               icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
                               title={item.name}
+                              bgColor="transparent"
                               titleWeight="normal"
                               onPress={() => { setIndexDelFile(index); setModalFile(true) }}
                            />
@@ -296,17 +297,18 @@ export default function CreateDiscussionGeneral() {
                         <Text>Total {entitiesMember.length} Anggota</Text>
                      </View>
 
-                     <View style={[Styles.borderAll, Styles.round10, Styles.p10, { borderColor: colors.icon }]}>
+                     <View style={[Styles.borderAll, Styles.round05, Styles.p10, { borderColor: colors.icon + '20' }]}>
                         {
                            entitiesMember.map((item: { img: any; name: any; }, index: any) => {
                               return (
                                  <BorderBottomItem
                                     key={index}
-                                    borderType="bottom"
+                                    borderType={entitiesMember.length - 1 == index ? "none" : "bottom"}
                                     icon={
-                                       <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="sm" />
+                                       <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="xs" />
                                     }
                                     title={item.name}
+                                    bgColor="transparent"
                                  />
                               )
                            })
@@ -332,7 +334,7 @@ export default function CreateDiscussionGeneral() {
          <DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<Ionicons name="trash" color={colors.text} size={25} />}
+                  icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
                   title="Hapus"
                   onPress={() => { deleteFile(indexDelFile) }}
                />

app/(application)/discussion/edit/[id].tsx

@@ -229,8 +229,8 @@ export default function EditDiscussionGeneral() {
                {
                   (fileForm.length > 0 || dataFile.filter((val) => !val.delete).length > 0)
                   &&
-                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10, { borderColor: colors.icon }]}>
-                     <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                  <View style={[Styles.borderAll, Styles.round05, Styles.p10, Styles.mb10, { borderColor: colors.icon + '20' }]}>
+                     <Text style={[Styles.textDefault]}>File</Text>
                      {
                         dataFile.filter((val) => !val.delete).map((item, index) => (
                            <BorderBottomItem
@@ -239,6 +239,7 @@ export default function EditDiscussionGeneral() {
                               icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
                               title={item.name + '.' + item.extension}
                               titleWeight="normal"
+                              bgColor="transparent"
                               onPress={() => { setIndexDelFile({ id: item.id, cat: "oldFile" }); setModalFile(true) }}
                            />
                         ))
@@ -251,6 +252,7 @@ export default function EditDiscussionGeneral() {
                               icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
                               title={item.name}
                               titleWeight="normal"
+                              bgColor="transparent"
                               onPress={() => { setIndexDelFile({ id: index, cat: "newFile" }); setModalFile(true) }}
                            />
                         ))
@@ -263,7 +265,7 @@ export default function EditDiscussionGeneral() {
          <DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<Ionicons name="trash" color={colors.text} size={25} />}
+                  icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
                   title="Hapus"
                   onPress={() => { deleteFile(indexDelFile.id, indexDelFile.cat) }}
                />

app/(application)/discussion/index.tsx

@@ -148,12 +148,13 @@ export default function Discussion() {
                         renderItem={({ item, index }: { item: Props, index: number }) => {
                            return (
                               <BorderBottomItem
+                                 bgColor="transparent"
                                  key={index}
                                  onPress={() => { router.push(`/discussion/${item.id}`) }}
                                  borderType="bottom"
                                  icon={
-                                    <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                                       <MaterialIcons name="chat" size={25} color={'#384288'} />
+                                    <View style={[Styles.iconContent]}>
+                                       <MaterialIcons name="chat" size={25} color={'black'} />
                                     </View>
                                  }
                                  title={item.title}
@@ -164,8 +165,8 @@ export default function Discussion() {
                                  desc={item.desc.replace(/<[^>]*>?/gm, ' ').replace(/\r?\n|\r/g, ' ')}
                                  leftBottomInfo={
                                     <View style={[Styles.rowItemsCenter]}>
-                                       <Ionicons name="chatbox-ellipses-outline" size={18} color="grey" style={Styles.mr05} />
-                                       <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>Diskusikan</Text>
+                                       <Ionicons name="chatbox-ellipses-outline" size={18} color={colors.dimmed} style={Styles.mr05} />
+                                       <Text style={[Styles.textInformation, { color: colors.dimmed }, Styles.mb05]}>Diskusikan</Text>
                                     </View>
                                  }
                                  rightBottomInfo={`${item.total_komentar} Komentar`}
@@ -181,12 +182,12 @@ export default function Discussion() {
                            <RefreshControl
                               refreshing={refreshing}
                               onRefresh={handleRefresh}
-                              tintColor={colors.primary}
+                              tintColor={colors.icon}
                            />
                         }
                      />
                      :
-                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
+                     <Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada data</Text>
             }
          </View>
       </View>

app/(application)/discussion/member/[id].tsx

@@ -1,9 +1,9 @@
-import AlertKonfirmasi from "@/components/alertKonfirmasi";
 import AppHeader from "@/components/AppHeader";
 import BorderBottomItem from "@/components/borderBottomItem";
 import DrawerBottom from "@/components/drawerBottom";
 import ImageUser from "@/components/imageNew";
 import MenuItemRow from "@/components/menuItemRow";
+import ModalConfirmation from "@/components/ModalConfirmation";
 import SkeletonTwoItem from "@/components/skeletonTwoItem";
 import Text from '@/components/Text';
 import { ColorsStatus } from "@/constants/ColorsStatus";
@@ -36,6 +36,8 @@ export default function MemberDiscussionDetail() {
    const update = useSelector((state: any) => state.discussionGeneralDetailUpdate)
    const [loading, setLoading] = useState(true)
    const arrSkeleton = Array.from({ length: 5 }, (_, index) => index)
+   const [showDeleteModal, setShowDeleteModal] = useState(false)
+
 
    async function handleLoad(loading: boolean) {
       try {
@@ -151,20 +153,28 @@ export default function MemberDiscussionDetail() {
                      title="Keluarkan"
                      onPress={() => {
                         setModal(false)
-                        AlertKonfirmasi({
-                           title: 'Konfirmasi',
-                           desc: 'Apakah Anda yakin ingin mengeluarkan anggota?',
-                           onPress: () => {
-                              handleDeleteUser()
-                           }
-                        })
-
+                        setTimeout(() => {
+                           setShowDeleteModal(true)
+                        }, 600)
                      }}
                   />
                }
 
             </View>
          </DrawerBottom>
+
+         <ModalConfirmation
+            visible={showDeleteModal}
+            title="Konfirmasi"
+            message="Apakah anda yakin ingin mengeluarkan anggota?"
+            onConfirm={() => {
+               setShowDeleteModal(false)
+               handleDeleteUser()
+            }}
+            onCancel={() => setShowDeleteModal(false)}
+            confirmText="Hapus"
+            cancelText="Batal"
+         />
       </SafeAreaView>
    )
 }

app/(application)/division/[id]/(fitur-division)/calendar/[detail]/add-member.tsx

@@ -156,7 +156,7 @@ export default function AddMemberCalendarEvent() {
                   </View>
 
                   :
-                  <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
+                  <Text style={[Styles.textDefault, Styles.pv05, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada member yang dipilih</Text>
             }
             <ScrollView
                showsVerticalScrollIndicator={false}
@@ -179,7 +179,7 @@ export default function AddMemberCalendarEvent() {
                                  <View style={[Styles.ml10, { width: '80%' }]}>
                                     <Text numberOfLines={1} ellipsizeMode="tail" style={[Styles.textDefault]}>{item.name}</Text>
                                     {
-                                       found && <Text style={[Styles.textInformation, Styles.cGray]}>sudah menjadi anggota</Text>
+                                       found && <Text style={[Styles.textInformation, { color: colors.dimmed }]}>sudah menjadi anggota</Text>
                                     }
                                  </View>
                               </View>

app/(application)/division/[id]/(fitur-division)/calendar/[detail]/index.tsx

@@ -1,4 +1,4 @@
-import AlertKonfirmasi from "@/components/alertKonfirmasi"
+import ModalConfirmation from "@/components/ModalConfirmation"
 import AppHeader from "@/components/AppHeader"
 import BorderBottomItem from "@/components/borderBottomItem"
 import ButtonBackHeader from "@/components/buttonBackHeader"
@@ -57,6 +57,7 @@ export default function DetailEventCalendar() {
    const dispatch = useDispatch()
    const entityUser = useSelector((state: any) => state.user);
    const [isMemberDivision, setIsMemberDivision] = useState(false);
+   const [showDeleteModal, setShowDeleteModal] = useState(false)
    const [loading, setLoading] = useState(true)
    const [refreshing, setRefreshing] = useState(false)
 
@@ -179,6 +180,7 @@ export default function DetailEventCalendar() {
                <RefreshControl
                   refreshing={refreshing}
                   onRefresh={handleRefresh}
+                  tintColor={colors.icon}
                />
             }
          >
@@ -301,18 +303,26 @@ export default function DetailEventCalendar() {
                   title="Keluarkan"
                   onPress={() => {
                      setModalMember(false)
-                     AlertKonfirmasi({
-                        title: 'Konfirmasi',
-                        desc: 'Apakah Anda yakin ingin mengeluarkan anggota?',
-                        onPress: () => {
-                           handleDeleteUser()
-                        }
-                     })
-
+                     setTimeout(() => {
+                        setShowDeleteModal(true)
+                     }, 600)
                   }}
                />
             </View>
          </DrawerBottom>
+
+         <ModalConfirmation
+            visible={showDeleteModal}
+            title="Konfirmasi"
+            message="Apakah Anda yakin ingin mengeluarkan anggota?"
+            onConfirm={() => {
+               setShowDeleteModal(false)
+               handleDeleteUser()
+            }}
+            onCancel={() => setShowDeleteModal(false)}
+            confirmText="Keluar"
+            cancelText="Batal"
+         />
       </SafeAreaView>
    )
 }

app/(application)/division/[id]/(fitur-division)/calendar/create-member.tsx

@@ -143,7 +143,7 @@ export default function CreateCalendarAddMember() {
                   </View>
 
                   :
-                  <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
+                  <Text style={[Styles.textDefault, Styles.pv05, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada member yang dipilih</Text>
             }
             <ScrollView
                showsVerticalScrollIndicator={false}
@@ -156,7 +156,7 @@ export default function CreateCalendarAddMember() {
                         return (
                            <Pressable
                               key={index}
-                              style={[Styles.itemSelectModal]}
+                              style={[Styles.itemSelectModal, {borderColor: colors.icon + '20'}]}
                               onPress={() => { onChoose(item.idUser, item.name, item.img) }}
                            >
                               <View style={[Styles.rowItemsCenter, Styles.w70]}>

app/(application)/division/[id]/(fitur-division)/calendar/history.tsx

@@ -1,7 +1,6 @@
 import InputSearch from "@/components/inputSearch";
 import Skeleton from "@/components/skeleton";
 import Text from "@/components/Text";
-import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
 import { apiGetCalendarHistory } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
@@ -70,7 +69,7 @@ export default function CalendarHistory() {
          <View>
             <InputSearch onChange={(val) => setSearch(val)} />
          </View>
-         <View style={[{ flex: 2, }]}>
+         <View style={[{ flex: 2 }, Styles.mt10]}>
             {
                loading ?
                   arrSkeleton.map((item, index) => (
@@ -83,7 +82,7 @@ export default function CalendarHistory() {
                      getItem={getItem}
                      renderItem={({ item, index }: { item: Props, index: number }) => {
                         return (
-                           <View key={index} style={[{ flexDirection: 'row' }, Styles.mv05, activeTheme === 'dark' ? { backgroundColor: colors.card } : ColorsStatus.lightGreen, Styles.p10, Styles.round10, { borderBottomWidth: 1, borderColor: colors.background }]}>
+                           <View key={index} style={[{ flexDirection: 'row' }, Styles.mb05, Styles.borderAll, { backgroundColor: colors.card }, Styles.p10, Styles.round05, { borderColor: colors.icon + '20' }]}>
                               <View style={[Styles.mr10, Styles.ph05]}>
                                  <Text style={[Styles.textSubtitle]}>{String(item.dateStart)}</Text>
                                  <Text style={[Styles.textDefault, { textAlign: 'center' }]}>{item.year}</Text>

app/(application)/division/[id]/(fitur-division)/calendar/index.tsx

@@ -155,6 +155,7 @@ export default function CalendarDivision() {
                <RefreshControl
                   refreshing={refreshing}
                   onRefresh={handleRefresh}
+                  tintColor={colors.icon}
                />
             }
             style={[Styles.h100]}
@@ -204,7 +205,7 @@ export default function CalendarDivision() {
                                  />
                               ))
                            ) : (
-                              <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada acara</Text>
+                              <Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada acara</Text>
                            )
                      }
                   </View>

app/(application)/division/[id]/(fitur-division)/discussion/[detail]/edit.tsx

@@ -186,7 +186,7 @@ export default function DiscussionDivisionEdit() {
                {
                   (fileForm.length > 0 || dataFile.filter((val) => !val.delete).length > 0)
                   &&
-                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10, { borderColor: colors.background, backgroundColor: colors.card }]}>
+                  <View style={[Styles.borderAll, Styles.round05, Styles.p10, Styles.mb10, { borderColor: colors.background, backgroundColor: colors.card }]}>
                      <Text style={[Styles.textDefaultSemiBold]}>File</Text>
                      {
                         dataFile.filter((val) => !val.delete).map((item, index) => (
@@ -221,7 +221,7 @@ export default function DiscussionDivisionEdit() {
          <DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<Ionicons name="trash" color={colors.text} size={25} />}
+                  icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
                   title="Hapus"
                   onPress={() => { deleteFile(indexDelFile.id, indexDelFile.cat) }}
                />

app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx

@@ -1,4 +1,3 @@
-import AlertKonfirmasi from "@/components/alertKonfirmasi";
 import AppHeader from "@/components/AppHeader";
 import BorderBottomItem from "@/components/borderBottomItem";
 import BorderBottomItem2 from "@/components/borderBottomItem2";
@@ -8,6 +7,7 @@ import ImageUser from "@/components/imageNew";
 import { InputForm } from "@/components/inputForm";
 import LabelStatus from "@/components/labelStatus";
 import MenuItemRow from "@/components/menuItemRow";
+import ModalConfirmation from "@/components/ModalConfirmation";
 import Skeleton from "@/components/skeleton";
 import SkeletonContent from "@/components/skeletonContent";
 import Text from "@/components/Text";
@@ -23,9 +23,9 @@ import {
 } from "@/lib/api";
 import { getDB } from "@/lib/firebaseDatabase";
 import { useAuthSession } from "@/providers/AuthProvider";
+import { useTheme } from "@/providers/ThemeProvider";
 import { Feather, Ionicons, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons";
 import { ref } from "@react-native-firebase/database";
-import { useTheme } from "@/providers/ThemeProvider";
 import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
@@ -92,6 +92,7 @@ export default function DiscussionDetail() {
       comment: ''
    })
    const [viewEdit, setViewEdit] = useState(false)
+   const [showDeleteModal, setShowDeleteModal] = useState(false)
 
 
 
@@ -297,7 +298,7 @@ export default function DiscussionDetail() {
                      showBack={true}
                      onPressLeft={() => router.back()}
                      right={
-                        (entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision || isCreator ?
+                        ((entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision || isCreator) ?
                            <HeaderRightDiscussionDetail
                               id={detail}
                               status={data?.status}
@@ -314,6 +315,7 @@ export default function DiscussionDetail() {
                   <RefreshControl
                      refreshing={refreshing}
                      onRefresh={handleRefresh}
+                     tintColor={colors.icon}
                   />
                }
             >
@@ -354,7 +356,7 @@ export default function DiscussionDetail() {
                                     color="grey"
                                     style={Styles.mr05}
                                  />
-                                 <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]} >
+                                 <Text style={[Styles.textInformation, { color: colors.dimmed }, Styles.mb05]} >
                                     {dataComment.length} Komentar
                                  </Text>
                               </View>
@@ -385,6 +387,7 @@ export default function DiscussionDetail() {
                                  desc={item.comment}
                                  rightBottomInfo={item.isEdited ? "Edited" : ""}
                                  descEllipsize={detailMore.includes(item.id) ? false : true}
+                                 bgColor="transparent"
                                  onPress={() => {
                                     setDetailMore((prev: any) => {
                                        if (prev.includes(item.id)) {
@@ -519,7 +522,7 @@ export default function DiscussionDetail() {
                            />
                            :
                            <View style={[Styles.pv20, { alignItems: 'center' }]}>
-                              <Text style={[Styles.textInformation, Styles.cGray]}>
+                              <Text style={[Styles.textInformation, { color: colors.dimmed }]}>
                                  {
                                     data?.status == 2 ? "Diskusi telah ditutup" : data?.isActive == false ? "Diskusi telah diarsipkan" : "Hanya anggota divisi yang dapat memberikan komentar"
                                  }
@@ -538,20 +541,30 @@ export default function DiscussionDetail() {
                   onPress={() => { handleViewEditKomentar() }}
                />
                <MenuItemRow
-                  icon={<MaterialIcons name="delete" color={colors.text} size={25} />}
+                  icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
                   title="Hapus"
                   onPress={() => {
-                     AlertKonfirmasi({
-                        title: 'Konfirmasi',
-                        desc: 'Apakah anda yakin ingin menghapus komentar?',
-                        onPress: () => {
-                           handleDeleteKomentar()
-                        }
-                     })
+                     setVisible(false)
+                     setTimeout(() => {
+                        setShowDeleteModal(true)
+                     }, 600)
                   }}
                />
             </View>
          </DrawerBottom>
+
+         <ModalConfirmation
+            visible={showDeleteModal}
+            title="Konfirmasi"
+            message="Apakah anda yakin ingin menghapus komentar?"
+            onConfirm={() => {
+               setShowDeleteModal(false)
+               handleDeleteKomentar()
+            }}
+            onCancel={() => setShowDeleteModal(false)}
+            confirmText="Hapus"
+            cancelText="Batal"
+         />
       </>
    );
 }

app/(application)/division/[id]/(fitur-division)/discussion/create.tsx

@@ -135,7 +135,7 @@ export default function CreateDiscussionDivision() {
                {
                   fileForm.length > 0
                   &&
-                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10, { borderColor: colors.background, backgroundColor: colors.card }]}>
+                  <View style={[Styles.borderAll, Styles.round05, Styles.p10, Styles.mb10, { borderColor: colors.background, backgroundColor: colors.card }]}>
                      <Text style={[Styles.textDefaultSemiBold]}>File</Text>
                      {
                         fileForm.map((item, index) => (
@@ -157,7 +157,7 @@ export default function CreateDiscussionDivision() {
          <DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<Ionicons name="trash" color={colors.text} size={25} />}
+                  icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
                   title="Hapus"
                   onPress={() => { deleteFile(indexDelFile) }}
                />

app/(application)/division/[id]/(fitur-division)/discussion/index.tsx

@@ -187,11 +187,12 @@ export default function DiscussionDivision() {
                                  desc={item.desc}
                                  leftBottomInfo={
                                     <View style={[Styles.rowItemsCenter]}>
-                                       <Ionicons name="chatbox-ellipses-outline" size={18} color="grey" style={Styles.mr05} />
-                                       <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>Diskusikan</Text>
+                                       <Ionicons name="chatbox-ellipses-outline" size={18} color={colors.dimmed} style={Styles.mr05} />
+                                       <Text style={[Styles.textInformation, { color: colors.dimmed }, Styles.mb05]}>Diskusikan</Text>
                                     </View>
                                  }
                                  rightBottomInfo={item.total_komentar + ' Komentar'}
+                                 bgColor="transparent"
                               />
                            )
                         }}
@@ -203,11 +204,12 @@ export default function DiscussionDivision() {
                            <RefreshControl
                               refreshing={refreshing}
                               onRefresh={handleRefresh}
+                              tintColor={colors.icon}
                            />
                         }
                      />
                      :
-                     (<Text style={[Styles.textDefault, Styles.cGray, Styles.mv10, { textAlign: "center" }]}>Tidak ada diskusi</Text>)
+                     (<Text style={[Styles.textDefault, Styles.mv10, { textAlign: "center", color:colors.dimmed }]}>Tidak ada diskusi</Text>)
             }
          </View>
       </View>

app/(application)/division/[id]/(fitur-division)/document/index.tsx

@@ -1,4 +1,4 @@
-import AlertKonfirmasi from "@/components/alertKonfirmasi";
+import ModalConfirmation from "@/components/ModalConfirmation";
 import AppHeader from "@/components/AppHeader";
 import { ButtonHeader } from "@/components/buttonHeader";
 import HeaderRightDocument from "@/components/document/headerDocument";
@@ -12,7 +12,6 @@ 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 { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import {
@@ -90,6 +89,7 @@ export default function DocumentDivision() {
    const [loadingOpen, setLoadingOpen] = useState(false)
    const [isMemberDivision, setIsMemberDivision] = useState(false)
    const entityUser = useSelector((state: any) => state.user)
+   const [showDeleteModal, setShowDeleteModal] = useState(false)
    const [bodyRename, setBodyRename] = useState({
       id: "",
       name: "",
@@ -382,7 +382,7 @@ export default function DocumentDivision() {
                      showBack={(selectedFiles.length > 0 || dariSelectAll) ? false : true}
                      left={
                         <ButtonHeader
-                           item={<MaterialIcons name="close" size={20} color="white" />}
+                           item={<MaterialIcons name="close" size={25} color="white" />}
                            onPress={() => {
                               handleBatal();
                            }}
@@ -395,7 +395,7 @@ export default function DocumentDivision() {
                         selectedFiles.length > 0 || dariSelectAll ? (
                            <ButtonHeader
                               item={
-                                 <MaterialIcons name="checklist-rtl" size={20} color="white" />
+                                 <MaterialIcons name="checklist-rtl" size={25} color="white" />
                               }
                               onPress={() => {
                                  handleSelectAll();
@@ -415,6 +415,7 @@ export default function DocumentDivision() {
                <RefreshControl
                   refreshing={refreshing}
                   onRefresh={handleRefresh}
+                  tintColor={colors.icon}
                />
             }>
             <View style={[Styles.p15, Styles.mb100]}>
@@ -480,14 +481,7 @@ export default function DocumentDivision() {
                               );
                            })
                         ) : (
-                           <Text
-                              style={[
-                                 Styles.textDefault,
-                                 Styles.cGray,
-                                 Styles.mt15,
-                                 { textAlign: "center" },
-                              ]}
-                           >
+                           <Text style={[Styles.textDefault, Styles.mt15, { textAlign: "center", color: colors.dimmed }]} >
                               Tidak ada dokumen
                            </Text>
                         )}
@@ -495,7 +489,7 @@ export default function DocumentDivision() {
             </View>
          </ScrollView>
          {(selectedFiles.length > 0 || dariSelectAll) && (
-            <View style={[ColorsStatus.primary, Styles.bottomMenuSelectDocument]}>
+            <View style={[Styles.bottomMenuSelectDocument, { backgroundColor: colors.header }]}>
                <View style={[Styles.rowItemsCenter, { justifyContent: "center" }]}>
                   <MenuItemRow
                      icon={
@@ -507,13 +501,7 @@ export default function DocumentDivision() {
                      }
                      title="Hapus"
                      onPress={() => {
-                        AlertKonfirmasi({
-                           title: "Konfirmasi",
-                           desc: "Apakah anda yakin ingin menghapus dokumen?",
-                           onPress: () => {
-                              handleDelete();
-                           },
-                        });
+                        setShowDeleteModal(true)
                      }}
                      column="many"
                      color="white"
@@ -620,6 +608,19 @@ export default function DocumentDivision() {
             value={id}
             item={selectedFiles[0]?.id}
          />
+
+         <ModalConfirmation
+            visible={showDeleteModal}
+            title="Konfirmasi"
+            message="Apakah anda yakin ingin menghapus dokumen?"
+            onConfirm={() => {
+               setShowDeleteModal(false)
+               handleDelete()
+            }}
+            onCancel={() => setShowDeleteModal(false)}
+            confirmText="Hapus"
+            cancelText="Batal"
+         />
       </SafeAreaView>
    );
 }

app/(application)/division/[id]/(fitur-division)/task/[detail]/add-file.tsx

@@ -199,7 +199,7 @@ export default function TaskDivisionAddFile() {
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<Ionicons name="trash" color={colors.text} size={25} />}
+                  icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
                   title="Hapus"
                   onPress={() => { deleteFile(indexDelFile) }}
                />

app/(application)/division/[id]/(fitur-division)/task/[detail]/add-member.tsx

@@ -151,7 +151,7 @@ export default function AddMemberTask() {
                   </View>
 
                   :
-                  <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
+                  <Text style={[Styles.textDefault, Styles.pv05, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada member yang dipilih</Text>
             }
             <ScrollView
                showsVerticalScrollIndicator={false}
@@ -164,17 +164,17 @@ export default function AddMemberTask() {
                         return (
                            <Pressable
                               key={index}
-                              style={[Styles.itemSelectModal]}
+                              style={[Styles.itemSelectModal, { borderColor: colors.icon + '20' }]}
                               onPress={() => {
                                  !found && onChoose(item.idUser, item.name, item.img)
                               }}
                            >
-                              <View style={[Styles.rowItemsCenter, Styles.w80]}>
+                              <View style={[Styles.rowItemsCenter, Styles.w80,]}>
                                  <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]} numberOfLines={1}>{item.name}</Text>
                                     {
-                                       found && <Text style={[Styles.textInformation, Styles.cGray]}>sudah menjadi anggota</Text>
+                                       found && <Text style={[Styles.textInformation, { color: colors.dimmed }]}>sudah menjadi anggota</Text>
                                     }
                                  </View>
                               </View>

app/(application)/division/[id]/(fitur-division)/task/[detail]/add-task.tsx

@@ -1,5 +1,6 @@
 import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
+import ButtonSelect from "@/components/buttonSelect";
 import { InputForm } from "@/components/inputForm";
 import ModalAddDetailTugasTask from "@/components/task/modalAddDetailTugasTask";
 import Text from "@/components/Text";
@@ -17,7 +18,8 @@ import 'intl/locale-data/jsonp/id';
 import moment from "moment";
 import { useEffect, useState } from "react";
 import {
-   KeyboardAvoidingView, Platform, Pressable, SafeAreaView,
+   KeyboardAvoidingView, Platform,
+   SafeAreaView,
    ScrollView,
    View
 } from "react-native";
@@ -209,31 +211,32 @@ export default function TaskDivisionAddTask() {
                      <View style={[Styles.rowSpaceBetween]}>
                         <View style={[{ width: "48%" }]}>
                            <Text style={[Styles.mb05]}>
-                              Tanggal Mulai <Text style={Styles.cError}>*</Text>
+                              Tanggal Mulai <Text style={{ color: colors.error }}>*</Text>
                            </Text>
-                           <View style={[Styles.wrapPaper, Styles.p10, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                           <View style={[Styles.wrapPaper, Styles.noShadow, Styles.borderAll, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
                               <Text style={{ textAlign: "center" }}>{from}</Text>
                            </View>
                         </View>
                         <View style={[{ width: "48%" }]}>
                            <Text style={[Styles.mb05]}>
-                              Tanggal Berakhir <Text style={Styles.cError}>*</Text>
+                              Tanggal Berakhir <Text style={{ color: colors.error }}>*</Text>
                            </Text>
-                           <View style={[Styles.wrapPaper, Styles.p10, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                           <View style={[Styles.wrapPaper, Styles.noShadow, Styles.borderAll, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
                               <Text style={{ textAlign: "center" }}>{to}</Text>
                            </View>
                         </View>
                      </View>
                      {
-                        (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
+                        (error.endDate || error.startDate) && <Text style={[Styles.textInformation, { color: colors.error }, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
                      }
-                     <Pressable
+                     {/* <Pressable
                         style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
                         disabled={dsbButton}
                         onPress={() => { setModalDetail(true) }}
                      >
                         <Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
-                     </Pressable>
+                     </Pressable> */}
+                     <ButtonSelect value="Detail" onPress={() => { setModalDetail(true) }} />
                   </View>
                   <InputForm
                      label="Judul Tugas"

app/(application)/division/[id]/(fitur-division)/task/[detail]/index.tsx

@@ -127,6 +127,7 @@ export default function DetailTaskDivision() {
                <RefreshControl
                   refreshing={refreshing}
                   onRefresh={handleRefresh}
+                  tintColor={colors.icon}
                />
             }
          >

app/(application)/division/[id]/(fitur-division)/task/create.tsx

@@ -198,7 +198,7 @@ export default function CreateTaskDivision() {
                         <Text>Total {entitiesMember.length} Anggota</Text>
                      </View>
 
-                     <View style={[Styles.borderAll, Styles.round10, Styles.p10, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                     <View style={[Styles.borderAll, Styles.round05, Styles.p10, { backgroundColor: colors.card, borderColor: colors.background }]}>
                         {entitiesMember.map(
                            (item: { img: any; name: any }, index: any) => {
                               return (
@@ -226,7 +226,7 @@ export default function CreateTaskDivision() {
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<Ionicons name="trash" color={colors.text} size={25} />}
+                  icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
                   title="Hapus"
                   onPress={() => { deleteFile(indexDelFile) }}
                />

app/(application)/division/[id]/(fitur-division)/task/create/member.tsx

@@ -121,7 +121,7 @@ export default function AddMemberCreateTask() {
                   </View>
 
                   :
-                  <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
+                  <Text style={[Styles.textDefault, Styles.pv05, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada member yang dipilih</Text>
             }
             <ScrollView
                showsVerticalScrollIndicator={false}
@@ -133,7 +133,7 @@ export default function AddMemberCreateTask() {
                         return (
                            <Pressable
                               key={index}
-                              style={[Styles.itemSelectModal]}
+                              style={[Styles.itemSelectModal, { borderColor: colors.icon + '20' }]}
                               onPress={() => {
                                  onChoose(item.idUser, item.name, item.img)
                               }}

app/(application)/division/[id]/(fitur-division)/task/create/task.tsx

@@ -1,6 +1,6 @@
 import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
-import { useTheme } from "@/providers/ThemeProvider";
+import ButtonSelect from "@/components/buttonSelect";
 import { InputForm } from "@/components/inputForm";
 import ModalAddDetailTugasTask from "@/components/task/modalAddDetailTugasTask";
 import Text from "@/components/Text";
@@ -8,6 +8,7 @@ import Styles from "@/constants/Styles";
 import { formatDateOnly } from "@/lib/fun_formatDateOnly";
 import { getDatesInRange } from "@/lib/fun_getDatesInRange";
 import { setTaskCreate } from "@/lib/taskCreate";
+import { useTheme } from "@/providers/ThemeProvider";
 import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack } from "expo-router";
 import 'intl';
@@ -17,7 +18,6 @@ import { useEffect, useState } from "react";
 import {
    KeyboardAvoidingView,
    Platform,
-   Pressable,
    SafeAreaView,
    ScrollView,
    View
@@ -184,31 +184,32 @@ export default function CreateTaskAddTugas() {
                      <View style={[Styles.rowSpaceBetween]}>
                         <View style={[{ width: "48%" }]}>
                            <Text style={[Styles.mb05]}>
-                              Tanggal Mulai <Text style={Styles.cError}>*</Text>
+                              Tanggal Mulai <Text style={{ color: colors.error }}>*</Text>
                            </Text>
-                           <View style={[Styles.wrapPaper, Styles.p10, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                           <View style={[Styles.wrapPaper, Styles.noShadow, Styles.borderAll, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
                               <Text style={{ textAlign: "center" }}>{from}</Text>
                            </View>
                         </View>
                         <View style={[{ width: "48%" }]}>
                            <Text style={[Styles.mb05]}>
-                              Tanggal Berakhir <Text style={Styles.cError}>*</Text>
+                              Tanggal Berakhir <Text style={{ color: colors.error }}>*</Text>
                            </Text>
-                           <View style={[Styles.wrapPaper, Styles.p10, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                           <View style={[Styles.wrapPaper, Styles.noShadow, Styles.borderAll, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
                               <Text style={{ textAlign: "center" }}>{to}</Text>
                            </View>
                         </View>
                      </View>
                      {
-                        (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
+                        (error.endDate || error.startDate) && <Text style={[Styles.textInformation, { color: colors.error }, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
                      }
-                     <Pressable
+                     {/* <Pressable
                         style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
                         disabled={dsbButton}
                         onPress={() => { setModalDetail(true) }}
                      >
                         <Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
-                     </Pressable>
+                     </Pressable> */}
+                     <ButtonSelect value="Detail" onPress={() => { setModalDetail(true) }} />
                   </View>
                   <InputForm
                      label="Judul Tugas"

app/(application)/division/[id]/(fitur-division)/task/index.tsx

@@ -235,6 +235,7 @@ export default function ListTask() {
                                  <RefreshControl
                                     refreshing={refreshing}
                                     onRefresh={handleRefresh}
+                                    tintColor={colors.icon}
                                  />
                               }
                            />
@@ -276,11 +277,11 @@ export default function ListTask() {
                                        <LabelStatus
                                           size="default"
                                           category={
-                                             item.status === 0 ? 'primary' :
+                                             item.status === 0 ? 'secondary' :
                                                 item.status === 1 ? 'warning' :
                                                    item.status === 2 ? 'success' :
                                                       item.status === 3 ? 'error' :
-                                                         'primary'
+                                                         'secondary'
                                           }
                                           text={
                                              item.status === 0 ? 'SEGERA' :
@@ -301,6 +302,7 @@ export default function ListTask() {
                                  <RefreshControl
                                     refreshing={refreshing}
                                     onRefresh={handleRefresh}
+                                    tintColor={colors.icon}
                                  />
                               }
                            />
@@ -340,7 +342,7 @@ export default function ListTask() {
                         </View>
                      )
                   ) : (
-                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: "center" },]} >
+                     <Text style={[Styles.textDefault, { textAlign: "center", color: colors.dimmed }]} >
                         Tidak ada data
                      </Text>
                   )

app/(application)/division/[id]/(fitur-division)/task/update/[detail].tsx

@@ -1,15 +1,16 @@
 import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
+import ButtonSelect from "@/components/buttonSelect";
 import { InputForm } from "@/components/inputForm";
 import ModalAddDetailTugasTask from "@/components/task/modalAddDetailTugasTask";
 import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
-import { useTheme } from "@/providers/ThemeProvider";
 import { apiEditTaskTugas, apiGetTaskTugas } from "@/lib/api";
 import { formatDateOnly } from "@/lib/fun_formatDateOnly";
 import { getDatesInRange } from "@/lib/fun_getDatesInRange";
 import { setUpdateTask } from "@/lib/taskUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
+import { useTheme } from "@/providers/ThemeProvider";
 import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import 'intl';
@@ -19,7 +20,6 @@ import { useEffect, useState } from "react";
 import {
    KeyboardAvoidingView,
    Platform,
-   Pressable,
    SafeAreaView,
    ScrollView,
    View
@@ -261,33 +261,34 @@ export default function UpdateProjectTaskDivision() {
                      <View style={[Styles.rowSpaceBetween]}>
                         <View style={[{ width: "48%" }]}>
                            <Text style={[Styles.mb05]}>
-                              Tanggal Mulai <Text style={Styles.cError}>*</Text>
+                              Tanggal Mulai <Text style={{ color: colors.error }}>*</Text>
                            </Text>
-                           <View style={[Styles.wrapPaper, Styles.p10, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                           <View style={[Styles.wrapPaper, Styles.noShadow, Styles.borderAll, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
                               <Text style={{ textAlign: "center" }}>{from}</Text>
                            </View>
                         </View>
                         <View style={[{ width: "48%" }]}>
                            <Text style={[Styles.mb05]}>
-                              Tanggal Berakhir <Text style={Styles.cError}>*</Text>
+                              Tanggal Berakhir <Text style={{ color: colors.error }}>*</Text>
                            </Text>
-                           <View style={[Styles.wrapPaper, Styles.p10, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                           <View style={[Styles.wrapPaper, Styles.noShadow, Styles.borderAll, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
                               <Text style={{ textAlign: "center" }}>{to}</Text>
                            </View>
                         </View>
                      </View>
                      {(error.endDate || error.startDate) && (
-                        <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]} >
+                        <Text style={[Styles.textInformation, { color: colors.error }, Styles.mt05]} >
                            Tanggal tidak boleh kosong
                         </Text>
                      )}
-                     <Pressable
+                     {/* <Pressable
                         style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
                         disabled={dsbButton}
                         onPress={() => { setModalDetail(true) }}
                      >
                         <Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
-                     </Pressable>
+                     </Pressable> */}
+                     <ButtonSelect value="Detail" onPress={() => { setModalDetail(true) }} />
                   </View>
                   <InputForm
                      label="Judul Tugas"

app/(application)/division/[id]/add-member.tsx

@@ -154,7 +154,7 @@ export default function AddMemberDivision() {
                   </View>
 
                   :
-                  <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
+                  <Text style={[Styles.textDefault, Styles.pv05, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada member yang dipilih</Text>
             }
             <ScrollView
                showsVerticalScrollIndicator={false}
@@ -177,7 +177,7 @@ export default function AddMemberDivision() {
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode="tail">{item.name}</Text>
                                     {
-                                       found && <Text style={[Styles.textInformation, Styles.cGray]}>sudah menjadi anggota</Text>
+                                       found && <Text style={[Styles.textInformation, { color: colors.dimmed }]}>sudah menjadi anggota</Text>
                                     }
                                  </View>
                               </View>

app/(application)/division/[id]/index.tsx

@@ -78,6 +78,7 @@ export default function DetailDivisionFitur() {
                <RefreshControl
                   refreshing={refreshing}
                   onRefresh={handleRefresh}
+                  tintColor={colors.icon}
                />
             }
             showsVerticalScrollIndicator={false}

app/(application)/division/[id]/info.tsx

@@ -1,4 +1,4 @@
-import AlertKonfirmasi from "@/components/alertKonfirmasi"
+import ModalConfirmation from "@/components/ModalConfirmation"
 import AppHeader from "@/components/AppHeader"
 import BorderBottomItem from "@/components/borderBottomItem"
 import HeaderRightDivisionInfo from "@/components/division/headerDivisionInfo"
@@ -13,8 +13,8 @@ import { ConstEnv } from "@/constants/ConstEnv"
 import Styles from "@/constants/Styles"
 import { apiDeleteMemberDivision, apiGetDivisionOneDetail, apiGetDivisionOneFeature, apiUpdateStatusAdminDivision } from "@/lib/api"
 import { useAuthSession } from "@/providers/AuthProvider"
-import { Feather, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons"
 import { useTheme } from "@/providers/ThemeProvider"
+import { Feather, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons"
 import { router, Stack, useLocalSearchParams } from "expo-router"
 import { useEffect, useState } from "react"
 import { Pressable, RefreshControl, SafeAreaView, ScrollView, View } from "react-native"
@@ -59,14 +59,13 @@ export default function InformationDivision() {
       name: '',
       isAdmin: false
    })
+   const [showDeleteModal, setShowDeleteModal] = useState(false)
 
    function handleMemberOut() {
       setModal(false)
-      AlertKonfirmasi({
-         title: 'Konfirmasi',
-         desc: 'Apakah anda yakin ingin mengeluarkan anggota?',
-         onPress: () => { memberOut() }
-      })
+      setTimeout(() => {
+         setShowDeleteModal(true)
+      }, 600)
    }
 
    async function memberOut() {
@@ -187,6 +186,7 @@ export default function InformationDivision() {
                <RefreshControl
                   refreshing={refreshing}
                   onRefresh={handleRefresh}
+                  tintColor={colors.icon}
                />
             }
             style={[Styles.h100, { backgroundColor: colors.background }]}
@@ -199,7 +199,7 @@ export default function InformationDivision() {
                }
                <View style={[Styles.mb15]}>
                   <Text style={[Styles.textDefaultSemiBold, Styles.mb05]}>Deskripsi Divisi</Text>
-                  <View style={[Styles.wrapPaper, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                  <View style={[Styles.wrapPaper, Styles.noShadow, { backgroundColor: colors.card, borderWidth: 1, borderColor: colors.icon + '20' }]}>
                      {loading ?
                         arrSkeleton.map((item, index) => {
                            return (
@@ -213,7 +213,7 @@ export default function InformationDivision() {
                </View>
                <View style={[Styles.mb15]}>
                   <Text style={[Styles.textDefault, Styles.mv05]}>{dataMember.length} Anggota</Text>
-                  <View style={[Styles.wrapPaper, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                  <View style={[Styles.wrapPaper, Styles.noShadow, { backgroundColor: colors.card, borderWidth: 1, borderColor: colors.icon + '20' }]}>
                      {
                         ((entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision) &&
                         dataDetail?.isActive && (
@@ -221,8 +221,8 @@ export default function InformationDivision() {
                               onPress={() => { router.push(`/division/${id}/add-member`) }}
                               borderType="none"
                               icon={
-                                 <View style={[Styles.iconContent, ColorsStatus.gray]}>
-                                    <Feather name="user-plus" size={25} color={colors.primary} />
+                                 <View style={[Styles.iconContent]}>
+                                    <Feather name="user-plus" size={25} color={'black'} />
                                  </View>
                               }
                               title="Tambah Anggota"
@@ -262,8 +262,8 @@ export default function InformationDivision() {
             <View>
                <Pressable style={[Styles.wrapItemBorderBottom]} onPress={() => { handleMemberAdmin() }}>
                   <View style={[Styles.rowItemsCenter]}>
-                     <View style={[Styles.iconContent, ColorsStatus.info]}>
-                        <MaterialIcons name="verified-user" size={25} color={colors.primary} />
+                     <View style={[Styles.iconContent]}>
+                        <MaterialIcons name="verified-user" size={25} color={'black'} />
                      </View>
                      <View style={[Styles.rowSpaceBetween, { width: '88%' }]}>
                         <View style={[Styles.ml10]}>
@@ -287,6 +287,19 @@ export default function InformationDivision() {
                </Pressable>
             </View>
          </DrawerBottom>
+
+         <ModalConfirmation
+            visible={showDeleteModal}
+            title="Konfirmasi"
+            message="Apakah anda yakin ingin mengeluarkan anggota?"
+            onConfirm={() => {
+               setShowDeleteModal(false)
+               memberOut()
+            }}
+            onCancel={() => setShowDeleteModal(false)}
+            confirmText="Keluar"
+            cancelText="Batal"
+         />
       </SafeAreaView>
    )
 }

app/(application)/division/create.tsx

@@ -1,4 +1,4 @@
-import AlertKonfirmasi from "@/components/alertKonfirmasi";
+import ModalConfirmation from "@/components/ModalConfirmation";
 import AppHeader from "@/components/AppHeader";
 import ButtonNextHeader from "@/components/buttonNextHeader";
 import { InputForm } from "@/components/inputForm";
@@ -25,6 +25,7 @@ export default function CreateDivision() {
    const entityUser = useSelector((state: any) => state.user)
    const userLogin = useSelector((state: any) => state.entities)
    const [loadingBtn, setLoadingBtn] = useState(false)
+   const [showWarningModal, setShowWarningModal] = useState(false)
    const [error, setError] = useState({
       idGroup: false,
       name: false,
@@ -69,12 +70,7 @@ export default function CreateDivision() {
          const response = await apiCheckDivisionName({ data: { ...dataForm }, user: hasil })
          if (response.success) {
             if (!response.available) {
-               AlertKonfirmasi({
-                  title: 'Peringatan',
-                  category: 'warning',
-                  desc: 'Nama divisi sudah ada. Tidak dapat membuat divisi dengan nama yang sama',
-                  onPress: () => { }
-               })
+               setShowWarningModal(true)
             } else {
                handleSetData()
             }
@@ -181,6 +177,15 @@ export default function CreateDivision() {
             open={isSelect}
             valChoose={chooseGroup.val}
          />
+
+         <ModalConfirmation
+            visible={showWarningModal}
+            title="Peringatan"
+            message="Nama divisi sudah ada. Tidak dapat membuat divisi dengan nama yang sama"
+            onConfirm={() => setShowWarningModal(false)}
+            onCancel={() => setShowWarningModal(false)}
+            confirmText="Oke"
+         />
       </SafeAreaView>
    );
 }

app/(application)/division/create/add-admin-division.tsx

@@ -125,7 +125,7 @@ export default function CreateDivisionAddAdmin() {
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode="tail">{item.name}</Text>
                                     {
-                                       found && <Text style={[Styles.textInformation, Styles.cGray]}>sudah menjadi anggota</Text>
+                                       found && <Text style={[Styles.textInformation, { color: colors.dimmed }]}>sudah menjadi anggota</Text>
                                     }
                                  </View>
                               </View>

app/(application)/division/create/add-member.tsx

@@ -108,7 +108,7 @@ export default function CreateDivisionAddMember() {
                   </View>
 
                   :
-                  <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
+                  <Text style={[Styles.textDefault, Styles.pv05, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada member yang dipilih</Text>
             }
             <ScrollView
                showsVerticalScrollIndicator={false}
@@ -131,7 +131,7 @@ export default function CreateDivisionAddMember() {
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode="tail">{item.name}</Text>
                                     {
-                                       found && <Text style={[Styles.textInformation, Styles.cGray]}>sudah menjadi anggota</Text>
+                                       found && <Text style={[Styles.textInformation, { color: colors.dimmed }]}>sudah menjadi anggota</Text>
                                     }
                                  </View>
                               </View>

app/(application)/division/index.tsx

@@ -7,7 +7,6 @@ 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";
 import { useAuthSession } from "@/providers/AuthProvider";
@@ -16,8 +15,7 @@ import {
    AntDesign,
    Feather,
    Ionicons,
-   MaterialCommunityIcons,
-   MaterialIcons,
+   MaterialCommunityIcons
 } from "@expo/vector-icons";
 import { router, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
@@ -220,7 +218,7 @@ export default function ListDivision() {
                   :
                   data.length == 0 ? (
                      <View style={[Styles.mt15]}>
-                        <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
+                        <Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada data</Text>
                      </View>
                   ) : (
                      isList ? (
@@ -236,10 +234,10 @@ export default function ListDivision() {
                                        key={index}
                                        onPress={() => { router.push(`/division/${item.id}`) }}
                                        borderType="bottom"
-                                       bgColor={colors.card}
+                                       bgColor="transparent"
                                        icon={
-                                          <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                                             <MaterialIcons name="group" size={25} color={colors.primary} />
+                                          <View style={[Styles.iconContent]}>
+                                             <Feather name="users" size={25} color={'black'} />
                                           </View>
                                        }
                                        title={item.name}
@@ -255,6 +253,7 @@ export default function ListDivision() {
                                  <RefreshControl
                                     refreshing={refreshing}
                                     onRefresh={handleRefresh}
+                                    tintColor={colors.icon}
                                  />
                               }
                            />
@@ -290,6 +289,7 @@ export default function ListDivision() {
                                  <RefreshControl
                                     refreshing={refreshing}
                                     onRefresh={handleRefresh}
+                                    tintColor={colors.icon}
                                  />
                               }
                            />

app/(application)/edit-profile.tsx

@@ -1,4 +1,4 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
 import ModalSelect from "@/components/modalSelect";
@@ -219,24 +219,40 @@ export default function EditProfile() {
       <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
          <Stack.Screen
             options={{
-               headerLeft: () => (
-                  <ButtonBackHeader
-                     onPress={() => {
-                        router.back();
-                     }}
-                  />
-               ),
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Edit Profile",
                headerTitleAlign: "center",
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     disable={disableBtn || loading ? true : false}
-                     category="update"
-                     onPress={() => {
-                        handleEdit()
-                     }}
+               header: () => (
+                  <AppHeader
+                     title="Edit Profile"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           disable={disableBtn || loading ? true : false}
+                           category="update"
+                           onPress={() => {
+                              handleEdit()
+                           }}
+                        />
+                     }
                   />
-               ),
+               )
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       disable={disableBtn || loading ? true : false}
+               //       category="update"
+               //       onPress={() => {
+               //          handleEdit()
+               //       }}
+               //    />
+               // ),
             }}
          />
          <KeyboardAvoidingView

app/(application)/feature.tsx

@@ -38,7 +38,7 @@ export default function Feature() {
                {
                   (entityUser.role == "supadmin" || entityUser.role == "developer") &&
                   <>
-                     <ButtonFiturMenu icon={<Feather name="layers" size={30} color={colors.icon} />} text="Lembaga Desa" onPress={() => { router.push('/group') }} />
+                     <ButtonFiturMenu icon={<Ionicons name="bookmarks-outline" size={30} color={colors.icon} />} text="Lembaga Desa" onPress={() => { router.push('/group') }} />
                      {/* <ButtonFiturMenu icon={<Ionicons name="color-palette-sharp" size={30} color={colors.icon} />} text="Tema" onPress={() => { }} /> */}
                      <ButtonFiturMenu icon={<Ionicons name="images-outline" size={30} color={colors.icon} />} text="Banner" onPress={() => { router.push('/banner') }} />
                   </>

app/(application)/group/index.tsx

@@ -1,4 +1,4 @@
-import AlertKonfirmasi from "@/components/alertKonfirmasi";
+import ModalConfirmation from "@/components/ModalConfirmation";
 import BorderBottomItem from "@/components/borderBottomItem";
 import { ButtonForm } from "@/components/buttonForm";
 import ButtonTab from "@/components/buttonTab";
@@ -9,13 +9,12 @@ 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";
 import { setUpdateGroup } from "@/lib/groupSlice";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { useTheme } from "@/providers/ThemeProvider";
-import { AntDesign, Feather, MaterialCommunityIcons } from "@expo/vector-icons";
+import { AntDesign, Feather, Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
 import { useEffect, useState } from "react";
 import { RefreshControl, View, VirtualizedList } from "react-native";
 import Toast from "react-native-toast-message";
@@ -36,6 +35,7 @@ export default function Index() {
    const [search, setSearch] = useState('')
    const arrSkeleton = Array.from({ length: 5 }, (_, index) => index)
    const [loading, setLoading] = useState(true)
+   const [showDeleteModal, setShowDeleteModal] = useState(false)
    const [status, setStatus] = useState<'true' | 'false'>('true')
    const [loadingSubmit, setLoadingSubmit] = useState(false)
    const [idChoose, setIdChoose] = useState('')
@@ -176,8 +176,8 @@ export default function Index() {
                                  }}
                                  borderType="all"
                                  icon={
-                                    <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                                       <MaterialCommunityIcons name="office-building-outline" size={25} color={'#384288'} />
+                                    <View style={[Styles.iconContent]}>
+                                       <Ionicons name="bookmark-outline" size={25} color={'black'} />
                                     </View>
                                  }
                                  title={item.name}
@@ -190,12 +190,12 @@ export default function Index() {
                            <RefreshControl
                               refreshing={refreshing}
                               onRefresh={handleRefresh}
-                              tintColor={colors.primary}
+                              tintColor={colors.icon}
                            />
                         }
                      />
                      :
-                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
+                     <Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada data</Text>
             }
          </View>
 
@@ -206,11 +206,9 @@ export default function Index() {
                   title={activeChoose ? "Non Aktifkan" : "Aktifkan"}
                   onPress={() => {
                      setModal(false)
-                     AlertKonfirmasi({
-                        title: 'Konfirmasi',
-                        desc: activeChoose ? 'Apakah anda yakin ingin menonaktifkan data?' : 'Apakah anda yakin ingin mengaktifkan data?',
-                        onPress: () => { handleDelete() }
-                     })
+                     setTimeout(() => {
+                        setShowDeleteModal(true)
+                     }, 600)
                   }}
                />
                <MenuItemRow
@@ -236,7 +234,7 @@ export default function Index() {
                      label="Lembaga Desa"
                      value={titleChoose}
                      error={error.title}
-                     bg={colors.card}
+                     bg={"transparent"}
                      errorText="Lembaga Desa tidak boleh kosong & minimal 3 karakter"
                      onChange={(val) => { validationForm(val, 'title') }} />
                </View>
@@ -245,6 +243,19 @@ export default function Index() {
                </View>
             </View>
          </DrawerBottom>
+
+         <ModalConfirmation
+            visible={showDeleteModal}
+            title="Konfirmasi"
+            message={activeChoose ? 'Apakah anda yakin ingin menonaktifkan data?' : 'Apakah anda yakin ingin mengaktifkan data?'}
+            onConfirm={() => {
+               setShowDeleteModal(false)
+               handleDelete()
+            }}
+            onCancel={() => setShowDeleteModal(false)}
+            confirmText={activeChoose ? "Nonaktifkan" : "Aktifkan"}
+            cancelText="Batal"
+         />
       </View >
 
    )

app/(application)/home.tsx

@@ -67,7 +67,7 @@ export default function Home() {
                <RefreshControl
                   refreshing={refreshing}
                   onRefresh={handleRefresh}
-                  tintColor={colors.primary}
+                  tintColor={colors.icon}
                />
             }
             showsVerticalScrollIndicator={false}

app/(application)/member/[id].tsx

@@ -99,7 +99,7 @@ export default function MemberDetail() {
                <RefreshControl
                   refreshing={refreshing}
                   onRefresh={handleRefresh}
-                  tintColor={colors.text}
+                  tintColor={colors.icon}
                />
             }
          >

app/(application)/member/index.tsx

@@ -171,12 +171,12 @@ export default function Index() {
                            <RefreshControl
                               refreshing={refreshing}
                               onRefresh={handleRefresh}
-                              tintColor={colors.primary}
+                              tintColor={colors.icon}
                            />
                         }
                      />
                      :
-                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
+                     <Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada data</Text>
             }
          </View>
       </View>

app/(application)/notification.tsx

@@ -1,4 +1,5 @@
 import BorderBottomItem from "@/components/borderBottomItem";
+import BorderBottomItemVertical from "@/components/borderBottomItemVertical";
 import SkeletonTwoItem from "@/components/skeletonTwoItem";
 import Text from "@/components/Text";
 import { ColorsStatus } from "@/constants/ColorsStatus";
@@ -116,11 +117,11 @@ export default function Notification() {
                         getItem={getItem}
                         renderItem={({ item, index }: { item: Props, index: number }) => {
                            return (
-                              <BorderBottomItem
+                              <BorderBottomItemVertical
                                  borderType="bottom"
                                  icon={
-                                    <View style={[Styles.iconContent, item.isRead ? ColorsStatus.secondary : ColorsStatus.primary]}>
-                                       <Feather name="bell" size={25} color="white" />
+                                    <View style={[Styles.iconContent, item.isRead && ColorsStatus.secondary]}>
+                                       <Feather name="bell" size={25} color="black" />
                                     </View>
                                  }
                                  title={item.title}
@@ -129,8 +130,8 @@ export default function Notification() {
                                  textColor={item.isRead ? 'gray' : colors.text}
                                  onPress={() => {
                                     handleReadNotification(item.id, item.category, item.idContent)
-
                                  }}
+                                 bgColor={'transparent'}
                               />
                            )
                         }}
@@ -142,12 +143,12 @@ export default function Notification() {
                            <RefreshControl
                               refreshing={refreshing}
                               onRefresh={handleRefresh}
-                              tintColor={colors.primary}
+                              tintColor={colors.icon}
                            />
                         }
                      />
                      :
-                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
+                     <Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada data</Text>
             }
          </View>
       </SafeAreaView>

app/(application)/position/index.tsx

@@ -1,4 +1,4 @@
-import AlertKonfirmasi from "@/components/alertKonfirmasi";
+import ModalConfirmation from "@/components/ModalConfirmation";
 import BorderBottomItem from "@/components/borderBottomItem";
 import { ButtonForm } from "@/components/buttonForm";
 import ButtonTab from "@/components/buttonTab";
@@ -50,6 +50,7 @@ export default function Index() {
       name: false,
    });
    const [refreshing, setRefreshing] = useState(false)
+   const [showDeleteModal, setShowDeleteModal] = useState(false)
 
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.positionUpdate)
@@ -200,8 +201,8 @@ export default function Index() {
                                  }}
                                  borderType="all"
                                  icon={
-                                    <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                                       <MaterialCommunityIcons name="account-tie" size={25} color={'#384288'} />
+                                    <View style={[Styles.iconContent]}>
+                                       <MaterialCommunityIcons name="account-tie-outline" size={25} color={'black'} />
                                     </View>
                                  }
                                  title={item.name}
@@ -215,12 +216,12 @@ export default function Index() {
                            <RefreshControl
                               refreshing={refreshing}
                               onRefresh={handleRefresh}
-                              tintColor={colors.primary}
+                              tintColor={colors.icon}
                            />
                         }
                      />
                      :
-                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
+                     <Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada data</Text>
             }
          </View>
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={() => setModal(false)} title={chooseData.name}>
@@ -230,11 +231,9 @@ export default function Index() {
                   title={chooseData.active ? 'Non Aktifkan' : "Aktifkan"}
                   onPress={() => {
                      setModal(false)
-                     AlertKonfirmasi({
-                        title: 'Konfirmasi',
-                        desc: chooseData.active ? 'Apakah anda yakin ingin menonaktifkan data?' : 'Apakah anda yakin ingin mengaktifkan data?',
-                        onPress: () => { handleDelete() }
-                     })
+                     setTimeout(() => {
+                        setShowDeleteModal(true)
+                     }, 600)
                   }}
                />
                <MenuItemRow
@@ -259,7 +258,7 @@ export default function Index() {
                      placeholder="Nama Jabatan"
                      required
                      label="Jabatan"
-                     bg={colors.card}
+                     bg={"transparent"}
                      value={chooseData.name}
                      onChange={(val) => { validationForm(val) }}
                      error={error.name}
@@ -271,6 +270,19 @@ export default function Index() {
                </View>
             </View>
          </DrawerBottom>
+
+         <ModalConfirmation
+            visible={showDeleteModal}
+            title="Konfirmasi"
+            message={chooseData.active ? 'Apakah anda yakin ingin menonaktifkan data?' : 'Apakah anda yakin ingin mengaktifkan data?'}
+            onConfirm={() => {
+               setShowDeleteModal(false)
+               handleDelete()
+            }}
+            onCancel={() => setShowDeleteModal(false)}
+            confirmText={chooseData.active ? "Nonaktifkan" : "Aktifkan"}
+            cancelText="Batal"
+         />
       </View>
    )
 }

app/(application)/profile.tsx

@@ -1,4 +1,3 @@
-import AlertKonfirmasi from "@/components/alertKonfirmasi";
 import AppHeader from "@/components/AppHeader";
 import { ButtonHeader } from "@/components/buttonHeader";
 import ItemDetailMember from "@/components/itemDetailMember";
@@ -6,39 +5,42 @@ import Text from "@/components/Text";
 import { assetUserImage } from "@/constants/AssetsError";
 import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
+import { apiGetProfile } from "@/lib/api";
+import { setEntities } from "@/lib/entitiesSlice";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { useTheme } from "@/providers/ThemeProvider";
-import { AntDesign, Ionicons } from "@expo/vector-icons";
-import { router, Stack } from "expo-router";
+import { Feather } from "@expo/vector-icons";
 import { LinearGradient } from "expo-linear-gradient";
+import { router, Stack } from "expo-router";
 import { useState } from "react";
-import { Image, Modal, Pressable, SafeAreaView, ScrollView, TouchableOpacity, View } from "react-native";
+import { Image, Pressable, RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
 import ImageViewing from 'react-native-image-viewing';
-import { useSelector } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 
 export default function Profile() {
-   const { signOut } = useAuthSession()
-   const { theme, setTheme, colors } = useTheme();
+   const { colors } = useTheme();
    const entities = useSelector((state: any) => state.entities)
    const [error, setError] = useState(false)
    const [preview, setPreview] = useState(false)
-   const [showThemeModal, setShowThemeModal] = useState(false)
+   const [refreshing, setRefreshing] = useState(false)
+   const dispatch = useDispatch()
+   const { token, decryptToken } = useAuthSession()
 
-   const ThemeOption = ({ label, value, icon }: { label: string, value: 'light' | 'dark' | 'system', icon: string }) => (
-      <TouchableOpacity
-         style={[Styles.itemSelectModal, { backgroundColor: theme === value ? colors.primary + '10' : 'transparent', borderColor: colors.icon + '20' }]}
-         onPress={() => {
-            setTheme(value);
-            setShowThemeModal(false);
-         }}
-      >
-         <View style={Styles.rowItemsCenter}>
-            <Ionicons name={icon as any} size={20} color={theme === value ? colors.primary : colors.text} style={{ marginRight: 10 }} />
-            <Text style={{ color: colors.text, fontWeight: theme === value ? 'bold' : 'normal' }}>{label}</Text>
-         </View>
-         {theme === value && <Ionicons name="checkmark" size={20} color={colors.primary} />}
-      </TouchableOpacity>
-   );
+   async function handleUserLogin() {
+      const hasil = await decryptToken(String(token?.current))
+      apiGetProfile({ id: hasil })
+         .then((data) => dispatch(setEntities(data.data)))
+         .catch((error) => {
+            console.error(error)
+         });
+   }
+
+   const handleRefresh = async () => {
+      setRefreshing(true)
+      handleUserLogin()
+      await new Promise(resolve => setTimeout(resolve, 2000));
+      setRefreshing(false)
+   };
 
    return (
       <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
@@ -53,13 +55,9 @@ export default function Profile() {
                      onPressLeft={() => router.back()}
                      right={
                         <ButtonHeader
-                           item={<AntDesign name="logout" size={20} color="white" />}
+                           item={<Feather name="settings" size={20} color="white" />}
                            onPress={() => {
-                              AlertKonfirmasi({
-                                 title: 'Keluar',
-                                 desc: 'Apakah anda yakin ingin keluar?',
-                                 onPress: () => { signOut() }
-                              })
+                              router.push('/setting')
                            }}
                         />
                      }
@@ -67,7 +65,16 @@ export default function Profile() {
                )
             }}
          />
-         <ScrollView style={[Styles.h100, { backgroundColor: colors.background }]}>
+         <ScrollView
+            refreshControl={
+               <RefreshControl
+                  refreshing={refreshing}
+                  onRefresh={handleRefresh}
+                  tintColor={colors.icon}
+               />
+            }
+            style={[Styles.h100, { backgroundColor: colors.background }]}
+         >
             <View style={{ flexDirection: 'column' }}>
                <LinearGradient
                   colors={[colors.header, colors.homeGradient]}
@@ -84,31 +91,8 @@ export default function Profile() {
                   <Text style={[Styles.textMediumNormal, Styles.cWhite]}>{entities.role}</Text>
                </LinearGradient>
                <View style={[Styles.p15]}>
-                  <View style={[Styles.rowSpaceBetween, Styles.mb15]}>
-                     <Text style={[Styles.textDefaultSemiBold, { color: colors.text }]}>Tampilan</Text>
-                  </View>
-
-                  <TouchableOpacity
-                     onPress={() => setShowThemeModal(true)}
-                     style={[Styles.wrapItemBorderAll, { flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center', borderColor: colors.icon + '40', backgroundColor: colors.background }]}
-                  >
-                     <View style={Styles.rowItemsCenter}>
-                        <Ionicons name="color-palette-outline" size={20} color={colors.text} style={{ marginRight: 10 }} />
-                        <Text style={{ color: colors.text }}>Tema Aplikasi</Text>
-                     </View>
-                     <View style={Styles.rowItemsCenter}>
-                        <Text style={{ color: colors.icon, marginRight: 5, fontSize: 13 }}>
-                           {theme === 'light' ? 'Terang' : theme === 'dark' ? 'Gelap' : 'Sistem'}
-                        </Text>
-                        <Ionicons name="chevron-forward" size={16} color={colors.icon} />
-                     </View>
-                  </TouchableOpacity>
-
-                  <View style={[Styles.rowSpaceBetween, Styles.mt15]}>
+                  <View style={[Styles.rowSpaceBetween]}>
                      <Text style={[Styles.textDefaultSemiBold, { color: colors.text }]}>Informasi</Text>
-                     {
-                        entities.idUserRole != "developer" && <Text onPress={() => { router.push('/edit-profile') }} style={[Styles.textLink]}>Edit</Text>
-                     }
                   </View>
                   {/* Note: ItemDetailMember might need updates to support dynamic colors if it uses default text colors */}
                   <ItemDetailMember category="nik" value={entities.nik} />
@@ -121,29 +105,6 @@ export default function Profile() {
             </View>
          </ScrollView>
 
-         <Modal
-            animationType="fade"
-            transparent={true}
-            visible={showThemeModal}
-            onRequestClose={() => setShowThemeModal(false)}
-         >
-            <TouchableOpacity style={Styles.modalBgTransparant} activeOpacity={1} onPress={() => setShowThemeModal(false)}>
-               <View style={[Styles.modalContent, { backgroundColor: colors.background }]}>
-                  <View style={[Styles.titleContainer, { backgroundColor: colors.background, borderBottomColor: colors.icon + '20', borderBottomWidth: 1 }]}>
-                     <Text style={[Styles.textSubtitle, { color: colors.text }]}>Pilih Tema</Text>
-                     <TouchableOpacity onPress={() => setShowThemeModal(false)}>
-                        <Ionicons name="close" size={24} color={colors.text} />
-                     </TouchableOpacity>
-                  </View>
-                  <View style={{ padding: 10 }}>
-                     <ThemeOption label="Terang" value="light" icon="sunny-outline" />
-                     <ThemeOption label="Gelap" value="dark" icon="moon-outline" />
-                     <ThemeOption label="Sistem" value="system" icon="phone-portrait-outline" />
-                  </View>
-               </View>
-            </TouchableOpacity>
-         </Modal>
-
          <ImageViewing
             images={[{ uri: error ? assetUserImage.uri : `${ConstEnv.url_storage}/files/${entities.img}` }]}
             imageIndex={0}

app/(application)/project/[id]/add-file.tsx

@@ -190,7 +190,7 @@ export default function ProjectAddFile() {
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<Ionicons name="trash" color={colors.text} size={25} />}
+                  icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
                   title="Hapus"
                   onPress={() => { deleteFile(indexDelFile) }}
                />

app/(application)/project/[id]/add-member.tsx

@@ -150,7 +150,7 @@ export default function AddMemberProject() {
                   </View>
 
                   :
-                  <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
+                  <Text style={[Styles.textDefault, Styles.pv05, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada member yang dipilih</Text>
             }
             <ScrollView
                showsVerticalScrollIndicator={false}
@@ -175,7 +175,7 @@ export default function AddMemberProject() {
                                        <View style={[Styles.ml10]}>
                                           <Text style={[Styles.textDefault]} numberOfLines={1}>{item.name}</Text>
                                           {
-                                             found && <Text style={[Styles.textInformation, Styles.cGray]}>sudah menjadi anggota</Text>
+                                             found && <Text style={[Styles.textInformation, { color: colors.dimmed }]}>sudah menjadi anggota</Text>
                                           }
                                        </View>
                                     </View>

app/(application)/project/[id]/add-task.tsx

@@ -1,5 +1,6 @@
 import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
+import ButtonSelect from "@/components/buttonSelect";
 import { InputForm } from "@/components/inputForm";
 import ModalAddDetailTugasProject from "@/components/project/modalAddDetailTugasProject";
 import Text from "@/components/Text";
@@ -19,7 +20,6 @@ import { useEffect, useState } from "react";
 import {
    KeyboardAvoidingView,
    Platform,
-   Pressable,
    SafeAreaView,
    ScrollView,
    View
@@ -200,31 +200,32 @@ export default function ProjectAddTask() {
                      <View style={[Styles.rowSpaceBetween]}>
                         <View style={[{ width: "48%" }]}>
                            <Text style={[Styles.mb05]}>
-                              Tanggal Mulai <Text style={Styles.cError}>*</Text>
+                              Tanggal Mulai <Text style={{ color: colors.error }}>*</Text>
                            </Text>
-                           <View style={[Styles.wrapPaper, Styles.p10, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                           <View style={[Styles.wrapPaper, Styles.noShadow, Styles.borderAll, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
                               <Text style={{ textAlign: "center" }}>{from}</Text>
                            </View>
                         </View>
                         <View style={[{ width: "48%" }]}>
                            <Text style={[Styles.mb05]}>
-                              Tanggal Berakhir <Text style={Styles.cError}>*</Text>
+                              Tanggal Berakhir <Text style={{ color: colors.error }}>*</Text>
                            </Text>
-                           <View style={[Styles.wrapPaper, Styles.p10, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                           <View style={[Styles.wrapPaper, Styles.noShadow, Styles.borderAll, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
                               <Text style={{ textAlign: "center" }}>{to}</Text>
                            </View>
                         </View>
                      </View>
                      {
-                        (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
+                        (error.endDate || error.startDate) && <Text style={[Styles.textInformation, { color: colors.error }, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
                      }
-                     <Pressable
+                     {/* <Pressable
                         style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
                         disabled={dsbButton}
                         onPress={() => { setModalDetail(true) }}
                      >
                         <Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
-                     </Pressable>
+                     </Pressable> */}
+                     <ButtonSelect value="Detail" onPress={() => { setModalDetail(true) }} />
                   </View>
                   <InputForm
                      label="Judul Tugas"

app/(application)/project/[id]/index.tsx

@@ -118,7 +118,7 @@ export default function DetailProject() {
                <RefreshControl
                   refreshing={refreshing}
                   onRefresh={handleRefresh}
-                  tintColor={colors.primary}
+                  tintColor={colors.icon}
                />
             }
          >

app/(application)/project/create.tsx

@@ -322,7 +322,7 @@ export default function CreateProject() {
                         <Text>Total {entitiesMember.length} Anggota</Text>
                      </View>
 
-                     <View style={[Styles.borderAll, Styles.round10, Styles.p10, { borderColor: colors.icon, backgroundColor: colors.card }]}>
+                     <View style={[Styles.borderAll, Styles.round05, Styles.p10, { borderColor: colors.icon + '20', backgroundColor: colors.card }]}>
                         {entitiesMember.map(
                            (item: { img: any; name: any }, index: any) => {
                               return (
@@ -348,7 +348,7 @@ export default function CreateProject() {
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<Ionicons name="trash" color={colors.text} size={25} />}
+                  icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
                   title="Hapus"
                   onPress={() => { deleteFile(indexDelFile) }}
                />

app/(application)/project/create/member.tsx

@@ -127,7 +127,7 @@ export default function AddMemberCreateProject() {
                   </View>
 
                   :
-                  <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
+                  <Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }, Styles.pv05]}>Tidak ada member yang dipilih</Text>
             }
             <ScrollView
                showsVerticalScrollIndicator={false}
@@ -140,7 +140,7 @@ export default function AddMemberCreateProject() {
                         return (
                            <Pressable
                               key={index}
-                              style={[Styles.itemSelectModal]}
+                              style={[Styles.itemSelectModal, { borderColor: colors.icon + '20' }]}
                               onPress={() => {
                                  onChoose(item.id, item.name, item.img)
                               }}

app/(application)/project/create/task.tsx

@@ -1,5 +1,6 @@
 import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
+import ButtonSelect from "@/components/buttonSelect";
 import { InputForm } from "@/components/inputForm";
 import ModalAddDetailTugasProject from "@/components/project/modalAddDetailTugasProject";
 import Text from "@/components/Text";
@@ -17,7 +18,6 @@ import React, { useEffect, useState } from "react";
 import {
    KeyboardAvoidingView,
    Platform,
-   Pressable,
    SafeAreaView,
    ScrollView,
    View
@@ -173,12 +173,12 @@ export default function CreateProjectAddTask() {
                            selected_label: Styles.cWhite,
                            range_fill: Styles.selectRangeDate,
                            month_label: { color: colors.text },
-                           month_selector_label: Styles.cBlack,
-                           year_label: Styles.cBlack,
-                           year_selector_label: Styles.cBlack,
-                           day_label: Styles.cBlack,
-                           time_label: Styles.cBlack,
-                           weekday_label: Styles.cBlack,
+                           month_selector_label: { color: colors.text },
+                           year_label: { color: colors.text },
+                           year_selector_label: { color: colors.text },
+                           day_label: { color: colors.text },
+                           time_label: { color: colors.text },
+                           weekday_label: { color: colors.text },
                         }}
                      />
                   </View>
@@ -186,31 +186,32 @@ export default function CreateProjectAddTask() {
                      <View style={[Styles.rowSpaceBetween]}>
                         <View style={[{ width: "48%" }]}>
                            <Text style={[Styles.mb05]}>
-                              Tanggal Mulai <Text style={Styles.cError}>*</Text>
+                              Tanggal Mulai <Text style={{ color: colors.error }}>*</Text>
                            </Text>
-                           <View style={[Styles.wrapPaper, Styles.p10, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                           <View style={[Styles.wrapPaper, Styles.noShadow, Styles.borderAll, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
                               <Text style={{ textAlign: "center" }}>{from}</Text>
                            </View>
                         </View>
                         <View style={[{ width: "48%" }]}>
                            <Text style={[Styles.mb05]}>
-                              Tanggal Berakhir <Text style={Styles.cError}>*</Text>
+                              Tanggal Berakhir <Text style={{ color: colors.error }}>*</Text>
                            </Text>
-                           <View style={[Styles.wrapPaper, Styles.p10, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                           <View style={[Styles.wrapPaper, Styles.noShadow, Styles.borderAll, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
                               <Text style={{ textAlign: "center" }}>{to}</Text>
                            </View>
                         </View>
                      </View>
                      {
-                        (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
+                        (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.mt05, { color: colors.error }]}>Tanggal tidak boleh kosong</Text>
                      }
-                     <Pressable
+                     {/* <Pressable
                         style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
                         disabled={dsbButton}
                         onPress={() => { setModalDetail(true) }}
                      >
                         <Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
-                     </Pressable>
+                     </Pressable> */}
+                     <ButtonSelect value="Detail" onPress={() => { setModalDetail(true) }} />
                   </View>
                   <InputForm
                      label="Judul Tugas"

app/(application)/project/index.tsx

@@ -7,6 +7,7 @@ import ProgressBar from "@/components/progressBar";
 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 { apiGetProject } from "@/lib/api";
@@ -127,64 +128,67 @@ export default function ListProject() {
    return (
       <View style={[Styles.p15, { flex: 1, backgroundColor: colors.background }]}>
          <View>
-            <ScrollView horizontal style={[Styles.mb10]} showsHorizontalScrollIndicator={false}>
-               <ButtonTab
-                  active={statusFix}
-                  value="0"
-                  onPress={() => { setStatusFix("0") }}
-                  label="Segera"
-                  icon={
-                     <MaterialCommunityIcons
-                        name="clock-alert-outline"
-                        color={statusFix == "0" ? "white" : colors.dimmed}
-                        size={20}
-                     />
-                  }
-                  n={4}
-               />
-               <ButtonTab
-                  active={statusFix}
-                  value="1"
-                  onPress={() => { setStatusFix("1") }}
-                  label="Dikerjakan"
-                  icon={
-                     <MaterialCommunityIcons
-                        name="progress-check"
-                        color={statusFix == "1" ? "white" : colors.dimmed}
-                        size={20}
-                     />
-                  }
-                  n={4}
-               />
-               <ButtonTab
-                  active={statusFix}
-                  value="2"
-                  onPress={() => { setStatusFix("2") }}
-                  label="Selesai"
-                  icon={
-                     <Ionicons
-                        name="checkmark-done-circle-outline"
-                        color={statusFix == "2" ? "white" : colors.dimmed}
-                        size={20}
-                     />
-                  }
-                  n={4}
-               />
-               <ButtonTab
-                  active={statusFix}
-                  value="3"
-                  onPress={() => { setStatusFix("3") }}
-                  label="Batal"
-                  icon={
-                     <AntDesign
-                        name="closecircleo"
-                        color={statusFix == "3" ? "white" : colors.dimmed}
-                        size={20}
-                     />
-                  }
-                  n={4}
-               />
-            </ScrollView>
+            <WrapTab>
+               <ScrollView horizontal showsHorizontalScrollIndicator={false} style={[Styles.round20]}>
+                  <ButtonTab
+                     active={statusFix}
+                     value="0"
+                     onPress={() => { setStatusFix("0") }}
+                     label="Segera"
+                     icon={
+                        <MaterialCommunityIcons
+                           name="clock-alert-outline"
+                           color={statusFix == "0" ? "white" : colors.dimmed}
+                           size={20}
+                        />
+                     }
+                     n={4}
+                  />
+                  <ButtonTab
+                     active={statusFix}
+                     value="1"
+                     onPress={() => { setStatusFix("1") }}
+                     label="Dikerjakan"
+                     icon={
+                        <MaterialCommunityIcons
+                           name="progress-check"
+                           color={statusFix == "1" ? "white" : colors.dimmed}
+                           size={20}
+                        />
+                     }
+                     n={4}
+                  />
+                  <ButtonTab
+                     active={statusFix}
+                     value="2"
+                     onPress={() => { setStatusFix("2") }}
+                     label="Selesai"
+                     icon={
+                        <Ionicons
+                           name="checkmark-done-circle-outline"
+                           color={statusFix == "2" ? "white" : colors.dimmed}
+                           size={20}
+                        />
+                     }
+                     n={4}
+                  />
+                  <ButtonTab
+                     active={statusFix}
+                     value="3"
+                     onPress={() => { setStatusFix("3") }}
+                     label="Batal"
+                     icon={
+                        <AntDesign
+                           name="closecircleo"
+                           color={statusFix == "3" ? "white" : colors.dimmed}
+                           size={20}
+                        />
+                     }
+                     n={4}
+                  />
+               </ScrollView>
+            </WrapTab>
+
             <View style={[Styles.rowSpaceBetween, { alignItems: 'center' }]}>
                <InputSearch width={68} onChange={setSearch} />
                <Pressable
@@ -249,12 +253,13 @@ export default function ListProject() {
                                        key={index}
                                        onPress={() => { router.push(`/project/${item.id}`); }}
                                        borderType="bottom"
+                                       bgColor="transparent"
                                        icon={
-                                          <View style={[Styles.iconContent, ColorsStatus.lightGreen]} >
+                                          <View style={[Styles.iconContent]} >
                                              <AntDesign
                                                 name="areachart"
                                                 size={25}
-                                                color={"#384288"}
+                                                color={"black"}
                                              />
                                           </View>
                                        }
@@ -270,6 +275,7 @@ export default function ListProject() {
                                  <RefreshControl
                                     refreshing={refreshing}
                                     onRefresh={handleRefresh}
+                                    tintColor={colors.icon}
                                  />
                               }
                            />
@@ -316,17 +322,17 @@ export default function ListProject() {
                                     >
                                        <ProgressBar value={item.progress} category="list" />
                                        <View style={[Styles.rowSpaceBetween]}>
-                                          <Text style={[Styles.textDefault, Styles.cGray]}>
+                                          <Text style={[Styles.textDefault, { color: colors.dimmed }]}>
                                              {item.createdAt}
                                           </Text>
                                           <LabelStatus
                                              size="default"
                                              category={
-                                                item.status === 0 ? 'primary' :
+                                                item.status === 0 ? 'secondary' :
                                                    item.status === 1 ? 'warning' :
                                                       item.status === 2 ? 'success' :
                                                          item.status === 3 ? 'error' :
-                                                            'primary'
+                                                            'secondary'
                                              }
                                              text={
                                                 item.status === 0 ? 'SEGERA' :
@@ -348,6 +354,7 @@ export default function ListProject() {
                                  <RefreshControl
                                     refreshing={refreshing}
                                     onRefresh={handleRefresh}
+                                    tintColor={colors.icon}
                                  />
                               }
                            />
@@ -364,7 +371,7 @@ export default function ListProject() {
                                  >
                                     <ProgressBar value={item.progress} category="list" />
                                     <View style={[Styles.rowSpaceBetween]}>
-                                       <Text style={[Styles.textDefault, Styles.cGray]}>
+                                       <Text style={[Styles.textDefault, { color: colors.dimmed }]}>
                                           {item.createdAt}
                                        </Text>
                                        <LabelStatus
@@ -392,7 +399,7 @@ export default function ListProject() {
                      )
                      :
                      <View style={[Styles.mt15]}>
-                        <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada kegiatan</Text>
+                        <Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada kegiatan</Text>
                      </View>
             }
          </View>

app/(application)/project/update/[detail].tsx

@@ -1,5 +1,6 @@
 import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
+import ButtonSelect from "@/components/buttonSelect";
 import { InputForm } from "@/components/inputForm";
 import ModalAddDetailTugasProject from "@/components/project/modalAddDetailTugasProject";
 import Text from "@/components/Text";
@@ -16,7 +17,7 @@ import 'intl';
 import 'intl/locale-data/jsonp/id';
 import moment from "moment";
 import React, { useEffect, useState } from "react";
-import { KeyboardAvoidingView, Platform, Pressable, SafeAreaView, ScrollView, View } from "react-native";
+import { KeyboardAvoidingView, Platform, SafeAreaView, ScrollView, View } from "react-native";
 import Toast from "react-native-toast-message";
 import DateTimePicker, { DateType } from "react-native-ui-datepicker";
 import { useDispatch, useSelector } from "react-redux";
@@ -234,28 +235,29 @@ export default function UpdateProjectTask() {
                   <View style={[Styles.mv10]}>
                      <View style={[Styles.rowSpaceBetween]}>
                         <View style={[{ width: '48%' }]}>
-                           <Text style={[Styles.mb05]}>Tanggal Mulai <Text style={Styles.cError}>*</Text></Text>
-                           <View style={[Styles.wrapPaper, Styles.p10, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                           <Text style={[Styles.mb05]}>Tanggal Mulai <Text style={{ color: colors.error }}>*</Text></Text>
+                           <View style={[Styles.wrapPaper, Styles.noShadow, Styles.borderAll, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
                               <Text style={{ textAlign: 'center' }}>{from}</Text>
                            </View>
                         </View>
                         <View style={[{ width: '48%' }]}>
-                           <Text style={[Styles.mb05]}>Tanggal Berakhir <Text style={Styles.cError}>*</Text></Text>
-                           <View style={[Styles.wrapPaper, Styles.p10, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                           <Text style={[Styles.mb05]}>Tanggal Berakhir <Text style={{ color: colors.error }}>*</Text></Text>
+                           <View style={[Styles.wrapPaper, Styles.noShadow, Styles.borderAll, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
                               <Text style={{ textAlign: 'center' }}>{to}</Text>
                            </View>
                         </View>
                      </View>
                      {
-                        (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
+                        (error.endDate || error.startDate) && <Text style={[Styles.textInformation, { color: colors.error }, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
                      }
-                     <Pressable
+                     {/* <Pressable
                         style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
                         disabled={dsbButton}
                         onPress={() => { setModalDetail(true) }}
                      >
                         <Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
-                     </Pressable>
+                     </Pressable> */}
+                     <ButtonSelect value="Detail" onPress={() => { setModalDetail(true) }} />
                   </View>
                   <InputForm
                      label="Judul Tugas"

app/(application)/search.tsx

@@ -103,7 +103,7 @@ export default function Search() {
                            <RefreshControl
                               refreshing={refreshing}
                               onRefresh={handleRefresh}
-                              tintColor={colors.primary}
+                              tintColor={colors.icon}
                            />
                         }
                      >

app/(application)/setting/index.tsx

@@ -0,0 +1,186 @@
+import ModalConfirmation from "@/components/ModalConfirmation";
+import Text from "@/components/Text";
+import ButtonSetting from "@/components/buttonSetting";
+import DrawerBottom from "@/components/drawerBottom";
+import Styles from "@/constants/Styles";
+import { apiRegisteredToken, apiUnregisteredToken } from "@/lib/api";
+import { checkPermission, getToken, openSettings, requestPermission } from "@/lib/useNotification";
+import { useAuthSession } from "@/providers/AuthProvider";
+import { useTheme } from "@/providers/ThemeProvider";
+import { Feather, Ionicons } from "@expo/vector-icons";
+import { router } from "expo-router";
+import { useCallback, useEffect, useState } from "react";
+import { AppState, AppStateStatus, Pressable, View } from "react-native";
+import { useSelector } from "react-redux";
+
+export default function ListSetting() {
+   const { theme, setTheme, colors } = useTheme()
+   const { signOut } = useAuthSession()
+   const [isNotificationEnabled, setIsNotificationEnabled] = useState<boolean | null>(null);
+   const entities = useSelector((state: any) => state.entities)
+   const [modalVisible, setModalVisible] = useState(false);
+   const [modalConfig, setModalConfig] = useState({
+      title: '',
+      message: '',
+      confirmText: 'Buka Pengaturan',
+      onConfirm: () => { }
+   });
+
+   const [showLogoutModal, setShowLogoutModal] = useState(false)
+   const [showThemeModal, setShowThemeModal] = useState(false)
+
+   const registerToken = async () => {
+      try {
+         const token = await getToken();
+         if (token) {
+            await apiRegisteredToken({ user: entities.id, token });
+         }
+      } catch (error) {
+         console.warn('Error registering token:', error);
+      }
+   };
+
+   const unregisterToken = async () => {
+      try {
+         const token = await getToken();
+         if (token) {
+            await apiUnregisteredToken({ user: entities.id, token });
+         }
+      } catch (error) {
+         console.warn('Error unregistering token:', error);
+      }
+   };
+
+   const checkNotif = useCallback(async () => {
+      const status = await checkPermission();
+      setIsNotificationEnabled((prev) => {
+         if (prev === false && status === true) {
+            registerToken();
+         } else if (prev === true && status === false) {
+            unregisterToken();
+         }
+         return !!status;
+      });
+   }, [entities.id]);
+
+   useEffect(() => {
+      checkNotif();
+
+      const subscription = AppState.addEventListener('change', (nextAppState: AppStateStatus) => {
+         if (nextAppState === 'active') {
+            checkNotif();
+         }
+      });
+
+      return () => {
+         subscription.remove();
+      };
+   }, [checkNotif]);
+
+   const handleToggleNotif = async () => {
+      if (isNotificationEnabled) {
+         setModalConfig({
+            title: "Matikan Notifikasi?",
+            message: "Anda akan diarahkan ke pengaturan sistem untuk mematikan notifikasi.",
+            confirmText: "Buka Pengaturan",
+            onConfirm: () => {
+               setModalVisible(false);
+               openSettings();
+            }
+         });
+         setModalVisible(true);
+      } else {
+         const granted = await requestPermission();
+         if (granted) {
+            setIsNotificationEnabled(true);
+            registerToken();
+         } else {
+            setModalConfig({
+               title: "Aktifkan Notifikasi?",
+               message: "Izin notifikasi tidak diberikan. Buka pengaturan sistem untuk mengaktifkannya?",
+               confirmText: "Buka Pengaturan",
+               onConfirm: () => {
+                  setModalVisible(false);
+                  openSettings();
+               }
+            });
+            setModalVisible(true);
+         }
+      }
+   };
+
+   const ThemeOption = ({ label, value, icon }: { label: string, value: 'light' | 'dark' | 'system', icon: string }) => (
+      <Pressable
+         style={[Styles.itemSelectModal, { borderColor: colors.icon + '20' }]}
+         onPress={() => {
+            setTheme(value);
+         }}
+      >
+         <View style={Styles.rowItemsCenter}>
+            <Ionicons name={icon as any} size={20} color={colors.text} style={{ marginRight: 10 }} />
+            <Text style={{ color: colors.text }}>{label}</Text>
+         </View>
+         {theme === value && <Ionicons name="checkmark" size={20} color={colors.text} />}
+      </Pressable>
+   );
+
+   return (
+      <View style={[Styles.p15, { flex: 1, backgroundColor: colors.background }]}>
+         <View style={[Styles.wrapPaper, { backgroundColor: colors.card, borderColor: colors.icon + '20' }, Styles.p0, Styles.round05]}>
+            {
+               entities.idUserRole != "developer" &&
+               <ButtonSetting
+                  title="Edit Profile"
+                  icon={<Feather name="user" size={20} color={colors.text} />}
+                  onPress={() => { router.push('/edit-profile') }}
+               />
+            }
+            <ButtonSetting
+               title="Tema Aplikasi"
+               icon={<Ionicons name="color-palette-outline" size={20} color={colors.text} />}
+               onPress={() => setShowThemeModal(true)}
+               value={theme === 'light' ? 'Terang' : theme === 'dark' ? 'Gelap' : 'Sistem'}
+            />
+            <ButtonSetting
+               title="Notifikasi"
+               icon={<Feather name="bell" size={20} color={colors.text} />}
+               onPress={handleToggleNotif}
+               value={isNotificationEnabled === null ? 'Memuat...' : isNotificationEnabled ? 'Aktif' : 'Nonaktif'}
+            />
+            <ButtonSetting
+               title="Keluar"
+               icon={<Feather name="log-out" size={20} color={colors.text} />}
+               onPress={() => setShowLogoutModal(true)}
+               borderBottom={false}
+            />
+         </View>
+
+         <ModalConfirmation
+            visible={modalVisible}
+            title={modalConfig.title}
+            message={modalConfig.message}
+            confirmText={modalConfig.confirmText}
+            onConfirm={modalConfig.onConfirm}
+            onCancel={() => setModalVisible(false)}
+         />
+
+         <ModalConfirmation
+            visible={showLogoutModal}
+            title="Keluar"
+            message="Apakah anda yakin ingin keluar?"
+            onConfirm={() => {
+               setShowLogoutModal(false)
+               signOut()
+            }}
+            onCancel={() => setShowLogoutModal(false)}
+            confirmText="Keluar"
+            cancelText="Batal"
+         />
+         <DrawerBottom animation="slide" isVisible={showThemeModal} setVisible={setShowThemeModal} title="Tema Aplikasi">
+            <ThemeOption label="Terang" value="light" icon="sunny-outline" />
+            <ThemeOption label="Gelap" value="dark" icon="moon-outline" />
+            <ThemeOption label="Sistem" value="system" icon="phone-portrait-outline" />
+         </DrawerBottom>
+      </View>
+   )
+}

app/verification.tsx

@@ -20,10 +20,16 @@ export default function Index() {
 
    const { signIn } = useAuthSession();
    const login = (): void => {
-      const random: string = 'contohLoginMobileDarmasaba';
-      var mytexttoEncryption = "contohLoginMobileDarmasaba"
-      const encrypted = CryptoES.AES.encrypt(mytexttoEncryption, ConstEnv.pass_encrypt).toString();
-      signIn(encrypted);
+      // WARNING: This is a hardcoded bypass for development purposes.
+      // It should be removed or secured before production release.
+      if (__DEV__) {
+         const random: string = 'contohLoginMobileDarmasaba';
+         var mytexttoEncryption = "contohLoginMobileDarmasaba"
+         const encrypted = CryptoES.AES.encrypt(mytexttoEncryption, ConstEnv.pass_encrypt).toString();
+         signIn(encrypted);
+      } else {
+         console.warn("Bypass login disabled in production.");
+      }
    }
    return (
       <View style={[Styles.wrapLogin, { backgroundColor: colors.background }]} >

components/ModalConfirmation.tsx

@@ -0,0 +1,82 @@
+import Styles from '@/constants/Styles';
+import { useTheme } from '@/providers/ThemeProvider';
+import React from 'react';
+import { Modal, TouchableOpacity, View } from 'react-native';
+import Text from './Text';
+
+interface ModalConfirmationProps {
+   visible: boolean;
+   title: string;
+   message: string;
+   onConfirm: () => void;
+   onCancel: () => void;
+   confirmText?: string;
+   cancelText?: string;
+   isDestructive?: boolean;
+}
+
+const ModalConfirmation: React.FC<ModalConfirmationProps> = ({
+   visible,
+   title,
+   message,
+   onConfirm,
+   onCancel,
+   confirmText = 'Ya',
+   cancelText = 'Batal',
+   isDestructive = false,
+}) => {
+   const { colors } = useTheme();
+
+   return (
+      <Modal
+         transparent
+         visible={visible}
+         animationType="fade"
+         onRequestClose={onCancel}
+      >
+         <View style={Styles.modalOverlay}>
+            <View style={[Styles.modalConfirmContainer, { backgroundColor: colors.modalBackground }]}>
+               <View style={Styles.modalConfirmContent}>
+                  <Text style={Styles.modalConfirmTitle}>{title}</Text>
+                  <Text style={[Styles.modalConfirmMessage, { color: colors.text }]}>
+                     {message}
+                  </Text>
+               </View>
+
+               <View style={[Styles.modalConfirmDivider, { backgroundColor: colors.icon + '20' }]} />
+
+               <View style={Styles.modalConfirmFooter}>
+                  <TouchableOpacity
+                     style={Styles.modalConfirmButton}
+                     onPress={onCancel}
+                     activeOpacity={0.7}
+                  >
+                     <Text style={[Styles.modalConfirmButtonText, { color: colors.text }]}>
+                        {cancelText}
+                     </Text>
+                  </TouchableOpacity>
+
+                  <View style={[Styles.modalConfirmVerticalDivider, { backgroundColor: colors.icon + '20' }]} />
+
+                  <TouchableOpacity
+                     style={Styles.modalConfirmButton}
+                     onPress={onConfirm}
+                     activeOpacity={0.7}
+                  >
+                     <Text
+                        style={[
+                           Styles.modalConfirmButtonText,
+                           { color: isDestructive ? colors.error : colors.text }
+                        ]}
+                     >
+                        {confirmText}
+                     </Text>
+                  </TouchableOpacity>
+               </View>
+            </View>
+         </View>
+      </Modal>
+   );
+};
+
+export default ModalConfirmation;

components/announcement/headerAnnouncementDetail.tsx

@@ -9,7 +9,7 @@ import { useState } from "react"
 import { View } from "react-native"
 import Toast from "react-native-toast-message"
 import { useDispatch, useSelector } from "react-redux"
-import AlertKonfirmasi from "../alertKonfirmasi"
+import ModalConfirmation from "../ModalConfirmation"
 import ButtonMenuHeader from "../buttonMenuHeader"
 import DrawerBottom from "../drawerBottom"
 import MenuItemRow from "../menuItemRow"
@@ -22,6 +22,7 @@ export default function HeaderRightAnnouncementDetail({ id }: Props) {
    const { colors } = useTheme();
    const [isVisible, setVisible] = useState(false)
    const update = useSelector((state: any) => state.announcementUpdate)
+   const [showDeleteModal, setShowDeleteModal] = useState(false)
    const dispatch = useDispatch()
 
 
@@ -56,21 +57,30 @@ export default function HeaderRightAnnouncementDetail({ id }: Props) {
                   }}
                />
                <MenuItemRow
-                  icon={<Ionicons name="trash" color={colors.text} size={25} />}
+                  icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
                   title="Hapus"
                   onPress={() => {
                      setVisible(false)
-                     AlertKonfirmasi({
-                        title: 'Konfirmasi',
-                        desc: 'Apakah anda yakin ingin menghapus pengumuman ini?',
-                        onPress: () => {
-                           handleDelete()
-                        }
-                     })
+                     setTimeout(() => {
+                        setShowDeleteModal(true)
+                     }, 600)
                   }}
                />
             </View>
          </DrawerBottom>
+
+         <ModalConfirmation
+            visible={showDeleteModal}
+            title="Konfirmasi"
+            message="Apakah anda yakin ingin menghapus pengumuman ini?"
+            onConfirm={() => {
+               setShowDeleteModal(false)
+               handleDelete()
+            }}
+            onCancel={() => setShowDeleteModal(false)}
+            confirmText="Hapus"
+            cancelText="Batal"
+         />
       </>
    )
 }

components/announcement/headerAnnouncementList.tsx

@@ -23,7 +23,7 @@ export default function HeaderRightAnnouncementList() {
          <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<AntDesign name="pluscircle" color={colors.text} size={25} />}
+                  icon={<AntDesign name="pluscircleo" color={colors.text} size={25} />}
                   title="Tambah Pengumuman"
                   onPress={() => {
                      setVisible(false)

components/auth/viewLogin.tsx

@@ -53,11 +53,10 @@ export default function ViewLogin({ onValidate }: Props) {
    return (
       <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
          <StatusBar style={theme === 'dark' ? 'light' : 'dark'} translucent={false} backgroundColor={colors.background} />
-         <ToastCustom />
          <View style={[Styles.p20, Styles.h100]}>
             <View style={{ alignItems: "center", marginTop: 70, marginBottom: 50 }}>
                <Image
-                  source={require("../../assets/images/logo.png")}
+                  source={theme === 'dark' ? require("../../assets/images/logo-dark.png") : require("../../assets/images/logo.png")}
                   style={[{ width: 300, height: 150 }]}
                   width={270}
                   height={110}
@@ -71,18 +70,28 @@ export default function ViewLogin({ onValidate }: Props) {
                }}
                type="numeric"
                placeholder="XXX-XXX-XXXX"
-               round
                itemLeft={<Text style={[Platform.OS === 'ios' && Styles.mt02]}>+62</Text>}
                info="Kami akan mengirim kode verifikasi melalui WhatsApp, guna mengonfirmasikan nomor Anda." />
-            <ButtonForm
-               text="MASUK"
-               onPress={() => { handleCheckPhone() }}
-               disabled={disableLogin}
-            />
+            <View style={[{ width: '50%', alignSelf: 'center' }]}>
+               <ButtonForm
+                  text="MASUK"
+                  onPress={() => { handleCheckPhone() }}
+                  disabled={disableLogin}
+               />
+            </View>
+            <View style={{ flex: 1 }} />
+            <View style={{ alignItems: 'center' }}>
+               <Image
+                  source={theme === 'dark' ? require("../../assets/images/cogniti-dark.png") : require("../../assets/images/cogniti-light.png")}
+                  style={{ width: 86, height: 27 }}
+                  resizeMode="contain"
+               />
+            </View>
          </View>
          {
             loadingLogin && <ModalLoading isVisible={true} setVisible={setLoadingLogin} />
          }
+         <ToastCustom position="bottom" />
       </SafeAreaView>
 
    )

components/auth/viewVerification.tsx

@@ -5,7 +5,7 @@ import { useTheme } from "@/providers/ThemeProvider";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 import { StatusBar } from "expo-status-bar";
 import { useState } from "react";
-import { Image, Platform, View } from "react-native";
+import { Image, SafeAreaView, View } from "react-native";
 import { OtpInput } from "react-native-otp-entry";
 import Toast from 'react-native-toast-message';
 import { ButtonForm } from "../buttonForm";
@@ -58,13 +58,12 @@ export default function ViewVerification({ phone, otp }: Props) {
    }
 
    return (
-      <>
+      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
          <StatusBar style={theme === 'dark' ? 'light' : 'dark'} translucent={false} backgroundColor={colors.background} />
-         <ToastCustom />
-         <View style={[Styles.wrapLogin, { backgroundColor: colors.background }]} >
+         <View style={[Styles.p20, Styles.h100]} >
             <View style={{ alignItems: "center", marginTop: 70, marginBottom: 50 }}>
                <Image
-                  source={require("../../assets/images/logo.png")}
+                  source={theme === 'dark' ? require("../../assets/images/logo-dark.png") : require("../../assets/images/logo.png")}
                   style={[{ width: 300, height: 150 }]}
                   width={270}
                   height={110}
@@ -90,14 +89,25 @@ export default function ViewVerification({ phone, otp }: Props) {
                   pinCodeTextStyle: { color: colors.text }
                }}
             />
-            <ButtonForm
-               text="SUBMIT"
-               onPress={() => { onCheckOtp() }}
-            />
-            <Text style={[Styles.textInformation, Styles.mt05, Styles.cDefault, { textAlign: 'center', color: colors.tint }]}>
-               Tidak Menerima kode verifikasi?  <Text onPress={() => { resendOtp() }}>Kirim Ulang</Text>
+            <View style={[{ width: '50%', alignSelf: 'center' }]}>
+               <ButtonForm
+                  text="SUBMIT"
+                  onPress={() => { onCheckOtp() }}
+               />
+            </View>
+            <Text style={[Styles.textInformation, Styles.mt05, { textAlign: 'center', color: colors.dimmed }]}>
+               Tidak Menerima kode verifikasi?  <Text onPress={() => { resendOtp() }} style={[{ color: colors.tint }]}>Kirim Ulang</Text>
             </Text>
+            <View style={{ flex: 1 }} />
+            <View style={[{ alignItems: 'center' }]}>
+               <Image
+                  source={theme === 'dark' ? require("../../assets/images/cogniti-dark.png") : require("../../assets/images/cogniti-light.png")}
+                  style={{ width: 86, height: 27 }}
+                  resizeMode="contain"
+               />
+            </View>
          </View>
-      </>
+         <ToastCustom position="bottom" />
+      </SafeAreaView>
    )
 }

components/banner/headerBannerList.tsx

@@ -17,7 +17,7 @@ export default function HeaderRightBannerList() {
          <DrawerBottom animation="slide" isVisible={isVisible} setVisible={() => setVisible(false)} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<AntDesign name="pluscircle" color={colors.text} size={25} />}
+                  icon={<AntDesign name="pluscircleo" color={colors.text} size={25} />}
                   title="Tambah Banner"
                   onPress={() => {
                      setVisible(false)

components/borderBottomItem.tsx

@@ -18,17 +18,14 @@ type Props = {
    rightBottomInfo?: React.ReactNode | string
    titleWeight?: 'normal' | 'bold'
    bgColor?: string
-   width?: number
    descEllipsize?: boolean
    textColor?: string,
    colorPress?: boolean
    titleShowAll?: boolean
 }
 
-export default function BorderBottomItem({ title, subtitle, icon, desc, onPress, onLongPress, rightTopInfo, borderType, leftBottomInfo, rightBottomInfo, titleWeight, bgColor, width, descEllipsize, textColor, colorPress, titleShowAll }: Props) {
-   const lebarDim = Dimensions.get("window").width;
+export default function BorderBottomItem({ title, subtitle, icon, desc, onPress, onLongPress, rightTopInfo, borderType, leftBottomInfo, rightBottomInfo, titleWeight, bgColor, descEllipsize, textColor, colorPress, titleShowAll }: Props) {
    const { colors } = useTheme();
-   const lebar = width ? lebarDim * width / 100 : 'auto';
    const textColorFix = textColor ? textColor : colors.text;
    const [isTap, setIsTap] = useState(false);
 
@@ -39,31 +36,31 @@ export default function BorderBottomItem({ title, subtitle, icon, desc, onPress,
          onPressOut={() => setIsTap(false)}
          style={({ pressed }) => [
             borderType == 'bottom'
-               ? [Styles.wrapItemBorderBottom, { borderBottomColor: colors.icon }]
+               ? [Styles.wrapItemBorderBottom, { borderBottomColor: colors.icon + '20' }]
                : borderType == 'all'
-                  ? [Styles.wrapItemBorderAll, { borderColor: colors.icon }]
+                  ? [Styles.wrapItemBorderAll, { borderColor: colors.icon + '20' }]
                   : Styles.wrapItemBorderNone,
-            { backgroundColor: bgColor },
+            bgColor == "transparent" ? { backgroundColor: 'transparent' } : { backgroundColor: colors.card },
             // efek warna saat ditekan (sementara)
-            isTap && colorPress && ColorsStatus.pressedGray,
+            isTap && colorPress && { backgroundColor: colors.icon + '20' },
          ]}
       >
          <View style={[Styles.rowItemsCenter]}>
             {icon}
-            <View style={[Styles.rowSpaceBetween, width ? { width: lebar } : { width: '88%' }]}>
-               <View style={[Styles.ml10, rightTopInfo ? { width: '70%' } : { width: '90%' }]}>
+            <View style={[Styles.rowSpaceBetween, Styles.flex1]}>
+               <View style={[Styles.ml10, Styles.flex1, Styles.mr10]}>
                   <Text style={[titleWeight == 'normal' ? Styles.textDefault : Styles.textDefaultSemiBold, { color: textColorFix }]} numberOfLines={titleShowAll ? 0 : 1} ellipsizeMode='tail'>{title}</Text>
                   {
                      subtitle &&
                         typeof subtitle == "string"
-                        ? <Text style={[Styles.textMediumNormal, { lineHeight: 15, color: textColorFix }]}>{subtitle}</Text>
+                        ? <Text style={[Styles.textMediumNormal, { lineHeight: 15, color: colors.dimmed }]}>{subtitle}</Text>
                         : <View style={{ alignItems: 'flex-start' }}>
                            {subtitle}
                         </View>
                   }
                </View>
                {
-                  rightTopInfo && <Text style={[Styles.textInformation, Styles.mt05, { color: textColorFix }]}>{rightTopInfo}</Text>
+                  rightTopInfo && <Text style={[Styles.textInformation, Styles.mt05, { color: colors.dimmed }]}>{rightTopInfo}</Text>
                }
             </View>
 
@@ -75,13 +72,13 @@ export default function BorderBottomItem({ title, subtitle, icon, desc, onPress,
                <View style={[rightBottomInfo && !leftBottomInfo ? Styles.rowSpaceBetweenReverse : Styles.rowSpaceBetween, Styles.mt05]}>
                   {
                      typeof leftBottomInfo == 'string' ?
-                        <Text style={[Styles.textInformation, Styles.cGray]}>{leftBottomInfo}</Text>
+                        <Text style={[Styles.textInformation, { color: colors.dimmed }]}>{leftBottomInfo}</Text>
                         :
                         leftBottomInfo
                   }
                   {
                      typeof rightBottomInfo == 'string' ?
-                        <Text style={[Styles.textInformation, Styles.cGray]}>{rightBottomInfo}</Text>
+                        <Text style={[Styles.textInformation, { color: colors.dimmed }]}>{rightBottomInfo}</Text>
                         :
                         rightBottomInfo
                   }

components/borderBottomItem2.tsx

@@ -117,9 +117,9 @@ export default function BorderBottomItem2({ title, subtitle, icon, desc, onPress
             onPressOut={() => setIsTap(false)}
             style={({ pressed }) => [
                borderType == 'bottom'
-                  ? [Styles.wrapItemBorderBottom, { borderBottomColor: colors.icon }]
+                  ? [Styles.wrapItemBorderBottom, { borderBottomColor: colors.icon + '20' }]
                   : borderType == 'all'
-                     ? [Styles.wrapItemBorderAll, { borderColor: colors.icon }]
+                     ? [Styles.wrapItemBorderAll, { borderColor: colors.icon + '20' }]
                      : Styles.wrapItemBorderNone,
                bgColor && bgColor == 'white' && { backgroundColor: colors.card },
                // efek warna saat ditekan (sementara)
@@ -153,7 +153,7 @@ export default function BorderBottomItem2({ title, subtitle, icon, desc, onPress
                      {dataFile.map((item, index) => (
                         <Pressable
                            key={index}
-                           style={[Styles.rowItemsCenter, Styles.borderAll, Styles.round10, Styles.ph05, Styles.pv03, Styles.mr05, { borderColor: colors.icon }]}
+                           style={[Styles.rowItemsCenter, Styles.borderAll, Styles.round05, Styles.ph05, Styles.pv03, Styles.mr05, { borderColor: colors.icon }]}
                            onPress={() => {
                               isImageFile(item.extension) ?
                                  handleChooseFile(item)
@@ -164,7 +164,7 @@ export default function BorderBottomItem2({ title, subtitle, icon, desc, onPress
                               name={isImageFile(item.extension) ? "file-image-outline" : "file-document-outline"}
                               size={18}
                               color={colors.icon} />
-                           <Text style={[Styles.textInformation, Styles.cGray]}>{item.name}.{item.extension}</Text>
+                           <Text style={[Styles.textInformation]}>{item.name}.{item.extension}</Text>
                         </Pressable>
                      ))}
                   </ScrollView>
@@ -176,13 +176,13 @@ export default function BorderBottomItem2({ title, subtitle, icon, desc, onPress
                   <View style={[rightBottomInfo && !leftBottomInfo ? Styles.rowSpaceBetweenReverse : Styles.rowSpaceBetween, Styles.mt05]}>
                      {
                         typeof leftBottomInfo == 'string' ?
-                           <Text style={[Styles.textInformation, Styles.cGray]}>{leftBottomInfo}</Text>
+                           <Text style={[Styles.textInformation, { color: colors.dimmed }]}>{leftBottomInfo}</Text>
                            :
                            leftBottomInfo
                      }
                      {
                         typeof rightBottomInfo == 'string' ?
-                           <Text style={[Styles.textInformation, Styles.cGray]}>{rightBottomInfo}</Text>
+                           <Text style={[Styles.textInformation, { color: colors.dimmed }]}>{rightBottomInfo}</Text>
                            :
                            rightBottomInfo
                      }
@@ -215,7 +215,7 @@ export default function BorderBottomItem2({ title, subtitle, icon, desc, onPress
                      accessibilityLabel="Download or share image"
                      disabled={loadingOpen}
                   >
-                     <Text style={{ color: loadingOpen ? 'gray' : 'white', fontSize: 22 }}>⋯</Text>
+                     <Text style={{ color: loadingOpen ? 'gray' : 'white', fontSize: 26 }}>⋯</Text>
                   </Pressable>
                </View>
             )}

components/borderBottomItemVertical.tsx

@@ -0,0 +1,53 @@
+import Styles from "@/constants/Styles";
+import { useTheme } from "@/providers/ThemeProvider";
+import React, { useState } from "react";
+import { Pressable, View } from "react-native";
+import Text from "./Text";
+
+type Props = {
+   title?: string
+   icon: React.ReactNode
+   desc?: string
+   rightTopInfo?: string
+   onPress?: () => void
+   onLongPress?: () => void
+   borderType: 'all' | 'bottom' | 'none'
+   titleWeight?: 'normal' | 'bold'
+   bgColor?: string
+   descEllipsize?: boolean
+   textColor?: string,
+   titleShowAll?: boolean
+}
+
+export default function BorderBottomItemVertical({ title, icon, desc, onPress, onLongPress, rightTopInfo, borderType, titleWeight, bgColor, descEllipsize, textColor, titleShowAll }: Props) {
+   const { colors } = useTheme();
+   const textColorFix = textColor ? textColor : colors.text;
+
+   return (
+      <Pressable onLongPress={onLongPress} onPress={onPress}
+         style={({ pressed }) => [
+            borderType == 'bottom'
+               ? [Styles.wrapItemBorderBottom, { borderBottomColor: colors.icon + '20' }]
+               : borderType == 'all'
+                  ? [Styles.wrapItemBorderAll, { borderColor: colors.icon + '20' }]
+                  : Styles.wrapItemBorderNone,
+            bgColor == "transparent" ? { backgroundColor: 'transparent' } : { backgroundColor: colors.card },
+         ]}
+      >
+         <View style={Styles.rowItemsCenter}>
+            {icon}
+            <View style={[Styles.ml10, Styles.flex1]}>
+               <View style={Styles.rowSpaceBetween}>
+                  <View style={[Styles.flex1, Styles.mr10]}>
+                     <Text style={[titleWeight == 'normal' ? Styles.textDefault : Styles.textDefaultSemiBold, { color: textColorFix }]} numberOfLines={titleShowAll ? 0 : 1} ellipsizeMode='tail'>{title}</Text>
+                  </View>
+                  {
+                     rightTopInfo && <Text style={[Styles.textInformation, Styles.mt05, { color: textColorFix }]}>{rightTopInfo}</Text>
+                  }
+               </View>
+               {desc && <Text style={[Styles.textDefault, { textAlign: 'left', color: textColorFix }]} numberOfLines={descEllipsize == false ? 0 : 2} ellipsizeMode='tail'>{desc}</Text>}
+            </View>
+         </View>
+      </Pressable>
+   )
+}

components/buttonForm.tsx

@@ -1,5 +1,5 @@
-import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
+import { useTheme } from "@/providers/ThemeProvider";
 import { TouchableOpacity } from "react-native";
 import Text from './Text';
 
@@ -10,8 +10,9 @@ type Props = {
 };
 
 export function ButtonForm({ text, onPress, disabled }: Props) {
+   const { colors } = useTheme();
    return (
-      <TouchableOpacity style={[Styles.btnRound, { marginTop: 30,}, disabled && ColorsStatus.gray]} onPress={onPress} disabled={disabled}>
+      <TouchableOpacity style={[Styles.btnRound, Styles.round05, Styles.mt30, { backgroundColor: colors.primary }, disabled && { backgroundColor: colors.tabIconDefault }]} onPress={onPress} disabled={disabled}>
          <Text style={[Styles.textDefaultSemiBold, Styles.cWhite]}>{text}</Text>
       </TouchableOpacity>
    );

components/buttonMenuHeader.tsx

@@ -9,7 +9,7 @@ export default function ButtonMenuHeader({ onPress }: Props) {
    return (
       <>
          <ButtonHeader
-            item={<Feather name="menu" size={20} color="white" />}
+            item={<Feather name="menu" size={25} color="white" />}
             onPress={() => onPress()}
          />
       </>

components/buttonSaveHeader.tsx

@@ -1,6 +1,7 @@
 import { Feather } from "@expo/vector-icons"
-import AlertKonfirmasi from "./alertKonfirmasi"
+import ModalConfirmation from "./ModalConfirmation"
 import { ButtonHeader } from "./buttonHeader"
+import { useState } from "react"
 
 type Props = {
    category: 'create' | 'update' | 'cancel' | 'update-calendar'
@@ -9,29 +10,37 @@ type Props = {
 }
 
 export default function ButtonSaveHeader({ category, onPress, disable }: Props) {
+   const [showModal, setShowModal] = useState(false)
    return (
       <>
          <ButtonHeader
-            item={<Feather name="check" size={20} color={disable ? "grey" : "white"} />}
+            item={<Feather name="check" size={25} color={disable ? "grey" : "white"} />}
             onPress={() => {
                if (!disable) {
-                  AlertKonfirmasi({
-                     title: 'Konfirmasi',
-                     desc: category == 'create'
-                        ? 'Apakah anda yakin ingin menambahkan data?'
-                        : category == 'cancel'
-                           ? 'Apakah anda yakin ingin membatalkan kegiatan? Pembatalan bersifat permanen'
-                           : category == 'update-calendar'
-                              ? 'Apakah Anda yakin ingin mengubah data acara ini? Data ini akan mempengaruhi semua data yang terkait'
-                              : 'Apakah anda yakin mengubah data?',
-                     onPress: () => {
-                        onPress && onPress()
-                     }
-                  })
+                  setShowModal(true)
                }
-            }
+            }}
+         />
 
+         <ModalConfirmation
+            visible={showModal}
+            title="Konfirmasi"
+            message={
+               category == 'create'
+                  ? 'Apakah anda yakin ingin menambahkan data?'
+                  : category == 'cancel'
+                     ? 'Apakah anda yakin ingin membatalkan kegiatan? Pembatalan bersifat permanen'
+                     : category == 'update-calendar'
+                        ? 'Apakah Anda yakin ingin mengubah data acara ini? Data ini akan mempengaruhi semua data yang terkait'
+                        : 'Apakah anda yakin mengubah data?'
             }
+            onConfirm={() => {
+               setShowModal(false)
+               onPress && onPress()
+            }}
+            onCancel={() => setShowModal(false)}
+            confirmText="Ya"
+            cancelText="Batal"
          />
       </>
    )

components/buttonSelect.tsx

@@ -22,14 +22,14 @@ export default function ButtonSelect({ value, onPress, round, error, errorText }
                Styles.inputRoundFormRight,
                round && Styles.round30,
                Styles.pv10,
-               { borderColor: colors.icon, backgroundColor: colors.card },
+               { borderColor: colors.icon + '20', backgroundColor: colors.input },
                error && { borderColor: "red" }
             ]}>
                <Feather name="arrow-right-circle" size={20} color={colors.text} />
                <Text style={[{ color: colors.text }]}>{value}</Text>
             </View>
          </Pressable>
-         {error && (<Text style={[Styles.textInformation, Styles.mt05, Styles.cError]}>{errorText}</Text>)}
+         {error && (<Text style={[Styles.textInformation, Styles.mt05, { color: colors.error }]}>{errorText}</Text>)}
       </View>
    )
 }

components/buttonSetting.tsx

@@ -0,0 +1,33 @@
+import Styles from "@/constants/Styles";
+import { useTheme } from "@/providers/ThemeProvider";
+import { ReactNode } from "react";
+import { Pressable, View } from "react-native";
+import Text from "./Text";
+
+type Props = {
+   title: string
+   onPress?: () => void,
+   icon?: ReactNode,
+   borderBottom?: boolean
+   value?: string
+}
+
+export default function ButtonSetting({ title, onPress, icon, borderBottom = true, value }: Props) {
+   const { colors } = useTheme();
+   return (
+      <Pressable onPress={onPress}>
+         <View style={[
+            Styles.p10,
+            Styles.rowSpaceBetween,
+            { borderBottomWidth: borderBottom ? 1 : 0, borderColor: colors.icon + '20' },
+         ]}>
+            <View style={[Styles.rowItemsCenter]}>
+               {icon}
+               <Text style={[{ color: colors.text }, Styles.ml05]}>{title}</Text>
+            </View>
+            {value && <Text style={[{ color: colors.dimmed }]}>{value}</Text>}
+         </View>
+      </Pressable>
+   )
+
+}

components/calendar/headerCalendarDetail.tsx

@@ -9,7 +9,7 @@ import { useState } from "react"
 import { View } from "react-native"
 import Toast from "react-native-toast-message"
 import { useDispatch, useSelector } from "react-redux"
-import AlertKonfirmasi from "../alertKonfirmasi"
+import ModalConfirmation from "../ModalConfirmation"
 import ButtonMenuHeader from "../buttonMenuHeader"
 import DrawerBottom from "../drawerBottom"
 import MenuItemRow from "../menuItemRow"
@@ -23,6 +23,7 @@ export default function HeaderRightCalendarDetail({ id, idReminder }: Props) {
    const { colors } = useTheme()
    const [isVisible, setVisible] = useState(false)
    const { token, decryptToken } = useAuthSession()
+   const [showDeleteModal, setShowDeleteModal] = useState(false)
    const update = useSelector((state: any) => state.calendarUpdate)
    const dispatch = useDispatch()
 
@@ -51,7 +52,7 @@ export default function HeaderRightCalendarDetail({ id, idReminder }: Props) {
          <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<MaterialIcons name="groups" color={colors.text} size={25} />}
+                  icon={<MaterialCommunityIcons name="account-group-outline" color={colors.text} size={25} />}
                   title="Tambah Anggota"
                   onPress={() => {
                      setVisible(false)
@@ -67,21 +68,30 @@ export default function HeaderRightCalendarDetail({ id, idReminder }: Props) {
                   }}
                />
                <MenuItemRow
-                  icon={<Ionicons name="trash" color={colors.text} size={25} />}
+                  icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
                   title="Hapus"
                   onPress={() => {
                      setVisible(false)
-                     AlertKonfirmasi({
-                        title: 'Konfirmasi',
-                        desc: 'Apakah anda yakin ingin menghapus data ini? Data ini akan mempengaruhi semua data yang terkait',
-                        onPress: () => {
-                           handleDeleteCalendar()
-                        }
-                     })
+                     setTimeout(() => {
+                        setShowDeleteModal(true)
+                     }, 600)
                   }}
                />
             </View>
          </DrawerBottom>
+
+         <ModalConfirmation
+            visible={showDeleteModal}
+            title="Konfirmasi"
+            message="Apakah anda yakin ingin menghapus data ini? Data ini akan mempengaruhi semua data yang terkait"
+            onConfirm={() => {
+               setShowDeleteModal(false)
+               handleDeleteCalendar()
+            }}
+            onCancel={() => setShowDeleteModal(false)}
+            confirmText="Hapus"
+            cancelText="Batal"
+         />
       </>
    )
 }

components/calendar/headerCalendarList.tsx

@@ -49,7 +49,7 @@ export default function HeaderRightCalendarList() {
                      <></>
                   ) : (
                      <MenuItemRow
-                        icon={<AntDesign name="pluscircle" color={colors.text} size={25} />}
+                        icon={<AntDesign name="pluscircleo" color={colors.text} size={25} />}
                         title="Tambah Acara"
                         onPress={() => {
                            setVisible(false)

components/calendar/itemHistoryEvent.tsx

@@ -21,7 +21,7 @@ export default function ItemHistoryEvent({ data }: { data: Props }) {
          {
             data.length > 0 ? (
                data.map((item, index) => (
-                  <View key={index} style={[{ flexDirection: 'row' }, Styles.mv05, activeTheme === 'dark' ? { backgroundColor: colors.card } : ColorsStatus.lightGreen, Styles.p10, Styles.round10, { borderBottomWidth: 1, borderColor: colors.background }]}>
+                  <View key={index} style={[{ flexDirection: 'row' }, Styles.mv05, activeTheme === 'dark' ? { backgroundColor: colors.card } : ColorsStatus.lightGreen, Styles.p10, Styles.round05, { borderBottomWidth: 1, borderColor: colors.background }]}>
                      <View style={[Styles.mr10, Styles.ph05]}>
                         <Text style={[Styles.textSubtitle]}>{String(item.dateStart)}</Text>
                         <Text style={[Styles.textDefault, { textAlign: 'center' }]}>{item.year}</Text>
@@ -40,7 +40,7 @@ export default function ItemHistoryEvent({ data }: { data: Props }) {
                ))
             ) : (
                <View style={[Styles.p15]}>
-                  <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
+                  <Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada data</Text>
                </View>
             )
          }

components/discussion/headerDiscussionDetail.tsx

@@ -9,7 +9,7 @@ import { useState } from "react"
 import { View } from "react-native"
 import Toast from "react-native-toast-message"
 import { useDispatch, useSelector } from "react-redux"
-import AlertKonfirmasi from "../alertKonfirmasi"
+import ModalConfirmation from "../ModalConfirmation"
 import ButtonMenuHeader from "../buttonMenuHeader"
 import DrawerBottom from "../drawerBottom"
 import MenuItemRow from "../menuItemRow"
@@ -25,6 +25,8 @@ export default function HeaderRightDiscussionDetail({ id, status, isActive }: Pr
    const [isVisible, setVisible] = useState(false)
    const { token, decryptToken } = useAuthSession()
    const update = useSelector((state: any) => state.discussionUpdate)
+   const [showModal, setShowModal] = useState(false)
+   const [modalConfig, setModalConfig] = useState({ title: '', message: '', onConfirm: () => { } })
    const dispatch = useDispatch()
 
    const handleOpenClose = async () => {
@@ -86,13 +88,14 @@ export default function HeaderRightDiscussionDetail({ id, status, isActive }: Pr
                         title={status == 1 ? 'Tutup Diskusi' : 'Buka Diskusi'}
                         onPress={() => {
                            setVisible(false)
-                           AlertKonfirmasi({
-                              title: 'Konfirmasi',
-                              desc: `Apakah anda yakin ingin ${status == 1 ? 'menutup' : 'membuka'} diskusi?`,
-                              onPress: () => {
-                                 handleOpenClose()
-                              }
-                           })
+                           setTimeout(() => {
+                              setModalConfig({
+                                 title: 'Konfirmasi',
+                                 message: `Apakah anda yakin ingin ${status == 1 ? 'menutup' : 'membuka'} diskusi?`,
+                                 onConfirm: () => handleOpenClose()
+                              })
+                              setShowModal(true)
+                           }, 600)
                         }}
                      />
                   </>
@@ -102,17 +105,31 @@ export default function HeaderRightDiscussionDetail({ id, status, isActive }: Pr
                   title={isActive ? 'Arsipkan' : 'Aktifkan Diskusi'}
                   onPress={() => {
                      setVisible(false)
-                     AlertKonfirmasi({
-                        title: 'Konfirmasi',
-                        desc: isActive ? 'Apakah anda yakin ingin mengarsipkan diskusi?' : 'Apakah anda yakin ingin mengaktifkan diskusi?',
-                        onPress: () => {
-                           handleArchive()
-                        }
-                     })
+                     setTimeout(() => {
+                        setModalConfig({
+                           title: 'Konfirmasi',
+                           message: isActive ? 'Apakah anda yakin ingin mengarsipkan diskusi?' : 'Apakah anda yakin ingin mengaktifkan diskusi?',
+                           onConfirm: () => handleArchive()
+                        })
+                        setShowModal(true)
+                     }, 600)
                   }}
                />
             </View>
          </DrawerBottom>
+
+         <ModalConfirmation
+            visible={showModal}
+            title={modalConfig.title}
+            message={modalConfig.message}
+            onConfirm={() => {
+               setShowModal(false)
+               modalConfig.onConfirm()
+            }}
+            onCancel={() => setShowModal(false)}
+            confirmText="Ya"
+            cancelText="Batal"
+         />
       </>
    )
 }

components/discussion/headerDiscussionList.tsx

@@ -47,7 +47,7 @@ export default function HeaderRightDiscussionList() {
          <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<AntDesign name="pluscircle" color={colors.text} size={25} />}
+                  icon={<AntDesign name="pluscircleo" color={colors.text} size={25} />}
                   title="Tambah Diskusi"
                   onPress={() => {
                      setVisible(false)

components/discussion_general/headerDiscussionDetail.tsx

@@ -9,7 +9,7 @@ import { useState } from "react"
 import { View } from "react-native"
 import Toast from "react-native-toast-message"
 import { useDispatch, useSelector } from "react-redux"
-import AlertKonfirmasi from "../alertKonfirmasi"
+import ModalConfirmation from "../ModalConfirmation"
 import ButtonMenuHeader from "../buttonMenuHeader"
 import DrawerBottom from "../drawerBottom"
 import MenuItemRow from "../menuItemRow"
@@ -25,6 +25,8 @@ export default function HeaderRightDiscussionGeneralDetail({ id, active, status
    const { colors } = useTheme();
    const [isVisible, setVisible] = useState(false)
    const entityUser = useSelector((state: any) => state.user)
+   const [showModal, setShowModal] = useState(false)
+   const [modalConfig, setModalConfig] = useState({ title: '', message: '', onConfirm: () => { } })
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.discussionGeneralDetailUpdate)
 
@@ -61,7 +63,7 @@ export default function HeaderRightDiscussionGeneralDetail({ id, active, status
          <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<MaterialIcons name="groups" color={colors.text} size={25} />}
+                  icon={<MaterialCommunityIcons name="account-group-outline" color={colors.text} size={25} />}
                   title="Anggota"
                   onPress={() => {
                      setVisible(false)
@@ -88,13 +90,14 @@ export default function HeaderRightDiscussionGeneralDetail({ id, active, status
                                     title={status == 1 ? 'Tutup Diskusi' : 'Buka Diskusi'}
                                     onPress={() => {
                                        setVisible(false)
-                                       AlertKonfirmasi({
-                                          title: 'Konfirmasi',
-                                          desc: status == 1 ? 'Apakah anda yakin ingin menutup diskusi?' : 'Apakah anda yakin ingin membuka diskusi?',
-                                          onPress: () => {
-                                             handleUpdateStatus()
-                                          }
-                                       })
+                                       setTimeout(() => {
+                                          setModalConfig({
+                                             title: 'Konfirmasi',
+                                             message: status == 1 ? 'Apakah anda yakin ingin menutup diskusi?' : 'Apakah anda yakin ingin membuka diskusi?',
+                                             onConfirm: () => handleUpdateStatus()
+                                          })
+                                          setShowModal(true)
+                                       }, 600)
                                     }}
                                  />
                               </>
@@ -105,11 +108,14 @@ export default function HeaderRightDiscussionGeneralDetail({ id, active, status
                               title="Aktifkan Diskusi"
                               onPress={() => {
                                  setVisible(false)
-                                 AlertKonfirmasi({
-                                    title: 'Konfirmasi',
-                                    desc: 'Apakah anda yakin ingin mengaktifkan diskusi ini?',
-                                    onPress: () => { handleDelete() }
-                                 })
+                                 setTimeout(() => {
+                                    setModalConfig({
+                                       title: 'Konfirmasi',
+                                       message: 'Apakah anda yakin ingin mengaktifkan diskusi ini?',
+                                       onConfirm: () => handleDelete()
+                                    })
+                                    setShowModal(true)
+                                 }, 600)
                               }}
                            />
 
@@ -125,16 +131,32 @@ export default function HeaderRightDiscussionGeneralDetail({ id, active, status
                      title="Arsipkan"
                      onPress={() => {
                         setVisible(false)
-                        AlertKonfirmasi({
-                           title: 'Konfirmasi',
-                           desc: 'Apakah anda yakin ingin mengarsipkan diskusi?',
-                           onPress: () => { handleDelete() }
-                        })
+                        setTimeout(() => {
+                           setModalConfig({
+                              title: 'Konfirmasi',
+                              message: 'Apakah anda yakin ingin mengarsipkan diskusi?',
+                              onConfirm: () => handleDelete()
+                           })
+                           setShowModal(true)
+                        }, 600)
                      }}
                   />
                </View>
             }
          </DrawerBottom>
+
+         <ModalConfirmation
+            visible={showModal}
+            title={modalConfig.title}
+            message={modalConfig.message}
+            onConfirm={() => {
+               setShowModal(false)
+               modalConfig.onConfirm()
+            }}
+            onCancel={() => setShowModal(false)}
+            confirmText="Ya"
+            cancelText="Batal"
+         />
       </>
    )
 }

components/discussion_general/headerDiscussionGeneral.tsx

@@ -25,7 +25,7 @@ export default function HeaderDiscussionGeneral() {
          <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<AntDesign name="pluscircle" color={colors.text} size={25} />}
+                  icon={<AntDesign name="pluscircleo" color={colors.text} size={25} />}
                   title="Tambah Diskusi"
                   onPress={() => {
                      setVisible(false)

components/division/FiturGridItem.tsx

@@ -0,0 +1,38 @@
+import Styles from "@/constants/Styles";
+import { useTheme } from "@/providers/ThemeProvider";
+import React from "react";
+import { Pressable, View } from "react-native";
+import Text from "../Text";
+
+type Props = {
+   title: string;
+   subtitle: string;
+   icon: React.ReactNode;
+   onPress: () => void;
+};
+
+export default function FiturGridItem({ title, subtitle, icon, onPress }: Props) {
+   const { colors } = useTheme();
+
+   return (
+      <Pressable
+         onPress={onPress}
+         style={({ pressed }) => [
+            Styles.wrapGridItem,
+            {
+               backgroundColor: colors.card,
+               borderColor: colors.icon + '20',
+            },
+            pressed && { opacity: 0.7 }
+         ]}
+      >
+         <View style={[Styles.p05, { marginRight: 10 }]}>
+            {icon}
+         </View>
+         <View style={{ flex: 1 }}>
+            <Text style={[Styles.textDefaultSemiBold, { color: colors.text, lineHeight: 20 }]} numberOfLines={1}>{title}</Text>
+            <Text style={[Styles.textMediumNormal, { color: colors.dimmed, lineHeight: 15 }]} numberOfLines={1}>{subtitle}</Text>
+         </View>
+      </Pressable>
+   );
+}

components/division/discussionDivisionDetail.tsx

@@ -1,13 +1,13 @@
 import Styles from "@/constants/Styles";
 import { apiGetDivisionOneFeature } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
+import { useTheme } from "@/providers/ThemeProvider";
 import { router, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
 import { View } from "react-native";
 import Text from "../Text";
 import DiscussionItem from "../discussionItem";
 import Skeleton from "../skeleton";
-import { useTheme } from "@/providers/ThemeProvider";
 
 type Props = {
   id: string;
@@ -54,8 +54,7 @@ export default function DiscussionDivisionDetail({ refreshing }: { refreshing: b
   return (
     <View style={[Styles.mb15]}>
       <Text style={[Styles.textDefaultSemiBold, Styles.mv10]}>Diskusi</Text>
-      <View style={[Styles.wrapPaper, { backgroundColor: colors.card, borderColor: colors.background }]}>
-
+      <View style={[Styles.wrapPaper, { backgroundColor: colors.card, borderColor: colors.icon + '20' }, Styles.p0]}>
         {
           loading ?
             <>
@@ -76,9 +75,7 @@ export default function DiscussionDivisionDetail({ refreshing }: { refreshing: b
                 />
               ))
             ) : (
-              <Text
-                style={[Styles.textDefault, Styles.cGray, { textAlign: "center" }]}
-              >
+              <Text style={[Styles.textDefault, { textAlign: "center", color: colors.dimmed }]} >
                 Tidak ada diskusi
               </Text>
             )

components/division/fileDivisionDetail.tsx

@@ -112,8 +112,8 @@ export default function FileDivisionDetail({ refreshing }: { refreshing: boolean
                         data.map((item, index) => (
                            <Pressable style={[Styles.mr05, { width: '24%' }]} key={index} onPress={() => openFile(item)}>
                               <View style={{ alignItems: 'center' }}>
-                                 <View style={[Styles.wrapPaper, { alignItems: 'center' }]}>
-                                    <Feather name="file-text" size={50} color="black" style={Styles.mr05} />
+                                 <View style={[Styles.wrapPaper, { alignItems: 'center', backgroundColor: colors.card, borderWidth: 1, borderColor: colors.icon + '20' }]}>
+                                    <Feather name="file-text" size={50} color={colors.text} style={Styles.mr05} />
                                  </View>
                               </View>
                               <View style={[Styles.contentItemCenter]}>
@@ -154,7 +154,7 @@ export default function FileDivisionDetail({ refreshing }: { refreshing: boolean
                   //    )}
                   // />
                   :
-                  <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada file</Text>
+                  <Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada file</Text>
          }
       </View>
    )

components/division/fiturDivisionDetail.tsx

@@ -2,13 +2,13 @@ import { ColorsStatus } from "@/constants/ColorsStatus"
 import Styles from "@/constants/Styles"
 import { apiGetDivisionOneFeature } from "@/lib/api"
 import { useAuthSession } from "@/providers/AuthProvider"
-import { AntDesign, MaterialIcons, SimpleLineIcons } from "@expo/vector-icons"
+import { AntDesign, Feather, MaterialIcons, SimpleLineIcons } from "@expo/vector-icons"
 import { router, useLocalSearchParams } from "expo-router"
 import { useEffect, useState } from "react"
 import { View } from "react-native"
-import BorderBottomItem from "../borderBottomItem"
 import { useTheme } from "@/providers/ThemeProvider"
 import Text from "../Text"
+import FiturGridItem from "./FiturGridItem"
 
 type Props = {
    tugas: number
@@ -50,66 +50,34 @@ export default function FiturDivisionDetail({ refreshing }: { refreshing: boolea
    return (
       <View style={[Styles.mb15]}>
          <Text style={[Styles.textDefaultSemiBold, Styles.mv05]}>Fitur</Text>
-         <View>
-            <View style={[Styles.rowSpaceBetween]}>
-               <BorderBottomItem
-                  bgColor={colors.card}
-                  borderType="all"
-                  icon={
-                     <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                        <AntDesign name="filetext1" size={25} color={colors.primary} />
-                     </View>
-                  }
-                  title="Tugas"
-                  subtitle={`${data.tugas} Tugas`}
-                  width={28}
-                  onPress={() => { router.push(`/division/${id}/task?status=0`) }}
-               />
+         <View style={{ flexDirection: 'row', flexWrap: 'wrap', justifyContent: 'space-between' }}>
+            <FiturGridItem
+               title="Tugas"
+               subtitle={`${data.tugas} Tugas`}
+               icon={<AntDesign name="filetext1" size={28} color={colors.text} />}
+               onPress={() => { router.push(`/division/${id}/task?status=0`) }}
+            />
 
-               <BorderBottomItem
-                  bgColor={colors.card}
-                  borderType="all"
-                  icon={
-                     <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                        <MaterialIcons name="attach-file" size={25} color={colors.primary} />
-                     </View>
-                  }
-                  title="Dokumen"
-                  subtitle={`${data.dokumen} File`}
-                  width={28}
-                  onPress={() => { router.push(`/division/${id}/document`) }}
-               />
-            </View>
+            <FiturGridItem
+               title="Dokumen"
+               subtitle={`${data.dokumen} File`}
+               icon={<Feather name="paperclip" size={28} color={colors.text} />}
+               onPress={() => { router.push(`/division/${id}/document`) }}
+            />
 
-            <View style={[Styles.rowSpaceBetween]}>
-               <BorderBottomItem
-                  bgColor={colors.card}
-                  borderType="all"
-                  icon={
-                     <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                        <SimpleLineIcons name="bubbles" size={25} color={colors.primary} />
-                     </View>
-                  }
-                  title="Diskusi"
-                  subtitle={`${data.diskusi} Diskusi`}
-                  width={28}
-                  onPress={() => { router.push(`/division/${id}/discussion?active=true`) }}
-               />
+            <FiturGridItem
+               title="Diskusi"
+               subtitle={`${data.diskusi} Diskusi`}
+               icon={<SimpleLineIcons name="bubbles" size={28} color={colors.text} />}
+               onPress={() => { router.push(`/division/${id}/discussion?active=true`) }}
+            />
 
-               <BorderBottomItem
-                  bgColor={colors.card}
-                  borderType="all"
-                  icon={
-                     <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                        <AntDesign name="calendar" size={25} color={colors.primary} />
-                     </View>
-                  }
-                  title="Kalender"
-                  subtitle={`${data.kalender} Acara`}
-                  width={28}
-                  onPress={() => { router.push(`/division/${id}/calendar`) }}
-               />
-            </View>
+            <FiturGridItem
+               title="Kalender"
+               subtitle={`${data.kalender} Acara`}
+               icon={<AntDesign name="calendar" size={28} color={colors.text} />}
+               onPress={() => { router.push(`/division/${id}/calendar`) }}
+            />
          </View>
       </View>
    )

components/division/headerDivisionInfo.tsx

@@ -8,7 +8,7 @@ import { useState } from "react"
 import { View } from "react-native"
 import Toast from "react-native-toast-message"
 import { useDispatch, useSelector } from "react-redux"
-import AlertKonfirmasi from "../alertKonfirmasi"
+import ModalConfirmation from "../ModalConfirmation"
 import ButtonMenuHeader from "../buttonMenuHeader"
 import DrawerBottom from "../drawerBottom"
 import MenuItemRow from "../menuItemRow"
@@ -23,6 +23,7 @@ export default function HeaderRightDivisionInfo({ id, active }: Props) {
    const { colors } = useTheme();
    const [isVisible, setVisible] = useState(false)
    const { token, decryptToken } = useAuthSession()
+   const [showModal, setShowModal] = useState(false)
    const update = useSelector((state: any) => state.divisionUpdate)
    const dispatch = useDispatch()
 
@@ -62,15 +63,26 @@ export default function HeaderRightDivisionInfo({ id, active }: Props) {
                   title={active ? "Non Aktifkan" : "Aktifkan"}
                   onPress={() => {
                      setVisible(false)
-                     AlertKonfirmasi({
-                        title: 'Konfirmasi',
-                        desc: active ? 'Apakah anda yakin ingin menonaktifkan divisi?' : 'Apakah anda yakin ingin mengaktifkan divisi?',
-                        onPress: () => { handleUpdateStatus() }
-                     })
+                     setTimeout(() => {
+                        setShowModal(true)
+                     }, 600)
                   }}
                />
             </View>
          </DrawerBottom>
+
+         <ModalConfirmation
+            visible={showModal}
+            title="Konfirmasi"
+            message={active ? 'Apakah anda yakin ingin menonaktifkan divisi?' : 'Apakah anda yakin ingin mengaktifkan divisi?'}
+            onConfirm={() => {
+               setShowModal(false)
+               handleUpdateStatus()
+            }}
+            onCancel={() => setShowModal(false)}
+            confirmText="Konfirmasi"
+            cancelText="Batal"
+         />
       </>
    )
 }

components/division/headerDivisionList.tsx

@@ -25,7 +25,7 @@ export default function HeaderRightDivisionList() {
          <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<AntDesign name="pluscircle" color={colors.text} size={25} />}
+                  icon={<AntDesign name="pluscircleo" color={colors.text} size={25} />}
                   title="Tambah Divisi"
                   onPress={() => {
                      setVisible(false)

components/division/taskDivisionDetail.tsx

@@ -1,13 +1,13 @@
 import Styles from "@/constants/Styles";
 import { apiGetDivisionOneFeature } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
+import { useTheme } from "@/providers/ThemeProvider";
 import { Feather } from "@expo/vector-icons";
 import { router, useLocalSearchParams } from "expo-router";
 import React, { useEffect, useState } from "react";
 import { Dimensions, Pressable, View } from "react-native";
 import { ICarouselInstance } from "react-native-reanimated-carousel";
 import Skeleton from "../skeleton";
-import { useTheme } from "@/providers/ThemeProvider";
 import Text from "../Text";
 
 type Props = {
@@ -59,11 +59,11 @@ export default function TaskDivisionDetail({ refreshing }: { refreshing: boolean
                :
                data.length > 0 ?
                   data.map((item, index) => (
-                     <Pressable key={index} style={[Styles.wrapPaper, Styles.mb05, { backgroundColor: colors.card, borderColor: colors.background }]} onPress={() => { router.push(`/division/${id}/task/${item.idProject}`) }}>
+                     <Pressable key={index} style={[Styles.wrapPaper, Styles.mb10, { backgroundColor: colors.card, borderWidth: 1, borderColor: colors.icon + '20' }]} onPress={() => { router.push(`/division/${id}/task/${item.idProject}`) }}>
                         <Text style={[Styles.textDefaultSemiBold]} numberOfLines={1} ellipsizeMode="tail">{item.title} - {item.projectTitle}</Text>
                         <View style={[Styles.rowItemsCenter, Styles.mt10]}>
-                           <Feather name="clock" size={18} color={colors.text} style={Styles.mr05} />
-                           <Text style={[Styles.textInformation]} numberOfLines={1} ellipsizeMode="tail">{item.dateStart} - {item.dateEnd}</Text>
+                           <Feather name="clock" size={18} color={colors.dimmed} style={Styles.mr05} />
+                           <Text style={[Styles.textInformation, { color: colors.dimmed }]} numberOfLines={1} ellipsizeMode="tail">{item.dateStart} - {item.dateEnd}</Text>
                         </View>
                      </Pressable>
                   ))
@@ -90,7 +90,7 @@ export default function TaskDivisionDetail({ refreshing }: { refreshing: boolean
                   //    )}
                   // />
                   :
-                  <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada tugas</Text>
+                  <Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada tugas</Text>
          }
       </View>
    )

components/document/itemFile.tsx

@@ -26,13 +26,13 @@ export default function ItemFile({ category, checked, dateTime, title, onChecked
                      ?
                      <>
                         <Ionicons name="folder-open-sharp" color={'#f9cc40'} size={40} />
-                        <MaterialCommunityIcons name="share" color={'gray'} size={25} style={[Styles.absoluteIcon]} />
+                        <MaterialCommunityIcons name="share" color={colors.tint} size={25} style={[Styles.absoluteIcon]} />
                      </>
                      : category == 'file-shared'
                         ?
                         <>
                            <Ionicons name="document-text-sharp" color={'#9fcff8'} size={40} />
-                           <MaterialCommunityIcons name="share" color={'gray'} size={25} style={[Styles.absoluteIcon]} />
+                           <MaterialCommunityIcons name="share" color={colors.tint} size={25} style={[Styles.absoluteIcon]} />
                         </>
                         :
                         category == 'folder'
@@ -47,8 +47,8 @@ export default function ItemFile({ category, checked, dateTime, title, onChecked
             </Pressable>
             <View style={[Styles.rowSpaceBetween, { flex: 1, alignItems: 'center' }]}>
                <Pressable style={[Styles.ml10, { flex: 1 },]} onPress={onPress}>
-                  <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode="tail">{title}</Text>
-                  <Text style={[Styles.textInformation]}>{dateTime}</Text>
+                  <Text style={[Styles.textDefault, { color: colors.text }]} numberOfLines={1} ellipsizeMode="tail">{title}</Text>
+                  <Text style={[Styles.textInformation, { color: colors.dimmed }]}>{dateTime}</Text>
                </Pressable>
                {
                   !canChecked ? <></>

components/document/menuBottomSelectDocument.tsx

@@ -6,7 +6,7 @@ import { useState } from "react";
 import { Pressable, ScrollView, View } from "react-native";
 import { useSharedValue } from "react-native-reanimated";
 import Toast from "react-native-toast-message";
-import AlertKonfirmasi from "../alertKonfirmasi";
+import ModalConfirmation from "../ModalConfirmation";
 import DrawerBottom from "../drawerBottom";
 import { InputForm } from "../inputForm";
 import ItemAccordion from "../itemAccordion";
@@ -29,6 +29,7 @@ export default function MenuBottomSelectDocument({ onDone }: Props) {
    const [isRename, setRename] = useState(false)
    const [isShare, setShare] = useState(false)
    const [isMoveCopy, setMoveCopy] = useState(false)
+   const [showDeleteModal, setShowDeleteModal] = useState(false)
    const [valMoveCopy, setValMoveCopy] = useState<'move' | 'copy'>('copy')
    const open = useSharedValue(false)
 
@@ -58,15 +59,7 @@ export default function MenuBottomSelectDocument({ onDone }: Props) {
                   icon={<MaterialCommunityIcons name="trash-can-outline" color="white" size={25} />}
                   title="Hapus"
                   onPress={() => {
-                     AlertKonfirmasi({
-                        title: 'Konfirmasi',
-                        desc: 'Apakah anda yakin ingin menghapus data?',
-
-                        onPress: () => {
-                           onDone()
-                           Toast.show({ type: 'small', text1: 'Berhasil menghapus data', })
-                        }
-                     })
+                     setShowDeleteModal(true)
                   }}
                   column="many"
                   color="white"
@@ -213,6 +206,20 @@ export default function MenuBottomSelectDocument({ onDone }: Props) {
             }}
          />
          <ModalSalinMove open={isMoveCopy} close={setMoveCopy} category={valMoveCopy} onConfirm={(value: string) => { }} dataChoose={[]} />
+
+         <ModalConfirmation
+            visible={showDeleteModal}
+            title="Konfirmasi"
+            message="Apakah anda yakin ingin menghapus data?"
+            onConfirm={() => {
+               setShowDeleteModal(false)
+               onDone()
+               Toast.show({ type: 'small', text1: 'Berhasil menghapus data', })
+            }}
+            onCancel={() => setShowDeleteModal(false)}
+            confirmText="Hapus"
+            cancelText="Batal"
+         />
       </>
    )
 }

components/document/modalInformasi.tsx

@@ -98,7 +98,7 @@ export default function ModalInformasi({ data }: { data: any }) {
                            )
                               : (
                                  <View style={[Styles.ml10, Styles.mt02]}>
-                                    <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
+                                    <Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada data</Text>
                                  </View>
                               )
                         }

components/document/modalSalinMove.tsx

@@ -94,21 +94,22 @@ export default function ModalSalinMove({ open, close, category, onConfirm, dataC
                            icon={<Ionicons name="folder-open-sharp" style={[found ? Styles.cGray : Styles.cFolder]} size={30} />}
                            title={item.name}
                            titleWeight="normal"
+                           bgColor="transparent"
                            onPress={() => {
                               if (found) return;
                               setPath(item.id);
                            }}
-                           subtitle={found ? <Text style={[Styles.textInformation, Styles.cGray]}>Tidak dapat memilih folder ini</Text> : ''}
+                           subtitle={found ? <Text style={[Styles.textInformation, { color: colors.dimmed }]}>Tidak dapat memilih folder ini</Text> : ''}
                         />
                      )
                   }
                   )
 
                   :
-                  <Text style={[Styles.textDefault, Styles.cGray, Styles.mt15, { textAlign: 'center' }]}>Tidak ada data</Text>
+                  <Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }, Styles.mt15]}>Tidak ada data</Text>
             }
          </View>
-         <View style={[Styles.rowOnly, Styles.mt15, Styles.absolute0, { backgroundColor: colors.background }]}>
+         <View style={[Styles.rowOnly, Styles.mt15, Styles.absolute0, { backgroundColor: colors.modalBackground }]}>
             <ModalNewFolder path={path} onCreated={() => getData()} />
             <Pressable style={[Styles.pv05, { width: '50%' }]} onPress={() => onConfirm(path)}>
                <Text style={[Styles.textDefaultSemiBold, { textAlign: 'center' }]}>{category == 'copy' ? 'SALIN' : 'PINDAH'}</Text>

components/drawerBottom.tsx

@@ -45,9 +45,9 @@ export default function DrawerBottom({ isVisible, setVisible, title, children, a
                   behavior={Platform.OS === 'ios' ? 'padding' : undefined}
                   keyboardVerticalOffset={0}
                >
-                  <View style={[Styles.modalContentNew, { height: tinggiFix, backgroundColor: colors.background }]}>
-                     <View style={[Styles.titleContainerNew, { borderBottomColor: colors.icon + '20' }]}>
-                        <Text numberOfLines={1} ellipsizeMode='tail' style={[Styles.textDefault, Styles.w90]}>{title}</Text>
+                  <View style={[Styles.modalContentNew, { height: tinggiFix, backgroundColor: colors.modalBackground }]}>
+                     <View style={[Styles.titleContainerNew]}>
+                        <Text numberOfLines={1} ellipsizeMode='tail' style={[Styles.textDefaultSemiBold, Styles.w90]}>{title}</Text>
                         <Pressable onPress={() => setVisible(false)}>
                            <MaterialIcons name="close" color={colors.text} size={22} />
                         </Pressable>
@@ -58,9 +58,9 @@ export default function DrawerBottom({ isVisible, setVisible, title, children, a
                   </View>
                </KeyboardAvoidingView>
                :
-               <View style={[Styles.modalContentNew, { height: tinggiFix, backgroundColor: colors.background }]}>
-                  <View style={[Styles.titleContainerNew, { borderBottomColor: colors.icon + '20' }]}>
-                     <Text numberOfLines={1} ellipsizeMode='tail' style={[Styles.textDefault, Styles.w90]}>{title}</Text>
+               <View style={[Styles.modalContentNew, { height: tinggiFix, backgroundColor: colors.modalBackground }]}>
+                  <View style={[Styles.titleContainerNew]}>
+                     <Text numberOfLines={1} ellipsizeMode='tail' style={[Styles.textDefaultSemiBold, Styles.w90]}>{title}</Text>
                      <Pressable onPress={() => setVisible(false)}>
                         <MaterialIcons name="close" color={colors.text} size={22} />
                      </Pressable>

components/eventItem.tsx

@@ -13,18 +13,25 @@ type Props = {
 }
 
 export default function EventItem({ category, title, user, jamAwal, jamAkhir, onPress }: Props) {
-   const { theme } = useTheme();
+   const { theme, colors } = useTheme();
 
    const getBackgroundColor = (cat: 'purple' | 'orange') => {
       if (theme === 'dark') {
-         return cat === 'orange' ? '#5A2D0C' : '#1F2255';
+         return cat === 'orange' ? '#547792' : '#1D546D';
       }
-      return cat === 'orange' ? '#FED6C5' : '#D8D8F1';
+      return cat === 'orange' ? '#D6E6F2' : '#A9B5DF';
+   };
+
+   const getStickColor = (cat: 'purple' | 'orange') => {
+      if (theme === 'dark') {
+         return cat === 'orange' ? '#94B4C1' : '#5F9598';
+      }
+      return cat === 'orange' ? '#F5F5F5' : '#7886C7' ;
    };
 
    return (
       <Pressable style={[Styles.itemEvent, { backgroundColor: getBackgroundColor(category) }]} onPress={onPress}>
-         <View style={[Styles.dividerEvent, { backgroundColor: category == 'orange' ? '#FB804C' : '#535FCA' }]} />
+         <View style={[Styles.dividerEvent, { backgroundColor: getStickColor(category) }]} />
          <View style={[Styles.w90]}>
             <Text>{jamAwal} - {jamAkhir}</Text>
             <Text numberOfLines={1} ellipsizeMode="tail" style={[Styles.textDefaultSemiBold, Styles.mv05]}>{title}</Text>

components/group/headerGroupList.tsx

@@ -64,7 +64,7 @@ export default function HeaderRightGroupList() {
          <DrawerBottom animation="slide" isVisible={isVisible} setVisible={() => setVisible(false)} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<AntDesign name="pluscircle" color={colors.text} size={25} />}
+                  icon={<AntDesign name="pluscircleo" color={colors.text} size={25} />}
                   title="Tambah Lembaga"
                   onPress={() => {
                      setVisible(false);
@@ -88,7 +88,7 @@ export default function HeaderRightGroupList() {
                      placeholder="Nama Lembaga Desa"
                      required label="Lembaga Desa"
                      error={error.title}
-                     bg={colors.card}
+                     bg={"transparent"}
                      errorText="Lembaga Desa tidak boleh kosong & minimal 3 karakter"
                      onChange={(val) => { validationForm(val, 'title') }}
                   />