Merge pull request 'upd: android input' (#44 ) from amalia/29-sept-25 into join

Reviewed-on: bip/mobile-darmasaba#44
upd: android input
2025-09-29 17:35:24 +08:00 · 2025-09-29 15:14:54 +08:00 · 2025-09-26 17:42:28 +08:00 · 2025-09-26 16:52:35 +08:00 · 2025-09-26 15:08:59 +08:00 · 2025-09-26 12:22:12 +08:00
32 changed files with 514 additions and 339 deletions
--- a/.easignore
+++ b/.easignore
@@ -38,4 +38,8 @@ yarn-error.*
 app-example

 x.ts
-x.sh
+x.sh
+
+.env
+
+android/
--- a/app.config.js
+++ b/app.config.js
@@ -4,7 +4,7 @@ export default {
   expo: {
      name: "Desa+",
      slug: "mobile-darmasaba",
-      version: "1.0.4",
+      version: "1.0.5", // Versi aplikasi (App Store)
      jsEngine: "jsc",
      orientation: "portrait",
      icon: "./assets/images/logo-icon-small.png",
@@ -14,6 +14,7 @@ export default {
      ios: {
         supportsTablet: true,
         bundleIdentifier: "mobiledarmasaba.app",
+         buildNumber: "2",
         infoPlist: {
            ITSAppUsesNonExemptEncryption: false,
            CFBundleDisplayName: "Desa+"
@@ -22,7 +23,7 @@ export default {
      },
      android: {
         package: "mobiledarmasaba.app",
-         versionCode: 8,
+         versionCode: 9,
         adaptiveIcon: {
            foregroundImage: "./assets/images/logo-icon-small.png",
            backgroundColor: "#ffffff"
--- a/app/(application)/discussion/[id].tsx
+++ b/app/(application)/discussion/[id].tsx
@@ -153,14 +153,13 @@ export default function DetailDiscussionGeneral() {
                                 <MaterialIcons name="chat" size={25} color={'#384288'} />
                              </View>
                           }
-                           title={data?.title}
+                           title={data?.title + " " + data?.createdAt}
                           subtitle={
                              !data?.isActive ?
                                 <LabelStatus category='warning' text='ARSIP' size="small" />
                                 :
                                 <LabelStatus category={data.status == 1 ? 'success' : 'error'} text={data.status == 1 ? 'BUKA' : 'TUTUP'} size="small" />
                           }
-                           rightTopInfo={data?.createdAt}
                           desc={data?.desc}
                           leftBottomInfo={
                              <View style={[Styles.rowItemsCenter]}>
@@ -168,6 +167,11 @@ export default function DetailDiscussionGeneral() {
                                 <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>{dataKomentar.length} Komentar</Text>
                              </View>
                           }
+                           rightBottomInfo={
+                              <View style={[Styles.rowItemsCenter]}>
+                                 <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>{data?.createdAt}</Text>
+                              </View>
+                           }
                        />
                  }
                  <View style={[Styles.p15]}>
@@ -214,11 +218,16 @@ export default function DetailDiscussionGeneral() {
                     bg="white"
                     onChange={setKomentar}
                     value={komentar}
+                     multiline
                     itemRight={
                        <Pressable onPress={() => {
                           (komentar != '' && data?.status === 1 && data?.isActive && (memberDiscussion || (entityUser.role != "user" && entityUser.role != "coadmin")))
                              && handleKomentar()
-                        }}>
+                        }}
+                           style={[
+                              Platform.OS == 'android' && Styles.mb12,
+                           ]}
+                        >
                           <MaterialIcons name="send" size={25} style={(komentar == '' || data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin"))) ? Styles.cGray : Styles.cDefault} />
                        </Pressable>
                     }
--- a/app/(application)/discussion/index.tsx
+++ b/app/(application)/discussion/index.tsx
@@ -98,22 +98,26 @@ export default function Discussion() {
   return (
      <View style={[Styles.p15, { flex: 1 }]}>
         <View>
-            <View style={[Styles.wrapBtnTab]}>
-               <ButtonTab
-                  active={status == "false" ? "false" : "true"}
-                  value="true"
-                  onPress={() => { setStatus("true") }}
-                  label="Aktif"
-                  icon={<Feather name="check-circle" color={status == "false" ? 'black' : 'white'} size={20} />}
-                  n={2} />
-               <ButtonTab
-                  active={status == "false" ? "false" : "true"}
-                  value="false"
-                  onPress={() => { setStatus("false") }}
-                  label="Arsip"
-                  icon={<AntDesign name="closecircleo" color={status == "true" ? 'black' : 'white'} size={20} />}
-                  n={2} />
-            </View>
+            {
+               entityUser.role != "user" && entityUser.role != "coadmin" &&
+               <View style={[Styles.wrapBtnTab]}>
+                  <ButtonTab
+                     active={status == "false" ? "false" : "true"}
+                     value="true"
+                     onPress={() => { setStatus("true") }}
+                     label="Aktif"
+                     icon={<Feather name="check-circle" color={status == "false" ? 'black' : 'white'} size={20} />}
+                     n={2} />
+                  <ButtonTab
+                     active={status == "false" ? "false" : "true"}
+                     value="false"
+                     onPress={() => { setStatus("false") }}
+                     label="Arsip"
+                     icon={<AntDesign name="closecircleo" color={status == "true" ? 'black' : 'white'} size={20} />}
+                     n={2} />
+               </View>
+            }
+
            <InputSearch onChange={setSearch} />
            {
               (entityUser.role == "supadmin" || entityUser.role == "developer") &&
--- a/app/(application)/discussion/member/[id].tsx
+++ b/app/(application)/discussion/member/[id].tsx
@@ -135,22 +135,25 @@ export default function MemberDiscussionDetail() {
                     router.push(`/member/${chooseUser.idUser}`)
                  }}
               />
+               {
+                  entityUser.role != "user" && entityUser.role != "coadmin" &&
+                  <MenuItemRow
+                     icon={<MaterialCommunityIcons name="account-remove" color="black" size={25} />}
+                     title="Keluarkan"
+                     onPress={() => {
+                        setModal(false)
+                        AlertKonfirmasi({
+                           title: 'Konfirmasi',
+                           desc: 'Apakah Anda yakin ingin mengeluarkan anggota?',
+                           onPress: () => {
+                              handleDeleteUser()
+                           }
+                        })

-               <MenuItemRow
-                  icon={<MaterialCommunityIcons name="account-remove" color="black" size={25} />}
-                  title="Keluarkan"
-                  onPress={() => {
-                     setModal(false)
-                     AlertKonfirmasi({
-                        title: 'Konfirmasi',
-                        desc: 'Apakah Anda yakin ingin mengeluarkan anggota?',
-                        onPress: () => {
-                           handleDeleteUser()
-                        }
-                     })
+                     }}
+                  />
+               }

-                  }}
-               />
            </View>
         </DrawerBottom>
      </SafeAreaView>
--- a/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx
+++ b/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx
@@ -304,6 +304,7 @@ export default function DiscussionDetail() {
                     bg="white"
                     type="default"
                     round
+                     multiline
                     placeholder="Kirim Komentar"
                     onChange={setKomentar}
                     value={komentar}
@@ -323,12 +324,15 @@ export default function DiscussionDetail() {
                                    entityUser.role == "cosupadmin") &&
                                 handleKomentar();
                           }}
+                           style={[
+                              Platform.OS == 'android' && Styles.mb12,
+                           ]}
                        >
                           <MaterialIcons
                              name="send"
                              size={25}
                              style={
-                                 komentar == "" ||
+                                 [komentar == "" ||
                                    loadingSend ||
                                    data?.status == 2 ||
                                    data?.isActive == false ||
@@ -336,7 +340,8 @@ export default function DiscussionDetail() {
                                       entityUser.role == "coadmin") &&
                                       !isMemberDivision)
                                    ? Styles.cGray
-                                    : Styles.cDefault
+                                    : Styles.cDefault,
+                                 ]
                              }
                           />
                        </Pressable>
--- a/app/(application)/division/[id]/(fitur-division)/discussion/index.tsx
+++ b/app/(application)/division/[id]/(fitur-division)/discussion/index.tsx
@@ -7,7 +7,7 @@ import SkeletonContent from "@/components/skeletonContent";
 import Text from "@/components/Text";
 import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
-import { apiGetDiscussion } from "@/lib/api";
+import { apiGetDiscussion, apiGetDivisionOneFeature } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign, Feather, Ionicons } from "@expo/vector-icons";
 import { router, useLocalSearchParams } from "expo-router";
@@ -41,6 +41,30 @@ export default function DiscussionDivision() {
   const [waiting, setWaiting] = useState(false)
   const [status, setStatus] = useState<'true' | 'false'>('true')
   const [refreshing, setRefreshing] = useState(false)
+   const [isMemberDivision, setIsMemberDivision] = useState(false)
+   const [isAdminDivision, setIsAdminDivision] = useState(false)
+   const entityUser = useSelector((state: any) => state.user)
+
+   async function handleCheckMember() {
+      try {
+         const hasil = await decryptToken(String(token?.current));
+         const response = await apiGetDivisionOneFeature({
+            id,
+            user: hasil,
+            cat: "check-member",
+         });
+
+         const response2 = await apiGetDivisionOneFeature({
+            id,
+            user: hasil,
+            cat: "check-admin",
+         });
+         setIsMemberDivision(response.data);
+         setIsAdminDivision(response2.data);
+      } catch (error) {
+         console.error(error);
+      }
+   }

   async function handleLoad(loading: boolean, thisPage: number) {
      try {
@@ -80,6 +104,10 @@ export default function DiscussionDivision() {
      }, 1000);
   }

+   useEffect(() => {
+      handleCheckMember()
+   }, [])
+
   const handleRefresh = async () => {
      setRefreshing(true)
      handleLoad(false, 1)
@@ -101,25 +129,29 @@ export default function DiscussionDivision() {

   return (
      <View style={[Styles.p15, { flex: 1 }]}>
-         <View>
-            <View style={[Styles.wrapBtnTab]}>
-               <ButtonTab
-                  active={status == "false" ? "false" : "true"}
-                  value="true"
-                  onPress={() => { setStatus("true") }}
-                  label="Aktif"
-                  icon={<Feather name="check-circle" color={status == "false" ? 'black' : 'white'} size={20} />}
-                  n={2} />
-               <ButtonTab
-                  active={status == "false" ? "false" : "true"}
-                  value="false"
-                  onPress={() => { setStatus("false") }}
-                  label="Arsip"
-                  icon={<AntDesign name="closecircleo" color={status == "true" ? 'black' : 'white'} size={20} />}
-                  n={2} />
+         {
+            ((entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision) &&
+            <View>
+               <View style={[Styles.wrapBtnTab]}>
+                  <ButtonTab
+                     active={status == "false" ? "false" : "true"}
+                     value="true"
+                     onPress={() => { setStatus("true") }}
+                     label="Aktif"
+                     icon={<Feather name="check-circle" color={status == "false" ? 'black' : 'white'} size={20} />}
+                     n={2} />
+                  <ButtonTab
+                     active={status == "false" ? "false" : "true"}
+                     value="false"
+                     onPress={() => { setStatus("false") }}
+                     label="Arsip"
+                     icon={<AntDesign name="closecircleo" color={status == "true" ? 'black' : 'white'} size={20} />}
+                     n={2} />
+               </View>
+               <InputSearch onChange={setSearch} />
            </View>
-            <InputSearch onChange={setSearch} />
-         </View>
+         }
+

         <View style={[{ flex: 2 }, Styles.mt05]}>
            {
--- a/app/(application)/division/[id]/(fitur-division)/document/index.tsx
+++ b/app/(application)/division/[id]/(fitur-division)/document/index.tsx
@@ -18,6 +18,7 @@ import Styles from "@/constants/Styles";
 import {
   apiDocumentDelete,
   apiDocumentRename,
+   apiGetDivisionOneFeature,
   apiGetDocument,
   apiShareDocument,
 } from "@/lib/api";
@@ -85,6 +86,8 @@ export default function DocumentDivision() {
   const update = useSelector((state: any) => state.dokumenUpdate)
   const [refreshing, setRefreshing] = useState(false)
   const [loadingOpen, setLoadingOpen] = useState(false)
+   const [isMemberDivision, setIsMemberDivision] = useState(false)
+   const entityUser = useSelector((state: any) => state.user)
   const [bodyRename, setBodyRename] = useState({
      id: "",
      name: "",
@@ -93,6 +96,24 @@ export default function DocumentDivision() {
      extension: "",
   });

+   async function handleCheckMember() {
+      try {
+         const hasil = await decryptToken(String(token?.current));
+         const response = await apiGetDivisionOneFeature({
+            id,
+            user: hasil,
+            cat: "check-member",
+         });
+         setIsMemberDivision(response.data);
+      } catch (error) {
+         console.error(error);
+      }
+   }
+
+   useEffect(() => {
+      handleCheckMember()
+   }, [id])
+
   async function handleLoad(loading: boolean) {
      try {
         setLoading(loading)
@@ -347,7 +368,7 @@ export default function DocumentDivision() {
                        }}
                     />
                  ) : (
-                     <HeaderRightDocument path={path} />
+                     <HeaderRightDocument path={path} isMember={isMemberDivision} />
                  ),
            }}
         />
@@ -407,6 +428,7 @@ export default function DocumentDivision() {
                                          : `${item.name}.${item.extension}`
                                    }
                                    dateTime={item.createdAt}
+                                    canChecked={(entityUser.role != "user" && entityUser.role != "coadmin") || isMemberDivision}
                                    onChecked={() => {
                                       handleCheckboxChange(index);
                                    }}
--- a/app/(application)/division/[id]/(fitur-division)/task/[detail]/index.tsx
+++ b/app/(application)/division/[id]/(fitur-division)/task/[detail]/index.tsx
@@ -125,7 +125,7 @@ export default function DetailTaskDivision() {
               <SectionTanggalTugasTask refreshing={refreshing} isMemberDivision={isMemberDivision} />
               <SectionFileTask refreshing={refreshing} isMemberDivision={isMemberDivision} />
               <SectionLinkTask refreshing={refreshing} isMemberDivision={isMemberDivision} />
-               <SectionMemberTask refreshing={refreshing} isMemberDivision={isMemberDivision} />
+               <SectionMemberTask refreshing={refreshing} isAdminDivision={isAdminDivision} />
            </View>
         </ScrollView>
      </SafeAreaView>
--- a/app/(application)/division/[id]/info.tsx
+++ b/app/(application)/division/[id]/info.tsx
@@ -11,7 +11,7 @@ import Text from "@/components/Text"
 import { ColorsStatus } from "@/constants/ColorsStatus"
 import { ConstEnv } from "@/constants/ConstEnv"
 import Styles from "@/constants/Styles"
-import { apiDeleteMemberDivision, apiGetDivisionOneDetail, apiUpdateStatusAdminDivision } from "@/lib/api"
+import { apiDeleteMemberDivision, apiGetDivisionOneDetail, apiGetDivisionOneFeature, apiUpdateStatusAdminDivision } from "@/lib/api"
 import { useAuthSession } from "@/providers/AuthProvider"
 import { Feather, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons"
 import { router, Stack, useLocalSearchParams } from "expo-router"
@@ -39,6 +39,7 @@ type PropsMember = {
 }

 export default function InformationDivision() {
+   const entityUser = useSelector((state: any) => state.user)
   const { id } = useLocalSearchParams<{ id: string }>()
   const [isModal, setModal] = useState(false)
   const { token, decryptToken } = useAuthSession()
@@ -48,6 +49,8 @@ export default function InformationDivision() {
   const update = useSelector((state: any) => state.divisionUpdate)
   const arrSkeleton = Array.from({ length: 5 }, (_, index) => index)
   const [loading, setLoading] = useState(true)
+   const [isMemberDivision, setIsMemberDivision] = useState(false)
+   const [isAdminDivision, setIsAdminDivision] = useState(false)
   const [dataMemberChoose, setDataMemberChoose] = useState({
      id: '',
      name: '',
@@ -113,12 +116,34 @@ export default function InformationDivision() {
      }
   }

+   async function handleCheckMember() {
+      try {
+         const hasil = await decryptToken(String(token?.current));
+         const response = await apiGetDivisionOneFeature({
+            id,
+            user: hasil,
+            cat: "check-member",
+         });
+
+         const response2 = await apiGetDivisionOneFeature({
+            id,
+            user: hasil,
+            cat: "check-admin",
+         });
+         setIsMemberDivision(response.data);
+         setIsAdminDivision(response2.data);
+      } catch (error) {
+         console.error(error);
+      }
+   }
+
   useEffect(() => {
      handleLoad(false)
   }, [refresh, update])

   useEffect(() => {
      handleLoad(true)
+      handleCheckMember()
   }, [])

   function handleChooseMember(item: PropsMember) {
@@ -133,7 +158,7 @@ export default function InformationDivision() {
               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
               headerTitle: 'Informasi Divisi',
               headerTitleAlign: 'center',
-               headerRight: () => <HeaderRightDivisionInfo id={id} active={dataDetail?.isActive} />,
+               headerRight: () => ((entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision) && <HeaderRightDivisionInfo id={id} active={dataDetail?.isActive} />,
            }}
         />
         <ScrollView style={[Styles.h100]}>
@@ -161,6 +186,7 @@ export default function InformationDivision() {
                  <Text style={[Styles.textDefault, Styles.mv05]}>{dataMember.length} Anggota</Text>
                  <View style={[Styles.wrapPaper]}>
                     {
+                        ((entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision) &&
                        dataDetail?.isActive && (
                           <BorderBottomItem
                              onPress={() => { router.push(`/division/${id}/add-member`) }}
@@ -188,7 +214,7 @@ export default function InformationDivision() {
                                 <BorderBottomItem
                                    key={index}
                                    borderType="bottom"
-                                    onPress={() => { dataDetail?.isActive && handleChooseMember(item) }}
+                                    onPress={() => { dataDetail?.isActive && (isAdminDivision || (entityUser.role != "user" && entityUser.role != "coadmin")) && handleChooseMember(item) }}
                                    icon={
                                       <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="sm" />
                                    }
--- a/app/(application)/division/create/add-admin-division.tsx
+++ b/app/(application)/division/create/add-admin-division.tsx
@@ -9,6 +9,7 @@ import { setFormCreateDivision } from "@/lib/divisionCreate";
 import { setUpdateDivision } from "@/lib/divisionUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign } from "@expo/vector-icons";
+import { StackActions, useNavigation } from "@react-navigation/native";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
 import { Pressable, SafeAreaView, ScrollView, View } from "react-native";
@@ -23,6 +24,7 @@ type Props = {

 export default function CreateDivisionAddAdmin() {
   const { token, decryptToken } = useAuthSession()
+   const navigation = useNavigation()
   const { id } = useLocalSearchParams<{ id: string }>()
   const [dataOld, setDataOld] = useState<Props[]>([])
   const [data, setData] = useState<Props[]>([])
@@ -57,7 +59,8 @@ export default function CreateDivisionAddAdmin() {
            Toast.show({ type: 'small', text1: 'Berhasil membuat divisi', })
            dispatch(setFormCreateDivision({ admin: [], member: [], data: { idGroup: '', name: '', desc: '' } }))
            dispatch(setUpdateDivision(!updateDivision))
-            router.replace(`/division/`)
+            navigation.dispatch(StackActions.pop(3))
+            // router.replace(`/division/`)
         } else {
            Toast.show({ type: 'small', text1: response.message, })
         }
--- a/app/(application)/edit-profile.tsx
+++ b/app/(application)/edit-profile.tsx
@@ -10,11 +10,14 @@ import { apiEditProfile, apiGetProfile } from "@/lib/api";
 import { setEntities } from "@/lib/entitiesSlice";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { MaterialCommunityIcons } from "@expo/vector-icons";
+import { useHeaderHeight } from "@react-navigation/elements";
 import * as ImagePicker from "expo-image-picker";
 import { router, Stack } from "expo-router";
 import { useEffect, useState } from "react";
 import {
   Image,
+   KeyboardAvoidingView,
+   Platform,
   Pressable,
   SafeAreaView,
   ScrollView,
@@ -37,6 +40,7 @@ type Props = {
 };

 export default function EditProfile() {
+   const headerHeight = useHeaderHeight()
   const dispatch = useDispatch()
   const entities = useSelector((state: any) => state.entities)
   const { token, decryptToken } = useAuthSession()
@@ -231,116 +235,122 @@ export default function EditProfile() {
               ),
            }}
         />
-         <ScrollView style={[Styles.h100]}>
-            <View style={[Styles.p15]}>
-               <View style={{ justifyContent: "center", alignItems: "center" }}>
-                  {
-                     selectedImage != undefined ? (
-                        <Pressable onPress={pickImageAsync}>
-                           <Image
-                              src={
-                                 typeof selectedImage === "string"
-                                    ? selectedImage
-                                    : selectedImage.uri
-                              }
-                              style={[Styles.userProfileBig]}
-                              onError={() => { setErrorImg(true) }}
-                           />
-                           <View style={[Styles.absoluteIconPicker]}>
-                              <MaterialCommunityIcons name="image" color={'white'} size={15} />
-                           </View>
-                        </Pressable>
-                     ) : (
-                        <Pressable onPress={pickImageAsync}>
-                           <Image
-                              source={errorImg ? require("../../assets/images/user.jpg") : { uri: `${ConstEnv.url_storage}/files/${data?.img}` }}
-                              style={[Styles.userProfileBig]}
-                              onError={() => { setErrorImg(true) }}
-                           />
-                           <View style={[Styles.absoluteIconPicker]}>
-                              <MaterialCommunityIcons name="image" color={'white'} size={15} />
-                           </View>
-                        </Pressable>
-                     )
-                  }
+         <KeyboardAvoidingView
+            style={[Styles.h100]}
+            behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+            keyboardVerticalOffset={headerHeight}
+         >
+            <ScrollView showsVerticalScrollIndicator={false}>
+               <View style={[Styles.p15]}>
+                  <View style={{ justifyContent: "center", alignItems: "center" }}>
+                     {
+                        selectedImage != undefined ? (
+                           <Pressable onPress={pickImageAsync}>
+                              <Image
+                                 src={
+                                    typeof selectedImage === "string"
+                                       ? selectedImage
+                                       : selectedImage.uri
+                                 }
+                                 style={[Styles.userProfileBig]}
+                                 onError={() => { setErrorImg(true) }}
+                              />
+                              <View style={[Styles.absoluteIconPicker]}>
+                                 <MaterialCommunityIcons name="image" color={'white'} size={15} />
+                              </View>
+                           </Pressable>
+                        ) : (
+                           <Pressable onPress={pickImageAsync}>
+                              <Image
+                                 source={errorImg ? require("../../assets/images/user.jpg") : { uri: `${ConstEnv.url_storage}/files/${data?.img}` }}
+                                 style={[Styles.userProfileBig]}
+                                 onError={() => { setErrorImg(true) }}
+                              />
+                              <View style={[Styles.absoluteIconPicker]}>
+                                 <MaterialCommunityIcons name="image" color={'white'} size={15} />
+                              </View>
+                           </Pressable>
+                        )
+                     }
+                  </View>
+                  <SelectForm
+                     label="Jabatan"
+                     placeholder="Pilih Jabatan"
+                     value={choosePosition.label}
+                     required
+                     onPress={() => {
+                        setValChoose(choosePosition.val);
+                        setValSelect("position");
+                        setSelect(true);
+                     }}
+                     error={error.position}
+                     errorText="Jabatan tidak boleh kosong"
+                  />
+                  <InputForm
+                     label="NIK"
+                     type="numeric"
+                     placeholder="NIK"
+                     required
+                     value={data?.nik}
+                     error={error.nik}
+                     errorText="NIK Harus 16 Karakter"
+                     onChange={val => {
+                        validationForm("nik", val)
+                     }}
+                  />
+                  <InputForm
+                     label="Nama"
+                     type="default"
+                     placeholder="Nama"
+                     required
+                     value={data?.name}
+                     error={error.name}
+                     errorText="Nama tidak boleh kosong"
+                     onChange={val => {
+                        validationForm("name", val)
+                     }}
+                  />
+                  <InputForm
+                     label="Email"
+                     type="default"
+                     placeholder="Email"
+                     required
+                     value={data?.email}
+                     error={error.email}
+                     errorText="Email tidak valid"
+                     onChange={val => {
+                        validationForm("email", val)
+                     }}
+                  />
+                  <InputForm
+                     label="Nomor Telepon"
+                     type="numeric"
+                     placeholder="8XX-XXX-XXX"
+                     required
+                     itemLeft={<Text>+62</Text>}
+                     value={data?.phone}
+                     error={error.phone}
+                     errorText="Nomor Telepon tidak valid"
+                     onChange={val => {
+                        validationForm("phone", val)
+                     }}
+                  />
+                  <SelectForm
+                     label="Jenis Kelamin"
+                     placeholder="Pilih Jenis Kelamin"
+                     value={chooseGender.label}
+                     required
+                     onPress={() => {
+                        setValChoose(chooseGender.val);
+                        setValSelect("gender");
+                        setSelect(true);
+                     }}
+                     error={error.gender}
+                     errorText="Jenis Kelamin tidak boleh kosong"
+                  />
               </View>
-               <SelectForm
-                  label="Jabatan"
-                  placeholder="Pilih Jabatan"
-                  value={choosePosition.label}
-                  required
-                  onPress={() => {
-                     setValChoose(choosePosition.val);
-                     setValSelect("position");
-                     setSelect(true);
-                  }}
-                  error={error.position}
-                  errorText="Jabatan tidak boleh kosong"
-               />
-               <InputForm
-                  label="NIK"
-                  type="numeric"
-                  placeholder="NIK"
-                  required
-                  value={data?.nik}
-                  error={error.nik}
-                  errorText="NIK Harus 16 Karakter"
-                  onChange={val => {
-                     validationForm("nik", val)
-                  }}
-               />
-               <InputForm
-                  label="Nama"
-                  type="default"
-                  placeholder="Nama"
-                  required
-                  value={data?.name}
-                  error={error.name}
-                  errorText="Nama tidak boleh kosong"
-                  onChange={val => {
-                     validationForm("name", val)
-                  }}
-               />
-               <InputForm
-                  label="Email"
-                  type="default"
-                  placeholder="Email"
-                  required
-                  value={data?.email}
-                  error={error.email}
-                  errorText="Email tidak valid"
-                  onChange={val => {
-                     validationForm("email", val)
-                  }}
-               />
-               <InputForm
-                  label="Nomor Telepon"
-                  type="numeric"
-                  placeholder="8XX-XXX-XXX"
-                  required
-                  itemLeft={<Text>+62</Text>}
-                  value={data?.phone}
-                  error={error.phone}
-                  errorText="Nomor Telepon tidak valid"
-                  onChange={val => {
-                     validationForm("phone", val)
-                  }}
-               />
-               <SelectForm
-                  label="Jenis Kelamin"
-                  placeholder="Pilih Jenis Kelamin"
-                  value={chooseGender.label}
-                  required
-                  onPress={() => {
-                     setValChoose(chooseGender.val);
-                     setValSelect("gender");
-                     setSelect(true);
-                  }}
-                  error={error.gender}
-                  errorText="Jenis Kelamin tidak boleh kosong"
-               />
-            </View>
-         </ScrollView>
+            </ScrollView>
+         </KeyboardAvoidingView>

         <ModalSelect
            category={valSelect}
--- a/app/(application)/position/index.tsx
+++ b/app/(application)/position/index.tsx
@@ -189,7 +189,10 @@ export default function Index() {
                           return (
                              <BorderBottomItem
                                 key={index}
-                                 onPress={() => { handleChooseData(item.id, item.name, item.isActive, item.idGroup) }}
+                                 onPress={() => {
+                                    entityUser.role != "user" &&
+                                       handleChooseData(item.id, item.name, item.isActive, item.idGroup)
+                                 }}
                                 borderType="all"
                                 icon={
                                    <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
--- a/app/(application)/project/index.tsx
+++ b/app/(application)/project/index.tsx
@@ -193,16 +193,19 @@ export default function ListProject() {
               </Pressable>
            </View>
            <View style={[Styles.mv05]}>
-               <Text>Filter :
-                  {
-                     (entityUser.role == "supadmin" || entityUser.role == "developer") && nameGroup
-                  }
-                  {
-                     (entityUser.role == 'user' || entityUser.role == 'coadmin' || entityUser.role == 'cosupadmin')
-                        ? (cat == 'null' || cat == 'undefined' || cat == undefined || cat == '' || cat == 'data-saya') ? 'Kegiatan Saya' : 'Semua Kegiatan'
-                        : ''
-                  }
-               </Text>
+               {
+                  entityUser.role != 'cosupadmin' && entityUser.role != 'admin' &&
+                  <Text>Filter :
+                     {
+                        (entityUser.role == "supadmin" || entityUser.role == "developer") && nameGroup
+                     }
+                     {
+                        (entityUser.role == 'user' || entityUser.role == 'coadmin')
+                           ? (cat == 'null' || cat == 'undefined' || cat == undefined || cat == '' || cat == 'data-saya') ? 'Kegiatan Saya' : 'Semua Kegiatan'
+                           : ''
+                     }
+                  </Text>
+               }
            </View>
         </View>
         <View style={[{ flex: 2 }]}>
--- a/components/discussion_general/headerDiscussionGeneral.tsx
+++ b/components/discussion_general/headerDiscussionGeneral.tsx
@@ -16,7 +16,10 @@ export default function HeaderDiscussionGeneral() {

   return (
      <>
-         <ButtonMenuHeader onPress={() => { setVisible(true) }} />
+         {
+            entityUser.role != "user" && entityUser.role != "coadmin" &&
+            <ButtonMenuHeader onPress={() => { setVisible(true) }} />
+         }
         <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu">
            <View style={Styles.rowItemsCenter}>
               <MenuItemRow
--- a/components/document/headerDocument.tsx
+++ b/components/document/headerDocument.tsx
@@ -15,7 +15,7 @@ import { InputForm } from "../inputForm";
 import MenuItemRow from "../menuItemRow";
 import ModalFloat from "../modalFloat";

-export default function HeaderRightDocument({ path }: { path: string }) {
+export default function HeaderRightDocument({ path, isMember }: { path: string, isMember: boolean }) {
   const [isVisible, setVisible] = useState(false);
   const [newFolder, setNewFolder] = useState(false);
   const { id } = useLocalSearchParams<{ id: string }>();
@@ -25,6 +25,7 @@ export default function HeaderRightDocument({ path }: { path: string }) {
   const update = useSelector((state: any) => state.dokumenUpdate)
   const [loading, setLoading] = useState(false)
   const [loadingFolder, setLoadingFolder] = useState(false)
+   const entityUser = useSelector((state: any) => state.user)

   async function handleCreateFolder() {
      try {
@@ -102,11 +103,14 @@ export default function HeaderRightDocument({ path }: { path: string }) {

   return (
      <>
-         <ButtonMenuHeader
-            onPress={() => {
-               setVisible(true);
-            }}
-         />
+         {
+            ((entityUser.role != "user" && entityUser.role != "coadmin") || isMember) &&
+            <ButtonMenuHeader
+               onPress={() => {
+                  setVisible(true);
+               }}
+            />
+         }
         <DrawerBottom
            animation="slide"
            isVisible={isVisible}
--- a/components/document/itemFile.tsx
+++ b/components/document/itemFile.tsx
@@ -11,9 +11,10 @@ type Props = {
   checked?: boolean
   onChecked?: () => void
   onPress?: () => void
+   canChecked?: boolean
 }

-export default function ItemFile({ category, checked, dateTime, title, onChecked, onPress }: Props) {
+export default function ItemFile({ category, checked, dateTime, title, onChecked, onPress, canChecked }: Props) {
   return (
      <View style={[Styles.wrapItemBorderBottom]}>
         <View style={[Styles.rowItemsCenter]}>
@@ -43,18 +44,22 @@ 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}>
+               <Pressable style={[Styles.ml10, { flex: 1 },]} onPress={onPress}>
                  <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode="tail">{title}</Text>
                  <Text style={[Styles.textInformation]}>{dateTime}</Text>
               </Pressable>
-               <Pressable onPress={onChecked}>
-                  {
-                     checked
-                        ? <MaterialCommunityIcons name="checkbox-marked-circle" size={25} color={'black'} />
-                        : <MaterialCommunityIcons name="checkbox-blank-circle-outline" size={25} color={'#ced4da'} />
-                  }
+               {
+                  !canChecked ? <></>
+                     :
+                     <Pressable onPress={onChecked}>
+                        {
+                           checked
+                              ? <MaterialCommunityIcons name="checkbox-marked-circle" size={25} color={'black'} />
+                              : <MaterialCommunityIcons name="checkbox-blank-circle-outline" size={25} color={'#ced4da'} />
+                        }

-               </Pressable>
+                     </Pressable>
+               }
            </View>
         </View>
      </View>
--- a/components/drawerBottom.tsx
+++ b/components/drawerBottom.tsx
@@ -35,6 +35,7 @@ export default function DrawerBottom({ isVisible, setVisible, title, children, a
         backdropTransitionInTiming={500}
         backdropTransitionOutTiming={500}
         useNativeDriverForBackdrop={true}
+         propagateSwipe={true}
      >
         {
            keyboard ?
@@ -62,7 +63,7 @@ export default function DrawerBottom({ isVisible, setVisible, title, children, a
                        <MaterialIcons name="close" color="black" size={22} />
                     </Pressable>
                  </View>
-                  <View style={Styles.contentContainer}>
+                  <View style={[Styles.contentContainer, { flex: 1 }]}>
                     {children}
                  </View>
               </View>
--- a/components/home/projectHome.tsx
+++ b/components/home/projectHome.tsx
@@ -62,7 +62,7 @@ export default function ProjectHome({ refreshing }: { refreshing: boolean }) {
                     width={width * 0.8}
                     height={235}
                     data={data}
-                     loop={true}
+                     loop={false}
                     autoPlay={false}
                     autoPlayReverse={false}
                     pagingEnabled={true}
--- a/components/inputForm.tsx
+++ b/components/inputForm.tsx
@@ -40,10 +40,15 @@ export function InputForm({ label, value, placeholder, onChange, info, disable,
            <View style={[
               Styles.inputRoundForm,
               itemRight != undefined ? Styles.inputRoundFormRight : Styles.inputRoundFormLeft,
+               multiline && { alignItems: 'flex-end' },
               round && Styles.round30,
               { backgroundColor: bg && bg == 'white' ? 'white' : 'transparent' },
               error && { borderColor: "red" },
-               Platform.OS == 'ios' ? { paddingVertical: 10 } : { paddingVertical: 0 },
+               Platform.OS == 'ios' ? { paddingVertical: 10 } : { paddingVertical: 0, minHeight: 40 },
+               { alignItems: 'center' },
+               multiline
+                  ? { alignItems: "flex-end" } // multiline: tombol send di bawah
+                  : { alignItems: "center" }, // default: tetap di tengah
            ]}>
               {itemRight != undefined ? itemRight : itemLeft}
               <TextInput
@@ -53,7 +58,14 @@ export function InputForm({ label, value, placeholder, onChange, info, disable,
                  keyboardType={type}
                  onChangeText={onChange}
                  placeholderTextColor={'gray'}
-                  style={[Styles.mh05, { width: width ? lebar * width / 100 : lebar * 0.78, color: 'black' }, Platform.OS == 'ios' ? { paddingVertical: 1 } : { paddingVertical: 5 }]}
+                  multiline={multiline}
+                  numberOfLines={3}
+                  style={[
+                     Styles.mh05,
+                     multiline && { height: '100%', maxHeight: 100 },
+                     { width: width ? lebar * width / 100 : lebar * 0.78, color: 'black' },
+                     Platform.OS == 'ios' ? { paddingVertical: 1, paddingTop: 3 } : { paddingVertical: 0 },
+                  ]}
               />
            </View>
            {error && (<Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>{errorText}</Text>)}
--- a/components/member/headerMemberList.tsx
+++ b/components/member/headerMemberList.tsx
@@ -16,7 +16,10 @@ export default function HeaderMemberList() {

   return (
      <>
-         <ButtonMenuHeader onPress={() => { setVisible(true) }} />
+         {
+            entityUser.role != "user" &&
+            <ButtonMenuHeader onPress={() => { setVisible(true) }} />
+         }
         <DrawerBottom animation="slide" isVisible={isVisible} setVisible={() => setVisible(false)} title="Menu">
            <View style={Styles.rowItemsCenter}>
               <MenuItemRow
--- a/components/project/headerProjectList.tsx
+++ b/components/project/headerProjectList.tsx
@@ -30,16 +30,20 @@ export default function HeaderRightProjectList() {
                     }}
                  />
               }
-               <MenuItemRow
-                  icon={<AntDesign name="filter" color="black" size={25} />}
-                  title="Filter"
-                  onPress={() => {
-                     setVisible(false)
-                     setTimeout(() => {
-                        setFilter(true)
-                     }, 600)
-                  }}
-               />
+               {
+                  (entityUser.role == "user" || entityUser.role == "coadmin" || entityUser.role == "supadmin" || entityUser.role == "developer") &&
+                  <MenuItemRow
+                     icon={<AntDesign name="filter" color="black" size={25} />}
+                     title="Filter"
+                     onPress={() => {
+                        setVisible(false)
+                        setTimeout(() => {
+                           setFilter(true)
+                        }, 600)
+                     }}
+                  />
+               }
+
            </View>
         </DrawerBottom>
         <ModalFilter
--- a/components/task/sectionMemberTask.tsx
+++ b/components/task/sectionMemberTask.tsx
@@ -26,7 +26,7 @@ type Props = {
   position: string;
 };

-export default function SectionMemberTask({ refreshing, isMemberDivision }: { refreshing: boolean, isMemberDivision: boolean }) {
+export default function SectionMemberTask({ refreshing, isAdminDivision }: { refreshing: boolean, isAdminDivision: boolean }) {
   const [isModal, setModal] = useState(false);
   const entityUser = useSelector((state: any) => state.user);
   const { token, decryptToken } = useAuthSession();
@@ -168,7 +168,7 @@ export default function SectionMemberTask({ refreshing, isMemberDivision }: { re


               {
-                  (entityUser.role != "user" && entityUser.role != "coadmin") || isMemberDivision
+                  (entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision
                     ?
                     <MenuItemRow
                        icon={
--- a/constants/Styles.ts
+++ b/constants/Styles.ts
@@ -79,6 +79,12 @@ const Styles = StyleSheet.create({
   mb10: {
      marginBottom: 10
   },
+   mb12: {
+      marginBottom: 12
+   },
+   mb13: {
+      marginBottom: 13
+   },
   mb15: {
      marginBottom: 15
   },
--- a/ios/Desa/Desa.entitlements
+++ b/ios/Desa/Desa.entitlements
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict/>
+<dict>
+	<key>aps-environment</key>
+	<string>development</string>
+</dict>
 </plist>
--- a/ios/Desa/Images.xcassets/AppIcon.appiconset/App-Icon-1024x1024@1x.png
+++ b/ios/Desa/Images.xcassets/AppIcon.appiconset/App-Icon-1024x1024@1x.png
--- a/ios/Desa/Images.xcassets/SplashScreenLogo.imageset/image.png
+++ b/ios/Desa/Images.xcassets/SplashScreenLogo.imageset/image.png
--- a/ios/Desa/Images.xcassets/SplashScreenLogo.imageset/image@2x.png
+++ b/ios/Desa/Images.xcassets/SplashScreenLogo.imageset/image@2x.png
--- a/ios/Desa/Images.xcassets/SplashScreenLogo.imageset/image@3x.png
+++ b/ios/Desa/Images.xcassets/SplashScreenLogo.imageset/image@3x.png
--- a/ios/Desa/Info.plist
+++ b/ios/Desa/Info.plist
@@ -1,95 +1,99 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-  <dict>
-    <key>CADisableMinimumFrameDurationOnPhone</key>
-    <true/>
-    <key>CFBundleDevelopmentRegion</key>
-    <string>$(DEVELOPMENT_LANGUAGE)</string>
-    <key>CFBundleDisplayName</key>
-    <string>Desa+</string>
-    <key>CFBundleExecutable</key>
-    <string>$(EXECUTABLE_NAME)</string>
-    <key>CFBundleIdentifier</key>
-    <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-    <key>CFBundleInfoDictionaryVersion</key>
-    <string>6.0</string>
-    <key>CFBundleName</key>
-    <string>$(PRODUCT_NAME)</string>
-    <key>CFBundlePackageType</key>
-    <string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
-    <key>CFBundleShortVersionString</key>
-    <string>1.0.2</string>
-    <key>CFBundleSignature</key>
-    <string>????</string>
-    <key>CFBundleURLTypes</key>
-    <array>
-      <dict>
-        <key>CFBundleURLSchemes</key>
-        <array>
-          <string>myapp</string>
-          <string>mobiledarmasaba.app</string>
-        </array>
-      </dict>
-      <dict>
-        <key>CFBundleURLSchemes</key>
-        <array>
-          <string>exp+mobile-darmasaba</string>
-        </array>
-      </dict>
-    </array>
-    <key>CFBundleVersion</key>
-    <string>1</string>
-    <key>ITSAppUsesNonExemptEncryption</key>
-    <false/>
-    <key>LSMinimumSystemVersion</key>
-    <string>12.0</string>
-    <key>LSRequiresIPhoneOS</key>
-    <true/>
-    <key>NSAppTransportSecurity</key>
-    <dict>
-      <key>NSAllowsArbitraryLoads</key>
-      <false/>
-      <key>NSAllowsLocalNetworking</key>
-      <true/>
-    </dict>
-    <key>NSCameraUsageDescription</key>
-    <string>Allow $(PRODUCT_NAME) to access your camera</string>
-    <key>NSMicrophoneUsageDescription</key>
-    <string>Allow $(PRODUCT_NAME) to access your microphone</string>
-    <key>NSPhotoLibraryAddUsageDescription</key>
-    <string>Allow $(PRODUCT_NAME) to save photos</string>
-    <key>NSPhotoLibraryUsageDescription</key>
-    <string>Allow $(PRODUCT_NAME) to access your photos</string>
-    <key>NSUserActivityTypes</key>
-    <array>
-      <string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
-    </array>
-    <key>UILaunchStoryboardName</key>
-    <string>SplashScreen</string>
-    <key>UIRequiredDeviceCapabilities</key>
-    <array>
-      <string>arm64</string>
-    </array>
-    <key>UIRequiresFullScreen</key>
-    <false/>
-    <key>UIStatusBarStyle</key>
-    <string>UIStatusBarStyleDefault</string>
-    <key>UISupportedInterfaceOrientations</key>
-    <array>
-      <string>UIInterfaceOrientationPortrait</string>
-      <string>UIInterfaceOrientationPortraitUpsideDown</string>
-    </array>
-    <key>UISupportedInterfaceOrientations~ipad</key>
-    <array>
-      <string>UIInterfaceOrientationPortrait</string>
-      <string>UIInterfaceOrientationPortraitUpsideDown</string>
-      <string>UIInterfaceOrientationLandscapeLeft</string>
-      <string>UIInterfaceOrientationLandscapeRight</string>
-    </array>
-    <key>UIUserInterfaceStyle</key>
-    <string>Automatic</string>
-    <key>UIViewControllerBasedStatusBarAppearance</key>
-    <false/>
-  </dict>
-</plist>
+<dict>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>Desa+</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0.5</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>myapp</string>
+				<string>mobiledarmasaba.app</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>exp+mobile-darmasaba</string>
+			</array>
+		</dict>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>2</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
+	<key>LSMinimumSystemVersion</key>
+	<string>12.0</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<false/>
+		<key>NSAllowsLocalNetworking</key>
+		<true/>
+	</dict>
+	<key>NSCameraUsageDescription</key>
+	<string>Allow $(PRODUCT_NAME) to access your camera</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>Allow $(PRODUCT_NAME) to access your microphone</string>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>Allow $(PRODUCT_NAME) to save photos</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>Allow $(PRODUCT_NAME) to access your photos</string>
+	<key>NSUserActivityTypes</key>
+	<array>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
+	</array>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>remote-notification</string>
+	</array>
+	<key>UILaunchStoryboardName</key>
+	<string>SplashScreen</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>arm64</string>
+	</array>
+	<key>UIRequiresFullScreen</key>
+	<false/>
+	<key>UIStatusBarStyle</key>
+	<string>UIStatusBarStyleDefault</string>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UIUserInterfaceStyle</key>
+	<string>Automatic</string>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
+</dict>
+</plist>
--- a/lib/useNotification.ts
+++ b/lib/useNotification.ts
@@ -1,10 +1,14 @@
 import { getApp, getApps, initializeApp } from '@react-native-firebase/app';
-import { getMessaging, registerDeviceForRemoteMessages, setAutoInitEnabled } from '@react-native-firebase/messaging';
+import {
+   getMessaging,
+   getToken as getMessagingToken,
+   setAutoInitEnabled,
+} from '@react-native-firebase/messaging';
 import * as Notifications from 'expo-notifications';
 import { useEffect } from 'react';
 import { PermissionsAndroid, Platform } from 'react-native';

-// Your Firebase project configuration
+// Firebase config
 const RNfirebaseConfig = {
   apiKey: "AIzaSyB2hbsW91J3oRQx4_jgrCCNY0tNt5-21e8",
   authDomain: "googleapis.com",
@@ -15,14 +19,15 @@ const RNfirebaseConfig = {
   databaseURL: "https://mobile-darmasaba-default-rtdb.asia-southeast1.firebasedatabase.app/"
 };

-
 const initializeFirebase = async () => {
   try {
      const app = getApps().length ? getApp() : initializeApp(RNfirebaseConfig);
      const mess = getMessaging(app);
-      await registerDeviceForRemoteMessages(mess);
-      setAutoInitEnabled(mess, true);
-      return mess
+      // await registerDeviceForRemoteMessages(mess);
+      // `registerDeviceForRemoteMessages` tidak perlu lagi
+      await setAutoInitEnabled(mess, true);
+
+      return mess;
   } catch (error) {
      console.error('Failed to initialize Firebase:', error);
   }
@@ -31,17 +36,16 @@ const initializeFirebase = async () => {
 export const requestPermission = async () => {
   try {
      if (Platform.OS === 'android') {
-         const cek = await PermissionsAndroid.check(PermissionsAndroid.PERMISSIONS.POST_NOTIFICATIONS)
+         const cek = await PermissionsAndroid.check(
+            PermissionsAndroid.PERMISSIONS.POST_NOTIFICATIONS
+         );
         if (!cek) {
            const granted = await PermissionsAndroid.request(
               PermissionsAndroid.PERMISSIONS.POST_NOTIFICATIONS
            );
-            if (granted === PermissionsAndroid.RESULTS.GRANTED) {
-               return true
-            }
-            return false
+            return granted === PermissionsAndroid.RESULTS.GRANTED;
         }
-         return true
+         return true;
      } else if (Platform.OS === 'ios') {
         const { status } = await Notifications.requestPermissionsAsync();
         return status === 'granted';
@@ -54,10 +58,13 @@ export const requestPermission = async () => {
 export const getToken = async () => {
   try {
      const mess = await initializeFirebase();
-      const token = await mess?.getToken();
+      if (!mess) return null;
+
+      // pakai modular API
+      const token = await getMessagingToken(mess);
      return token;
   } catch (error) {
-      console.error("Error getting token:", error);
+      console.error('Error getting token:', error);
   }
 };

@@ -73,4 +80,4 @@ export const useNotification = () => {

      initializeAndSetup();
   }, []);
-};
+};
--- a/providers/AuthProvider.tsx
+++ b/providers/AuthProvider.tsx
@@ -5,7 +5,6 @@ import AsyncStorage from '@react-native-async-storage/async-storage';
 import CryptoES from "crypto-es";
 import { router } from "expo-router";
 import { createContext, MutableRefObject, ReactNode, useCallback, useContext, useEffect, useRef, useState } from 'react';
-import { Platform } from 'react-native';

 const AuthContext = createContext<{
  signIn: (arg0: string) => void;
@@ -57,13 +56,13 @@ export default function AuthProvider({ children }: { children: ReactNode }): Rea
    const permission = await requestPermission()
    if (permission) {
      try {
-        // COMING SOON
-        if (Platform.OS === 'android') {
-          const tokenDevice = await getToken()
-          const register = await apiRegisteredToken({ user: hasil, token: String(tokenDevice) })
-        }else{
-          const register = await apiRegisteredToken({ user: hasil, token: "" })
-        }
+        // if (Platform.OS === 'android') {
+        const tokenDevice = await getToken()
+        const register = await apiRegisteredToken({ user: hasil, token: String(tokenDevice) })
+        // }else{
+        //   const tokenDevice = await getToken()
+        //   const register = await apiRegisteredToken({ user: hasil, token: String(tokenDevice) })
+        // }
      } catch (error) {
        console.error(error)
      } finally {
@@ -82,13 +81,12 @@ export default function AuthProvider({ children }: { children: ReactNode }): Rea
  const signOut = useCallback(async () => {
    try {
      const hasil = await decryptToken(String(tokenRef.current))
-      // COMING SOON
-      if (Platform.OS === 'android') {
-        const token = await getToken()
-        const response = await apiUnregisteredToken({ user: hasil, token: String(token) })
-      }else{
-        const response = await apiUnregisteredToken({ user: hasil, token: "" })
-      }
+      // if (Platform.OS === 'android') {
+      const token = await getToken()
+      const response = await apiUnregisteredToken({ user: hasil, token: String(token) })
+      // }else{
+      //   const response = await apiUnregisteredToken({ user: hasil, token: "" })
+      // }
    } catch (error) {
      console.error(error)
    } finally {
Author	SHA1	Message	Date
amaliadwiy	34d727f07d	Merge pull request 'upd: android input' (#44 ) from amalia/29-sept-25 into join Reviewed-on: bip/mobile-darmasaba#44	2025-09-29 17:35:24 +08:00
amaliadwiy	ed175d63f2	upd: android input Deskripsi: - update input komentar pada android No Issues	2025-09-29 15:14:54 +08:00
amaliadwiy	bd82b7c427	Merge pull request 'amalia/26-sept-25' (#43 ) from amalia/26-sept-25 into join Reviewed-on: bip/mobile-darmasaba#43	2025-09-26 17:42:28 +08:00
amaliadwiy	a6c96105d2	upd: text input komentar Deskripsi: - android input komentar pada android No Issues	2025-09-26 16:52:35 +08:00
amaliadwiy	14e9bf15c7	upd: dokumen divisi Deskripsi: - update akses role pada dokumen divisi No Issues	2025-09-26 15:08:59 +08:00
amaliadwiy	907b56feaf	upd: text input Deskripsi: - text input pada android No Issues	2025-09-26 12:22:12 +08:00
amaliadwiy	2341a46992	upd: task divisi Deskripsi: - user role akses No Issues	2025-09-26 11:03:55 +08:00
amaliadwiy	43a91c6481	Merge pull request 'amalia/25-sept-25' (#42 ) from amalia/25-sept-25 into join Reviewed-on: bip/mobile-darmasaba#42	2025-09-26 10:22:11 +08:00
amaliadwiy	ecc41c905f	upd	2025-09-25 17:13:44 +08:00
amaliadwiy	65d53951c3	upd: caraousel kegiatan home Deskripsi: - loop false pada home caraousel kegiatan No Issues	2025-09-25 11:27:51 +08:00
amaliadwiy	c2597b25bf	upd: push notification Deskripsi: - update push notification warning No Issues	2025-09-25 11:22:39 +08:00
amaliadwiy	f1b3eecbbe	Merge pull request 'amalia/24-sept-25' (#41 ) from amalia/24-sept-25 into join Reviewed-on: bip/mobile-darmasaba#41	2025-09-24 17:39:23 +08:00
amaliadwiy	f042e32d98	upd: push notification ios Deskripsi: - push notification foreground dan background pada ios No Issues	2025-09-24 17:37:00 +08:00
amaliadwiy	93c492ac71	fix: edit profile Deskripsi: - update keyboard avoiding pada edit profile No Issues	2025-09-24 16:19:33 +08:00
amaliadwiy	6cca0a3d08	fix : multiline text input Deskripsi: - multiline pada text input komentar diskusi umum dan diskusi divisi No Issues	2025-09-24 16:11:57 +08:00
amaliadwiy	bbb25a30d2	fix : create divisi Deskripsi: - router delete pada saat setelah tambah divisi No Issues	2025-09-24 14:42:54 +08:00
amaliadwiy	46e269b45f	fix: drawer bottom Deskripsi: - scrooll data pada drawer bottom No Issues	2025-09-24 14:08:04 +08:00
amaliadwiy	4725d27f74	fix: list project Deskripsi: - filter pada setiap user role - fitur filter disetiap user role No Issues	2025-09-24 11:01:18 +08:00
amaliadwiy	ae74791a1c	Merge pull request 'amalia/23-sept-25' (#40 ) from amalia/23-sept-25 into join Reviewed-on: bip/mobile-darmasaba#40	2025-09-23 17:47:13 +08:00
amaliadwiy	ba453ad027	upd: ios update	2025-09-23 13:55:50 +08:00
amaliadwiy	187e9dd19e	upd: version code	2025-09-23 12:15:58 +08:00
amaliadwiy	040cab4f5e	Merge pull request 'amalia/22-sept-25' (#39 ) from amalia/22-sept-25 into join Reviewed-on: bip/mobile-darmasaba#39	2025-09-22 17:44:20 +08:00