tambahan:

- Deskripsi:
- tampilan attach file pada halaman tambah diskusi umum
- tampilan attach file pada halaman update diskusi umum
- tampilan attach file pada halaman detail diskusi umum
- tampilan attach file pada halaman tambah diskusi divisi
- tampilan attach file pada halaman update diskusi divisi
- tampilan attach file pada halaman detail diskusi divisi

No Issues

.easignore

@@ -39,5 +39,7 @@ app-example
 
 x.ts
 x.sh
-/android
-/ios
+
+.env
+
+android/

.gitignore

@@ -32,6 +32,9 @@ yarn-error.*
 # local env files
 .env*.local
 
+#env
+.env
+
 # typescript
 *.tsbuildinfo
 
@@ -41,4 +44,5 @@ x.ts
 x.sh
 
 google-services.json
-mobile-darmasaba-firebase-adminsdk-fbsvc-f5abb292b5.json
+service-account.json
+

android/.kotlin/errors/errors-1757572005452.log

@@ -0,0 +1,4 @@
+kotlin version: 2.0.21
+error message: The daemon has terminated unexpectedly on startup attempt #1 with error code: 0. The daemon process output:
+    1. Kotlin compile daemon is ready
+

android/app/build.gradle

@@ -92,8 +92,8 @@ android {
         applicationId 'mobiledarmasaba.app'
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 6
+        versionName "1.0.2"
     }
     signingConfigs {
         debug {

android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+  <uses-permission android:name="android.permission.READ_MEDIA_AUDIO"/>
+  <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
+  <uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
   <uses-permission android:name="android.permission.RECORD_AUDIO"/>
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
   <uses-permission android:name="android.permission.VIBRATE"/>

android/app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-  <string name="app_name">mobile-darmasaba</string>
+  <string name="app_name">Desa+</string>
   <string name="expo_system_ui_user_interface_style" translatable="false">automatic</string>
   <string name="expo_splash_screen_resize_mode" translatable="false">contain</string>
   <string name="expo_splash_screen_status_bar_translucent" translatable="false">false</string>

android/settings.gradle

@@ -31,7 +31,7 @@ extensions.configure(com.facebook.react.ReactSettingsExtension) { ex ->
 }
 expoAutolinking.useExpoModules()
 
-rootProject.name = 'mobile-darmasaba'
+rootProject.name = 'Desa+'
 
 expoAutolinking.useExpoVersionCatalog()
 

app.config.js

@@ -0,0 +1,84 @@
+import 'dotenv/config';
+
+export default {
+   expo: {
+      name: "Desa+",
+      slug: "mobile-darmasaba",
+      version: "2.0.5", // Versi aplikasi (App Store)
+      jsEngine: "jsc",
+      orientation: "portrait",
+      icon: "./assets/images/logo-icon-small.png",
+      scheme: "myapp",
+      userInterfaceStyle: "automatic",
+      newArchEnabled: false,
+      ios: {
+         supportsTablet: true,
+         bundleIdentifier: "mobiledarmasaba.app",
+         buildNumber: "7",
+         infoPlist: {
+            ITSAppUsesNonExemptEncryption: false,
+            CFBundleDisplayName: "Desa+"
+         },
+         googleServicesFile: process.env.IOS_GOOGLE_SERVICES_FILE
+      },
+      android: {
+         package: "mobiledarmasaba.app",
+         versionCode: 15,
+         adaptiveIcon: {
+            foregroundImage: "./assets/images/logo-icon-small.png",
+            backgroundColor: "#ffffff"
+         },
+         googleServicesFile: "./google-services.json",
+         permissions: [
+            "READ_EXTERNAL_STORAGE",
+            "WRITE_EXTERNAL_STORAGE",
+            "READ_MEDIA_IMAGES",   // Android 13+
+            "READ_MEDIA_VIDEO",    // Android 13+
+            "READ_MEDIA_AUDIO"     // Android 13+
+         ]
+      },
+      web: {
+         bundler: "metro",
+         output: "static",
+         favicon: "./assets/images/favicon.png"
+      },
+      plugins: [
+         "expo-router",
+         [
+            "expo-splash-screen",
+            {
+               image: "./assets/images/logo-icon-small.png",
+               imageWidth: 200,
+               resizeMode: "contain",
+               backgroundColor: "#ffffff"
+            }
+         ],
+         "expo-font",
+         "expo-image-picker",
+         "expo-web-browser",
+         [
+            "@react-native-firebase/app",
+            {
+               ios: {
+                  googleServicesFile: process.env.IOS_GOOGLE_SERVICES_FILE
+               }
+            }
+         ]
+      ],
+      experiments: {
+         typedRoutes: true
+      },
+      extra: {
+         router: {},
+         eas: {
+            projectId: "cfe34fb8-da8c-4004-b5c6-29d07df75cf2"
+         },
+         URL_API: process.env.URL_API,
+         URL_OTP: process.env.URL_OTP,
+         URL_STORAGE: process.env.URL_STORAGE,
+         URL_FIREBASE_DB: process.env.URL_FIREBASE_DB,
+         PASS_ENC: process.env.PASS_ENC,
+         WA_SERVER_TOKEN: process.env.WA_SERVER_TOKEN,
+      }
+   }
+};

app.json.bak

@@ -14,7 +14,8 @@
       "bundleIdentifier": "mobiledarmasaba.app",
       "infoPlist": {
         "ITSAppUsesNonExemptEncryption": false
-      }
+      },
+      "googleServicesFile": "./ios/mobiledarmasaba/GoogleService-Info.plist"
     },
     "android": {
       "package": "mobiledarmasaba.app",
@@ -41,7 +42,16 @@
         }
       ],
       "expo-font",
-      "expo-web-browser"
+      "expo-image-picker",
+      "expo-web-browser",
+      [
+        "@react-native-firebase/app",
+        {
+          "ios": {
+            "googleServicesFile": "./ios/mobiledarmasaba/GoogleService-Info.plist"
+          }
+        }
+      ]
     ],
     "experiments": {
       "typedRoutes": true

app/(application)/_layout.tsx

@@ -6,26 +6,32 @@ import HeaderRightGroupList from "@/components/group/headerGroupList";
 import HeaderMemberList from "@/components/member/headerMemberList";
 import HeaderRightPositionList from "@/components/position/headerRightPositionList";
 import HeaderRightProjectList from "@/components/project/headerProjectList";
+import Text from "@/components/Text";
+import ToastCustom from "@/components/toastCustom";
 import { Headers } from "@/constants/Headers";
 import { apiReadOneNotification } from "@/lib/api";
 import { pushToPage } from "@/lib/pushToPage";
 import store from "@/lib/store";
 import { useAuthSession } from "@/providers/AuthProvider";
-import messaging from "@react-native-firebase/messaging";
-import { Redirect, router, Stack } from "expo-router";
+import AsyncStorage from "@react-native-async-storage/async-storage";
+import { getApp } from "@react-native-firebase/app";
+import { getMessaging, onMessage } from "@react-native-firebase/messaging";
+import { Redirect, router, Stack, usePathname } from "expo-router";
 import { StatusBar } from 'expo-status-bar';
 import { useEffect } from "react";
-import { Text } from "react-native";
 import { Easing, Notifier } from 'react-native-notifier';
 import { Provider } from "react-redux";
 
 export default function RootLayout() {
    const { token, decryptToken, isLoading } = useAuthSession()
+   const pathname = usePathname()
 
-   async function handleReadNotification(id: string, category: string, idContent: string) {
+   async function handleReadNotification(id: string, category: string, idContent: string, title: string) {
       try {
-         const hasil = await decryptToken(String(token?.current))
-         const response = await apiReadOneNotification({ user: hasil, id: id })
+         if (title != "Komentar Baru") {
+            const hasil = await decryptToken(String(token?.current))
+            const response = await apiReadOneNotification({ user: hasil, id: id })
+         }
          pushToPage(category, idContent)
       } catch (error) {
          console.error(error)
@@ -33,25 +39,46 @@ export default function RootLayout() {
    }
 
    useEffect(() => {
-      const unsubscribe = messaging().onMessage(async remoteMessage => {
+      const checkNavigation = async () => {
+         const navData = await AsyncStorage.getItem('navigateOnOpen');
+         if (navData) {
+            const { screen, content } = JSON.parse(navData);
+            await AsyncStorage.removeItem('navigateOnOpen'); // reset
+            pushToPage(screen, content)
+         }
+      };
+
+      checkNavigation();
+   }, []);
+
+   useEffect(() => {
+      const mess = getMessaging(getApp());
+
+      const unsubscribe = onMessage(mess, async remoteMessage => {
          const id = remoteMessage?.data?.id;
          const category = remoteMessage?.data?.category;
          const content = remoteMessage?.data?.content;
-         if (remoteMessage.notification != undefined && remoteMessage.notification.title != undefined && remoteMessage.notification.body != undefined) {
-            Notifier.showNotification({
-               title: remoteMessage.notification?.title,
-               description: remoteMessage.notification?.body,
-               duration: 3000,
-               animationDuration: 300,
-               showEasing: Easing.ease,
-               onPress: () => handleReadNotification(String(id), String(category), String(content)),
-               hideOnPress: true,
-            });
+         const title = remoteMessage?.notification?.title;
+
+         if (remoteMessage.notification?.title && remoteMessage.notification?.body) {
+            if (category === 'discussion-general' && pathname === '/discussion/' + content) {
+               return null;
+            } else if (pathname !== `/${category}/${content}`) {
+               Notifier.showNotification({
+                  title: title,
+                  description: remoteMessage.notification?.body,
+                  duration: 3000,
+                  animationDuration: 300,
+                  showEasing: Easing.ease,
+                  onPress: () => handleReadNotification(String(id), String(category), String(content), String(title)),
+                  hideOnPress: true,
+               });
+            }
          }
       });
 
       return unsubscribe;
-   }, []);
+   }, [pathname]);
 
 
    if (isLoading) {
@@ -121,7 +148,8 @@ export default function RootLayout() {
                }}
             />
          </Stack>
-         <StatusBar style="light" translucent={false} backgroundColor="black" />
+         <StatusBar style={'light'} translucent={false} backgroundColor="black" />
+         <ToastCustom />
       </Provider>
    )
 }

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

@@ -1,15 +1,22 @@
 import HeaderRightAnnouncementDetail from "@/components/announcement/headerAnnouncementDetail";
+import BorderBottomItem from "@/components/borderBottomItem";
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import Skeleton from "@/components/skeleton";
 import Text from '@/components/Text';
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiGetAnnouncementOne } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { Entypo, MaterialIcons } from "@expo/vector-icons";
+import { Entypo, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons";
+import * as FileSystem from 'expo-file-system';
+import { startActivityAsync } from 'expo-intent-launcher';
 import { router, Stack, useLocalSearchParams } from "expo-router";
-import { useEffect, useState } from "react";
-import { Dimensions, SafeAreaView, ScrollView, View } from "react-native";
+import * as Sharing from 'expo-sharing';
+import React, { useEffect, useState } from "react";
+import { Alert, Dimensions, Platform, RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
+import * as mime from 'react-native-mime-types';
 import RenderHTML from 'react-native-render-html';
+import Toast from "react-native-toast-message";
 import { useSelector } from "react-redux";
 
 type Props = {
@@ -23,21 +30,30 @@ export default function DetailAnnouncement() {
    const { token, decryptToken } = useAuthSession()
    const [data, setData] = useState<Props>({ id: '', title: '', desc: '' })
    const [dataMember, setDataMember] = useState<any>({})
+   const [dataFile, setDataFile] = useState<{ idStorage: string; name: string; extension: string }[]>([])
    const update = useSelector((state: any) => state.announcementUpdate)
    const entityUser = useSelector((state: any) => state.user)
    const contentWidth = Dimensions.get('window').width
    const [loading, setLoading] = useState(true)
    const arrSkeleton = Array.from({ length: 2 }, (_, index) => index)
+   const [refreshing, setRefreshing] = useState(false)
+   const [loadingOpen, setLoadingOpen] = useState(false)
+
 
    async function handleLoad(loading: boolean) {
       try {
          setLoading(loading)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiGetAnnouncementOne({ id: id, user: hasil })
-         setData(response.data)
-         setDataMember(response.member)
+         if (response.success) {
+            setData(response.data)
+            setDataMember(response.member)
+         } else {
+            Toast.show({ type: 'small', text1: response.message })
+         }
       } catch (error) {
          console.error(error)
+         Toast.show({ type: 'small', text1: 'Gagal mengambil data' })
       } finally {
          setLoading(false)
       }
@@ -51,6 +67,49 @@ export default function DetailAnnouncement() {
       handleLoad(true)
    }, [])
 
+   function hasHtmlTags(text: string) {
+      const htmlRegex = /<[a-z][\s\S]*>/i;
+      return htmlRegex.test(text);
+   };
+
+   const handleRefresh = async () => {
+      setRefreshing(true)
+      handleLoad(false)
+      await new Promise(resolve => setTimeout(resolve, 2000));
+      setRefreshing(false)
+   };
+
+   const openFile = (item: { idStorage: string; name: string; extension: string }) => {
+      if (Platform.OS == 'android') setLoadingOpen(true)
+      let remoteUrl = ConstEnv.url_storage + '/files/' + item.idStorage;
+      const fileName = item.name + '.' + item.extension;
+      let localPath = `${FileSystem.documentDirectory}/${fileName}`;
+      const mimeType = mime.lookup(fileName)
+
+      FileSystem.downloadAsync(remoteUrl, localPath).then(async ({ uri }) => {
+         const contentURL = await FileSystem.getContentUriAsync(uri);
+         setLoadingOpen(false)
+         try {
+            if (Platform.OS == 'android') {
+               await startActivityAsync(
+                  'android.intent.action.VIEW',
+                  {
+                     data: contentURL,
+                     flags: 1,
+                     type: mimeType as string,
+                  }
+               );
+            } else if (Platform.OS == 'ios') {
+               Sharing.shareAsync(localPath);
+            }
+         } catch (error) {
+            Alert.alert('INFO', 'Gagal membuka file, tidak ada aplikasi yang dapat membuka file ini');
+         } finally {
+            if (Platform.OS == 'android') setLoadingOpen(false)
+         }
+      });
+   };
+
    return (
       <SafeAreaView>
          <Stack.Screen
@@ -61,7 +120,16 @@ export default function DetailAnnouncement() {
                headerRight: () => entityUser.role != 'user' && entityUser.role != 'coadmin' ? <HeaderRightAnnouncementDetail id={id} /> : <></>,
             }}
          />
-         <ScrollView>
+         <ScrollView
+            showsVerticalScrollIndicator={false}
+            style={[Styles.h100]}
+            refreshControl={
+               <RefreshControl
+                  refreshing={refreshing}
+                  onRefresh={() => handleRefresh()}
+               />
+            }
+         >
             <View style={[Styles.p15]}>
                <View style={[Styles.wrapPaper]}>
                   {
@@ -79,21 +147,46 @@ export default function DetailAnnouncement() {
                         </View>
                         :
                         <>
-                           <View style={Styles.rowItemsCenter}>
+                           <View style={[Styles.rowItemsCenter, { alignItems: 'flex-start' }]}>
                               <MaterialIcons name="campaign" size={30} color="black" style={Styles.mr05} />
-                              <Text style={[Styles.textDefaultSemiBold]}>{data?.title}</Text>
+                              <Text style={[Styles.textDefaultSemiBold, Styles.w90]}>{data?.title}</Text>
                            </View>
                            <View style={[Styles.mt10]}>
-                              <RenderHTML
-                                 contentWidth={contentWidth}
-                                 source={{ html: data?.desc }}
-                              />
+                              {
+                                 hasHtmlTags(data?.desc) ?
+                                    <RenderHTML
+                                       contentWidth={contentWidth}
+                                       source={{ html: data?.desc }}
+                                       baseStyle={{ color: 'black' }}
+                                    />
+                                    :
+                                    <Text>{data?.desc}</Text>
+                              }
                            </View>
                         </>
                   }
 
                </View>
-               <View style={[Styles.wrapPaper, Styles.mv15]}>
+               {
+                  dataFile.length > 0 && (
+                     <View style={[Styles.wrapPaper, Styles.mt10]}>
+                        <View style={[Styles.mb05]}>
+                           <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                        </View>
+                        {dataFile.map((item, index) => (
+                           <BorderBottomItem
+                              key={index}
+                              borderType="bottom"
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
+                              title={item.name}
+                              titleWeight="normal"
+                              onPress={() => { openFile({ idStorage: item.idStorage, name: item.name, extension: item.extension }) }}
+                           />
+                        ))}
+                     </View>
+                  )
+               }
+               <View style={[Styles.wrapPaper, Styles.mt10]}>
                   {
                      loading ?
                         arrSkeleton.map((item, index) => {

app/(application)/announcement/create.tsx

@@ -1,16 +1,22 @@
+import BorderBottomItem from "@/components/borderBottomItem";
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import ButtonSelect from "@/components/buttonSelect";
+import DrawerBottom from "@/components/drawerBottom";
 import { InputForm } from "@/components/inputForm";
+import MenuItemRow from "@/components/menuItemRow";
 import ModalSelectMultiple from "@/components/modalSelectMultiple";
+import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
 import { setUpdateAnnouncement } from "@/lib/announcementUpdate";
 import { apiCreateAnnouncement } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { Entypo } from "@expo/vector-icons";
+import { Entypo, Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
+import * as DocumentPicker from "expo-document-picker";
 import { router, Stack } from "expo-router";
 import { useEffect, useState } from "react";
-import { SafeAreaView, ScrollView, StyleSheet, Text, ToastAndroid, View } from "react-native";
+import { SafeAreaView, ScrollView, StyleSheet, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function CreateAnnouncement() {
@@ -19,7 +25,11 @@ export default function CreateAnnouncement() {
    const { token, decryptToken } = useAuthSession()
    const [disableBtn, setDisableBtn] = useState(true);
    const [modalDivisi, setModalDivisi] = useState(false);
-   const [divisionMember, setDivisionMember] = useState<any>([]);
+   const [divisionMember, setDivisionMember] = useState<any>([])
+   const [loading, setLoading] = useState(false)
+   const [fileForm, setFileForm] = useState<any[]>([])
+   const [isModalFile, setModalFile] = useState(false)
+   const [indexDelFile, setIndexDelFile] = useState<number>(0)
    const [dataForm, setDataForm] = useState({
       title: "",
       desc: "",
@@ -64,20 +74,42 @@ export default function CreateAnnouncement() {
 
    async function handleCreate() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiCreateAnnouncement({
             data: { ...dataForm, user: hasil, groups: divisionMember },
          });
          if (response.success) {
             dispatch(setUpdateAnnouncement(!update))
-            ToastAndroid.show("Berhasil menambahkan data", ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
             router.back();
          }
       } catch (error) {
          console.error(error);
+      } finally {
+         setLoading(false)
       }
    }
 
+   const pickDocumentAsync = async () => {
+      let result = await DocumentPicker.getDocumentAsync({
+         type: ["*/*"],
+         multiple: true
+      });
+      if (!result.canceled) {
+         for (let i = 0; i < result.assets?.length; i++) {
+            if (result.assets[i].uri) {
+               setFileForm((prev) => [...prev, result.assets[i]])
+            }
+         }
+      }
+   };
+
+   function deleteFile(index: number) {
+      setFileForm([...fileForm.filter((val, i) => i !== index)])
+      setModalFile(false)
+   }
+
    return (
       <SafeAreaView>
          <Stack.Screen
@@ -93,19 +125,22 @@ export default function CreateAnnouncement() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disableBtn}
+                     disable={disableBtn || divisionMember.length == 0 || loading ? true : false}
                      category="create"
                      onPress={() => {
                         divisionMember.length == 0
-                           ? ToastAndroid.show("Anda belum memilih divisi", ToastAndroid.SHORT)
+                           ? Toast.show({ type: 'small', text1: "Anda belum memilih divisi", })
                            : handleCreate();
                      }}
                   />
                ),
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
+         <ScrollView
+            showsVerticalScrollIndicator={false}
+            style={[Styles.h100]}
+         >
+            <View style={[Styles.p15]}>
                <InputForm
                   label="Judul"
                   type="default"
@@ -125,6 +160,27 @@ export default function CreateAnnouncement() {
                   onChange={(val) => validationForm("desc", val)}
                   multiline
                />
+               <ButtonSelect value="Upload File" onPress={pickDocumentAsync} />
+               {
+                  fileForm.length > 0
+                  &&
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
+                     <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                     {
+                        fileForm.map((item, index) => (
+                           <BorderBottomItem
+                              key={index}
+                              borderType={fileForm.length > 1 ? "bottom" : "none"}
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
+                              title={item.name}
+                              titleWeight="normal"
+                              onPress={() => { setIndexDelFile(index); setModalFile(true) }}
+                           />
+                        ))
+                     }
+                  </View>
+               }
+
                <ButtonSelect
                   value="Pilih divisi penerima pengumuman"
                   onPress={() => {
@@ -143,9 +199,9 @@ export default function CreateAnnouncement() {
                                  <Text style={[Styles.textDefaultSemiBold]}>{item.name}</Text>
                                  {
                                     item.Division.map((division: any, i: any) => (
-                                       <View key={i} style={[Styles.rowItemsCenter, Styles.mv05]}>
+                                       <View key={i} style={[Styles.rowItemsCenter, Styles.w90]}>
                                           <Entypo name="dot-single" size={24} color="black" />
-                                          <Text style={[Styles.textDefault]}>{division.name}</Text>
+                                          <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode='tail'>{division.name}</Text>
                                        </View>
                                     ))
                                  }
@@ -169,6 +225,16 @@ export default function CreateAnnouncement() {
                setModalDivisi(false)
             }}
          />
+
+         <DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
+            <View style={Styles.rowItemsCenter}>
+               <MenuItemRow
+                  icon={<Ionicons name="trash" color="black" size={25} />}
+                  title="Hapus"
+                  onPress={() => { deleteFile(indexDelFile) }}
+               />
+            </View>
+         </DrawerBottom>
       </SafeAreaView>
    );
 }

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

@@ -1,17 +1,22 @@
+import BorderBottomItem from "@/components/borderBottomItem";
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import ButtonSelect from "@/components/buttonSelect";
+import DrawerBottom from "@/components/drawerBottom";
 import { InputForm } from "@/components/inputForm";
+import MenuItemRow from "@/components/menuItemRow";
 import ModalSelectMultiple from "@/components/modalSelectMultiple";
 import Text from '@/components/Text';
 import Styles from "@/constants/Styles";
 import { setUpdateAnnouncement } from "@/lib/announcementUpdate";
 import { apiEditAnnouncement, apiGetAnnouncementOne } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { Entypo } from "@expo/vector-icons";
+import { Entypo, Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
+import * as DocumentPicker from "expo-document-picker";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native";
+import { SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 
@@ -32,6 +37,10 @@ export default function EditAnnouncement() {
    const [modalDivisi, setModalDivisi] = useState(false);
    const [disableBtn, setDisableBtn] = useState(true);
    const [dataMember, setDataMember] = useState<any>([]);
+   const [fileForm, setFileForm] = useState<any[]>([])
+   const [indexDelFile, setIndexDelFile] = useState<number>(0)
+   const [isModalFile, setModalFile] = useState(false)
+   const [loading, setLoading] = useState(false)
    const [dataForm, setDataForm] = useState({
       title: "",
       desc: "",
@@ -108,20 +117,42 @@ export default function EditAnnouncement() {
 
    async function handleEdit() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiEditAnnouncement({
             ...dataForm, user: hasil, groups: dataMember,
          }, id);
          if (response.success) {
             dispatch(setUpdateAnnouncement(!update))
-            ToastAndroid.show("Berhasil mengubah data", ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
             router.back();
          }
       } catch (error) {
          console.error(error);
+      } finally {
+         setLoading(false)
       }
    }
 
+   const pickDocumentAsync = async () => {
+      let result = await DocumentPicker.getDocumentAsync({
+         type: ["*/*"],
+         multiple: true
+      });
+      if (!result.canceled) {
+         for (let i = 0; i < result.assets?.length; i++) {
+            if (result.assets[i].uri) {
+               setFileForm((prev) => [...prev, result.assets[i]])
+            }
+         }
+      }
+   };
+
+   function deleteFile(index: number) {
+      setFileForm([...fileForm.filter((val, i) => i !== index)])
+      setModalFile(false)
+   }
+
    return (
       <SafeAreaView>
          <Stack.Screen
@@ -137,19 +168,22 @@ export default function EditAnnouncement() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disableBtn}
+                     disable={disableBtn || loading ? true : false}
                      category="update"
                      onPress={() => {
                         dataMember.length == 0
-                           ? ToastAndroid.show("Anda belum memilih divisi", ToastAndroid.SHORT)
+                           ? Toast.show({ type: 'small', text1: "Anda belum memilih divisi", })
                            : handleEdit();
                      }}
                   />
                ),
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
+         <ScrollView
+            showsVerticalScrollIndicator={false}
+            style={[Styles.h100]}
+         >
+            <View style={[Styles.p15]}>
                <InputForm
                   label="Judul"
                   type="default"
@@ -171,6 +205,26 @@ export default function EditAnnouncement() {
                   value={dataForm.desc}
                   multiline
                />
+               <ButtonSelect value="Upload File" onPress={pickDocumentAsync} />
+               {
+                  fileForm.length > 0
+                  &&
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
+                     <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                     {
+                        fileForm.map((item, index) => (
+                           <BorderBottomItem
+                              key={index}
+                              borderType={fileForm.length > 1 ? "bottom" : "none"}
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
+                              title={item.name}
+                              titleWeight="normal"
+                              onPress={() => { setIndexDelFile(index); setModalFile(true) }}
+                           />
+                        ))
+                     }
+                  </View>
+               }
                <ButtonSelect
                   value="Pilih divisi penerima pengumuman"
                   onPress={() => {
@@ -188,9 +242,9 @@ export default function EditAnnouncement() {
                                  <Text style={[Styles.textDefaultSemiBold]}>{item.name}</Text>
                                  {
                                     item.Division.map((division: any, i: any) => (
-                                       <View key={i} style={[Styles.rowItemsCenter, Styles.mv05]}>
+                                       <View key={i} style={[Styles.rowItemsCenter, Styles.w90]}>
                                           <Entypo name="dot-single" size={24} color="black" />
-                                          <Text style={[Styles.textDefault]}>{division.name}</Text>
+                                          <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode='tail'>{division.name}</Text>
                                        </View>
                                     ))
                                  }
@@ -215,6 +269,16 @@ export default function EditAnnouncement() {
             }}
             value={dataMember}
          />
+
+         <DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
+            <View style={Styles.rowItemsCenter}>
+               <MenuItemRow
+                  icon={<Ionicons name="trash" color="black" size={25} />}
+                  title="Hapus"
+                  onPress={() => { deleteFile(indexDelFile) }}
+               />
+            </View>
+         </DrawerBottom>
       </SafeAreaView>
    );
 }

app/(application)/announcement/index.tsx

@@ -87,7 +87,7 @@ export default function Announcement() {
          <View>
             <InputSearch onChange={setSearch} />
          </View>
-         <View style={[{ flex: 2 }, Styles.mb50]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   arrSkeleton.map((item, index) => {
@@ -114,7 +114,7 @@ export default function Announcement() {
                                     </View>
                                  }
                                  title={item.title}
-                                 desc={item.desc.replace(/<[^>]*>?/gm, '')}
+                                 desc={item.desc.replace(/<[^>]*>?/gm, '').replace(/\r?\n|\r/g, ' ')}
                                  rightTopInfo={item.createdAt}
                               />
                            )

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

@@ -1,6 +1,8 @@
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
+import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiEditBanner, apiGetBanner, apiGetBannerOne } from "@/lib/api";
 import { setEntities } from "@/lib/bannerSlice";
@@ -14,10 +16,9 @@ import {
    Pressable,
    SafeAreaView,
    ScrollView,
-   Text,
-   ToastAndroid,
-   View,
+   View
 } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch } from "react-redux";
 
 export default function EditBanner() {
@@ -30,11 +31,12 @@ export default function EditBanner() {
    const [title, setTitle] = useState("");
    const [error, setError] = useState(false);
    const [imgForm, setImgForm] = useState<any>();
+   const [loading, setLoading] = useState(false)
 
    const pickImageAsync = async () => {
       let result = await ImagePicker.launchImageLibraryAsync({
          mediaTypes: ["images"],
-         allowsEditing: true,
+         allowsEditing: false,
          quality: 1,
          aspect: [1535, 450],
       });
@@ -42,8 +44,6 @@ export default function EditBanner() {
       if (!result.canceled) {
          setSelectedImage(result.assets[0].uri);
          setImgForm(result.assets[0]);
-      } else {
-         alert("Tidak ada gambar yang dipilih");
       }
    };
 
@@ -51,7 +51,7 @@ export default function EditBanner() {
       const hasil = await decryptToken(String(token?.current));
       const data = await apiGetBannerOne({ user: hasil, id });
       setSelectedImage({
-         uri: `https://wibu-storage.wibudev.com/api/files/${data.data.image}`,
+         uri: `${ConstEnv.url_storage}/files/${data.data.image}`,
       });
       setTitle(data.data.title);
    };
@@ -71,6 +71,7 @@ export default function EditBanner() {
 
    const handleUpdateEntity = async () => {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current));
          const fd = new FormData();
 
@@ -94,17 +95,19 @@ export default function EditBanner() {
 
          const updatedEntity = await apiEditBanner(fd, id)
          if (updatedEntity.success) {
-            ToastAndroid.show("Berhasil mengupdate data", ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: 'Berhasil mengupdate data', })
             apiGetBanner({ user: hasil }).then((data) =>
                dispatch(setEntities(data.data))
             );
             router.back();
          } else {
-            ToastAndroid.show('Gagal mengupdate data', ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: 'Gagal mengupdate data', })
          }
       } catch (error) {
          console.error(error);
-         ToastAndroid.show('Gagal mengupdate data', ToastAndroid.SHORT);
+         Toast.show({ type: 'small', text1: 'Gagal mengupdate data', })
+      } finally {
+         setLoading(false)
       }
    };
 
@@ -122,12 +125,12 @@ export default function EditBanner() {
                headerTitle: "Edit Banner",
                headerTitleAlign: "center",
                headerRight: () => <ButtonSaveHeader
-                  disable={title == "" || error ? true : false}
+                  disable={title == "" || error || loading ? true : false}
                   onPress={() => { handleUpdateEntity() }}
                   category="update" />,
             }}
          />
-         <ScrollView>
+         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100]}>
             <View style={[Styles.p15, Styles.mb100]}>
                <View style={[Styles.mb15]}>
                   {selectedImage != undefined ? (
@@ -151,7 +154,7 @@ export default function EditBanner() {
                         >
                            <Entypo name="image" size={50} color={"#aeaeae"} />
                            <Text style={[Styles.textInformation, Styles.mt05]}>
-                              Mohon unggah gambar dalam resolusi 1535 x 450 piksel untuk
+                              Mohon unggah gambar dalam resolusi 1650 x 720 pixel untuk
                               memastikan
                            </Text>
                         </View>

app/(application)/banner/create.tsx

@@ -1,6 +1,7 @@
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
+import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
 import { apiCreateBanner, apiGetBanner } from "@/lib/api";
 import { setEntities } from "@/lib/bannerSlice";
@@ -14,10 +15,9 @@ import {
    Pressable,
    SafeAreaView,
    ScrollView,
-   Text,
-   ToastAndroid,
-   View,
+   View
 } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch } from "react-redux";
 
 export default function CreateBanner() {
@@ -29,11 +29,12 @@ export default function CreateBanner() {
    const [imgForm, setImgForm] = useState<any>();
    const [title, setTitle] = useState("");
    const [error, setError] = useState(false);
+   const [loading, setLoading] = useState(false)
 
    const pickImageAsync = async () => {
       let result = await ImagePicker.launchImageLibraryAsync({
          mediaTypes: ["images"],
-         allowsEditing: true,
+         allowsEditing: false,
          quality: 1,
          aspect: [1535, 450],
       });
@@ -41,8 +42,6 @@ export default function CreateBanner() {
          if (result.assets?.[0].uri) {
             setSelectedImage(result.assets[0].uri);
             setImgForm(result.assets[0]);
-         } else {
-            alert("Tidak ada gambar yang dipilih");
          }
       }
    };
@@ -57,32 +56,40 @@ export default function CreateBanner() {
    }
 
    const handleCreateEntity = async () => {
-      const hasil = await decryptToken(String(token?.current));
-      const fd = new FormData();
+      try {
+         setLoading(true)
+         const hasil = await decryptToken(String(token?.current));
+         const fd = new FormData();
 
-      fd.append("file", {
-         uri: imgForm.uri,
-         type: imgForm.mimeType,
-         name: imgForm.fileName,
-      } as any);
+         fd.append("file", {
+            uri: imgForm.uri,
+            type: imgForm.mimeType,
+            name: imgForm.fileName,
+         } as any);
 
-      fd.append(
-         "data",
-         JSON.stringify({
-            title,
-            user: hasil,
-         })
-      );
-
-      const createdEntity = await apiCreateBanner(fd);
-      if (createdEntity.success) {
-         ToastAndroid.show("Berhasil menambahkan data", ToastAndroid.SHORT);
-         apiGetBanner({ user: hasil }).then((data) =>
-            dispatch(setEntities(data.data))
+         fd.append(
+            "data",
+            JSON.stringify({
+               title,
+               user: hasil,
+            })
          );
-         router.back();
-      } else {
-         ToastAndroid.show('Gagal menambahkan data', ToastAndroid.SHORT);
+
+         const createdEntity = await apiCreateBanner(fd);
+         if (createdEntity.success) {
+            Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
+            apiGetBanner({ user: hasil }).then((data) =>
+               dispatch(setEntities(data.data))
+            );
+            router.back();
+         } else {
+            Toast.show({ type: 'small', text1: 'Gagal menambahkan data', })
+         }
+      } catch (error) {
+         console.error(error);
+         Toast.show({ type: 'small', text1: 'Gagal menambahkan data', })
+      } finally {
+         setLoading(false)
       }
    };
 
@@ -101,7 +108,7 @@ export default function CreateBanner() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={title == "" || selectedImage == undefined || error ? true : false}
+                     disable={title == "" || selectedImage == undefined || error || loading ? true : false}
                      category="create"
                      onPress={() => {
                         handleCreateEntity();
@@ -110,8 +117,8 @@ export default function CreateBanner() {
                ),
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
+         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100]}>
+            <View style={[Styles.p15]}>
                <View style={[Styles.mb15]}>
                   {selectedImage != undefined ? (
                      <Pressable onPress={pickImageAsync}>
@@ -130,7 +137,7 @@ export default function CreateBanner() {
                         >
                            <Entypo name="image" size={50} color={"#aeaeae"} />
                            <Text style={[Styles.textInformation, Styles.mt05]}>
-                              Mohon unggah gambar dalam resolusi 1535 x 450 pixel untuk
+                              Mohon unggah gambar dalam resolusi 1650 x 720 pixel untuk
                               memastikan
                            </Text>
                         </View>

app/(application)/banner/index.tsx

@@ -5,6 +5,8 @@ import ButtonBackHeader from "@/components/buttonBackHeader"
 import DrawerBottom from "@/components/drawerBottom"
 import MenuItemRow from "@/components/menuItemRow"
 import ModalLoading from "@/components/modalLoading"
+import Text from "@/components/Text"
+import { ConstEnv } from "@/constants/ConstEnv"
 import Styles from "@/constants/Styles"
 import { apiDeleteBanner, apiGetBanner } from "@/lib/api"
 import { setEntities } from "@/lib/bannerSlice"
@@ -15,14 +17,14 @@ import { startActivityAsync } from 'expo-intent-launcher'
 import { router, Stack } from "expo-router"
 import * as Sharing from 'expo-sharing'
 import { useState } from "react"
-import { Alert, Image, Platform, RefreshControl, SafeAreaView, ScrollView, ToastAndroid, View } from "react-native"
+import { Alert, Image, Platform, RefreshControl, SafeAreaView, ScrollView, View } from "react-native"
 import * as mime from 'react-native-mime-types'
+import Toast from "react-native-toast-message"
 import { useDispatch, useSelector } from "react-redux"
 
-
 type Props = {
    id: string
-   name: string
+   title: string
    extension: string
    image: string
 }
@@ -41,17 +43,17 @@ export default function BannerList() {
       try {
          const hasil = await decryptToken(String(token?.current));
          const deletedEntity = await apiDeleteBanner({ user: hasil }, dataId);
-         if (deletedEntity.success) {
-            ToastAndroid.show("Berhasil menghapus data", ToastAndroid.SHORT);
+         if (deletedEntity.success ) {
+            Toast.show({ type: 'small', text1: 'Berhasil menghapus data', })
             apiGetBanner({ user: hasil }).then((data) =>
                dispatch(setEntities(data.data))
             );
          } else {
-            ToastAndroid.show('Gagal menghapus data', ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: 'Gagal menghapus data', })
          }
       } catch (error) {
          console.error(error)
-         ToastAndroid.show('Terjadi kesalahan', ToastAndroid.SHORT)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
       } finally {
          setModal(false)
       }
@@ -70,8 +72,8 @@ export default function BannerList() {
    const openFile = () => {
       setModal(false)
       setLoadingOpen(true)
-      let remoteUrl = 'https://wibu-storage.wibudev.com/api/files/' + selectFile?.image;
-      const fileName = selectFile?.name + '.' + selectFile?.extension;
+      let remoteUrl = ConstEnv.url_storage + '/files/' + selectFile?.image;
+      const fileName = selectFile?.title + '.' + selectFile?.extension;
       let localPath = `${FileSystem.documentDirectory}/${fileName}`;
       const mimeType = mime.lookup(fileName)
 
@@ -80,7 +82,6 @@ export default function BannerList() {
          try {
 
             if (Platform.OS == 'android') {
-               // open with android intent
                await startActivityAsync(
                   'android.intent.action.VIEW',
                   {
@@ -89,9 +90,6 @@ export default function BannerList() {
                      type: mimeType as string,
                   }
                );
-               // or
-               // Sharing.shareAsync(localPath);      
-
             } else if (Platform.OS == 'ios') {
                Sharing.shareAsync(localPath);
             }
@@ -122,30 +120,42 @@ export default function BannerList() {
                   onRefresh={handleRefresh}
                />
             }
+            style={[Styles.h100]}
          >
-            <View style={[Styles.p15, Styles.mb100]}>
-               {entities.map((index: any, key: number) => (
-                  <BorderBottomItem
-                     key={key}
-                     onPress={() => {
-                        setDataId(index.id)
-                        setSelectFile(index)
-                        setModal(true)
-                     }}
-                     borderType="all"
-                     icon={
-                        <Image
-                           source={{ uri: `https://wibu-storage.wibudev.com/api/files/${index.image}` }}
-                           style={[Styles.imgListBanner]}
+            {
+               entities.length > 0
+                  ?
+                  <View style={[Styles.p15, Styles.mb100]}>
+                     {entities.map((index: any, key: number) => (
+                        <BorderBottomItem
+                           key={key}
+                           onPress={() => {
+                              setDataId(index.id)
+                              setSelectFile(index)
+                              setModal(true)
+                           }}
+                           borderType="all"
+                           icon={
+                              <Image
+                                 source={{ uri: `${ConstEnv.url_storage}/files/${index.image}` }}
+                                 style={[Styles.imgListBanner]}
+                              />
+                           }
+                           title={index.title}
+                           width={65}
                         />
-                     }
-                     title={index.title}
-                  />
-               ))}
-            </View>
+                     ))}
+                  </View>
+                  :
+                  <View style={[Styles.p15, Styles.mb100]}>
+                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
+                  </View>
+            }
+
+
          </ScrollView>
 
-         <DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title="Menu">
+         <DrawerBottom animation="slide" isVisible={isModal} setVisible={() => setModal(false)} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
                   icon={<MaterialCommunityIcons name="pencil-outline" color="black" size={25} />}
@@ -157,7 +167,7 @@ export default function BannerList() {
                />
                <MenuItemRow
                   icon={<MaterialCommunityIcons name="file-eye" color="black" size={25} />}
-                  title="Lihat File"
+                  title="Lihat / Share"
                   onPress={() => { openFile() }}
                />
                <MenuItemRow

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

@@ -1,21 +1,30 @@
+import AlertKonfirmasi from "@/components/alertKonfirmasi";
 import BorderBottomItem from "@/components/borderBottomItem";
+import BorderBottomItem2 from "@/components/borderBottomItem2";
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import HeaderRightDiscussionGeneralDetail from "@/components/discussion_general/headerDiscussionDetail";
+import DrawerBottom from "@/components/drawerBottom";
 import ImageUser from "@/components/imageNew";
 import { InputForm } from "@/components/inputForm";
 import LabelStatus from "@/components/labelStatus";
+import MenuItemRow from "@/components/menuItemRow";
 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";
-import { apiGetDiscussionGeneralOne, apiSendDiscussionGeneralCommentar } from "@/lib/api";
+import { apiDeleteDiscussionGeneralCommentar, apiGetDiscussionGeneralOne, apiSendDiscussionGeneralCommentar, apiUpdateDiscussionGeneralCommentar } from "@/lib/api";
+import { getDB } from "@/lib/firebaseDatabase";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { Ionicons, MaterialIcons } from "@expo/vector-icons";
-import { firebase } from '@react-native-firebase/database';
+import { Feather, Ionicons, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons";
+import { ref } from '@react-native-firebase/database';
+import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { Pressable, ScrollView, View } from "react-native";
-import Text from '@/components/Text';
+import { KeyboardAvoidingView, Platform, Pressable, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useSelector } from "react-redux";
 
 type Props = {
@@ -34,11 +43,14 @@ type PropsKomentar = {
    idUser: string
    img: string
    username: string
+   isEdited: boolean
+   updatedAt: string
 }
 
 export default function DetailDiscussionGeneral() {
    const { token, decryptToken } = useAuthSession()
    const entityUser = useSelector((state: any) => state.user)
+   const entities = useSelector((state: any) => state.entities)
    const { id } = useLocalSearchParams<{ id: string }>();
    const [data, setData] = useState<Props>()
    const [dataKomentar, setDataKomentar] = useState<PropsKomentar[]>([])
@@ -48,7 +60,18 @@ export default function DetailDiscussionGeneral() {
    const [loading, setLoading] = useState(true)
    const [loadingKomentar, setLoadingKomentar] = useState(true)
    const arrSkeleton = Array.from({ length: 3 }, (_, index) => index)
-   const reference = firebase.app().database('https://mobile-darmasaba-default-rtdb.asia-southeast1.firebasedatabase.app').ref(`/discussion-general/${id}`);
+   const reference = ref(getDB(), `/discussion-general/${id}`);
+   const headerHeight = useHeaderHeight();
+   const [detailMore, setDetailMore] = useState<any>([])
+   const [loadingSendKomentar, setLoadingSendKomentar] = useState(false)
+   const [isVisible, setVisible] = useState(false)
+   const [selectKomentar, setSelectKomentar] = useState({
+      id: '',
+      comment: ''
+   })
+   const [viewEdit, setViewEdit] = useState(false)
+
+
 
    useEffect(() => {
       const onValueChange = reference.on('value', snapshot => {
@@ -111,19 +134,70 @@ export default function DetailDiscussionGeneral() {
 
    async function handleKomentar() {
       try {
+         setLoadingSendKomentar(true)
          if (komentar != '') {
             const hasil = await decryptToken(String(token?.current))
             const response = await apiSendDiscussionGeneralCommentar({ id: id, data: { desc: komentar, user: hasil } })
             if (response.success) {
                setKomentar('')
                updateTrigger()
+            } else {
+               Toast.show({ type: 'small', text1: response.message })
             }
          }
       } catch (error) {
          console.error(error)
+      } finally {
+         setLoadingSendKomentar(false)
       }
    }
 
+   async function handleEditKomentar() {
+      try {
+         setLoadingSendKomentar(true)
+         const hasil = await decryptToken(String(token?.current))
+         const response = await apiUpdateDiscussionGeneralCommentar({ id: selectKomentar.id, data: { desc: selectKomentar.comment, user: hasil } })
+         if (response.success) {
+            updateTrigger()
+         } else {
+            Toast.show({ type: 'small', text1: response.message })
+         }
+      } catch (error) {
+         console.error(error)
+      } finally {
+         setLoadingSendKomentar(false)
+         handleViewEditKomentar()
+      }
+   }
+
+   async function handleDeleteKomentar() {
+      try {
+         setLoadingSendKomentar(true)
+         const hasil = await decryptToken(String(token?.current))
+         const response = await apiDeleteDiscussionGeneralCommentar({ id: selectKomentar.id, data: { user: hasil } })
+         if (response.success) {
+            updateTrigger()
+         } else {
+            Toast.show({ type: 'small', text1: response.message })
+         }
+      } catch (error) {
+         console.error(error)
+      } finally {
+         setLoadingSendKomentar(false)
+         setVisible(false)
+      }
+   }
+
+   function handleMenuKomentar(id: string, comment: string) {
+      setSelectKomentar({ id, comment })
+      setVisible(true)
+   }
+
+   function handleViewEditKomentar() {
+      setVisible(false)
+      setViewEdit(!viewEdit)
+   }
+
    return (
       <>
          <Stack.Screen
@@ -135,15 +209,14 @@ export default function DetailDiscussionGeneral() {
             }}
          />
          <View style={{ flex: 1 }}>
-            <ScrollView>
+            <ScrollView showsVerticalScrollIndicator={false}>
                <View style={[Styles.p15, Styles.mb100]}>
                   {
                      loading ?
                         <SkeletonContent />
                         :
-                        <BorderBottomItem
+                        <BorderBottomItem2
                            descEllipsize={false}
-                           width={55}
                            borderType="bottom"
                            icon={
                               <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
@@ -151,13 +224,13 @@ export default function DetailDiscussionGeneral() {
                               </View>
                            }
                            title={data?.title}
+                           titleShowAll={true}
                            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]}>
@@ -165,6 +238,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]}>
@@ -180,14 +258,28 @@ export default function DetailDiscussionGeneral() {
                               return (
                                  <BorderBottomItem
                                     key={i}
-                                    width={55}
                                     borderType="bottom"
+                                    colorPress
                                     icon={
-                                       <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} size="xs" />
+                                       <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="xs" />
                                     }
                                     title={item.username}
                                     rightTopInfo={item.createdAt}
                                     desc={item.comment}
+                                    rightBottomInfo={item.isEdited ? "Edited" : ""}
+                                    descEllipsize={detailMore.includes(item.id) ? false : true}
+                                    onPress={() => {
+                                       setDetailMore((prev: any) => {
+                                          if (prev.includes(item.id)) {
+                                             return prev.filter((id: string) => id !== item.id)
+                                          } else {
+                                             return [...prev, item.id]
+                                          }
+                                       })
+                                    }}
+                                    onLongPress={() => {
+                                       item.idUser == entities.id && data?.status != 2 && data?.isActive && handleMenuKomentar(item.id, item.comment)
+                                    }}
                                  />
                               )
                            })
@@ -195,31 +287,114 @@ export default function DetailDiscussionGeneral() {
                   </View>
                </View>
             </ScrollView>
-            <View style={[
-               Styles.contentItemCenter,
-               Styles.absolute0,
-               Styles.w100,
-               { backgroundColor: "#f4f4f4" },
-            ]}>
-               <InputForm
-                  disable={(data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin")))}
-                  type="default"
-                  round
-                  placeholder="Kirim Komentar"
-                  bg="white"
-                  onChange={setKomentar}
-                  value={komentar}
-                  itemRight={
-                     <Pressable onPress={() => {
-                        (komentar != '' && data?.status === 1 && data?.isActive && (memberDiscussion || (entityUser.role != "user" && entityUser.role != "coadmin")))
-                           && handleKomentar()
-                     }}>
-                        <MaterialIcons name="send" size={25} style={(komentar == '' || data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin"))) ? Styles.cGray : Styles.cDefault} />
-                     </Pressable>
+            <KeyboardAvoidingView
+               behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+               keyboardVerticalOffset={headerHeight}
+            >
+               <View style={[
+                  Styles.contentItemCenter,
+                  Styles.w100,
+                  { backgroundColor: "#f4f4f4" },
+                  viewEdit && Styles.borderTop
+               ]}>
+                  {
+                     viewEdit ?
+                        <>
+                           <View style={[Styles.w90, Styles.rowSpaceBetween, Styles.pv05]}>
+                              <View style={[Styles.rowItemsCenter]}>
+                                 <Feather name="edit-3" color="black" size={22} style={[Styles.mh05]} />
+                                 <Text style={[Styles.textMediumSemiBold]}>Edit Komentar</Text>
+                              </View>
+                              <Pressable onPress={() => handleViewEditKomentar()}>
+                                 <MaterialIcons name="close" color="black" size={22} />
+                              </Pressable>
+                           </View>
+                           <InputForm
+                              disable={(data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin")))}
+                              type="default"
+                              round
+                              placeholder="Kirim Komentar"
+                              bg="white"
+                              onChange={(val: string) => setSelectKomentar({ ...selectKomentar, comment: val })}
+                              value={selectKomentar.comment}
+                              multiline
+                              focus={viewEdit}
+                              itemRight={
+                                 <Pressable onPress={() => {
+                                    (!loadingSendKomentar && selectKomentar.comment != '' && !regexOnlySpacesOrEnter.test(selectKomentar.comment) && data?.status === 1 && data?.isActive && (memberDiscussion || (entityUser.role != "user" && entityUser.role != "coadmin")))
+                                       && handleEditKomentar()
+                                 }}
+                                    style={[
+                                       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} />
+                                 </Pressable>
+                              }
+                           />
+                        </>
+                        :
+                        data?.status != 2 && data?.isActive && ((entityUser.role != "user" && entityUser.role != "coadmin") || memberDiscussion)
+                           ?
+                           <InputForm
+                              disable={(data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin")))}
+                              type="default"
+                              round
+                              placeholder="Kirim Komentar"
+                              bg="white"
+                              onChange={setKomentar}
+                              value={komentar}
+                              multiline
+                              focus={viewEdit}
+                              itemRight={
+                                 <Pressable onPress={() => {
+                                    (!loadingSendKomentar && komentar != '' && !regexOnlySpacesOrEnter.test(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={(loadingSendKomentar || komentar == '' || regexOnlySpacesOrEnter.test(komentar) || data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin"))) ? Styles.cGray : Styles.cDefault} />
+                                 </Pressable>
+                              }
+                           />
+                           :
+                           <View style={[Styles.pv20, { alignItems: 'center' }]}>
+                              <Text style={[Styles.textInformation, Styles.cGray]}>
+                                 {
+                                    data?.status == 2 ? "Diskusi telah ditutup" : data?.isActive == false ? "Diskusi telah diarsipkan" : "Hanya anggota diskusi yang dapat memberikan komentar"
+                                 }
+                              </Text>
+                           </View>
                   }
+
+               </View>
+            </KeyboardAvoidingView>
+         </View >
+
+         <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Komentar">
+            <View style={Styles.rowItemsCenter}>
+               <MenuItemRow
+                  icon={<MaterialCommunityIcons name="pencil-outline" color="black" size={25} />}
+                  title="Edit"
+                  onPress={() => { handleViewEditKomentar() }}
+               />
+               <MenuItemRow
+                  icon={<MaterialIcons name="delete" color="black" size={25} />}
+                  title="Hapus"
+                  onPress={() => {
+                     AlertKonfirmasi({
+                        title: 'Konfirmasi',
+                        desc: 'Apakah anda yakin ingin menghapus komentar?',
+                        onPress: () => {
+                           handleDeleteKomentar()
+                        }
+                     })
+                  }}
                />
             </View>
-         </View >
+         </DrawerBottom>
       </>
    )
 }

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

@@ -4,6 +4,7 @@ import ImageUser from "@/components/imageNew";
 import ImageWithLabel from "@/components/imageWithLabel";
 import InputSearch from "@/components/inputSearch";
 import Text from '@/components/Text';
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiAddMemberDiscussionGeneral, apiGetDiscussionGeneralOne, apiGetUser } from "@/lib/api";
 import { setUpdateDiscussionGeneralDetail } from "@/lib/discussionGeneralDetail";
@@ -11,7 +12,8 @@ import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign } from "@expo/vector-icons";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { Pressable, SafeAreaView, ScrollView, ToastAndroid, View } from "react-native";
+import { Pressable, SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 type Props = {
@@ -30,6 +32,7 @@ export default function AddMemberDiscussionDetail() {
    const [idGroup, setIdGroup] = useState('')
    const [selectMember, setSelectMember] = useState<any[]>([])
    const [search, setSearch] = useState('')
+   const [loading, setLoading] = useState(false)
 
    async function handleLoad() {
       try {
@@ -69,15 +72,21 @@ export default function AddMemberDiscussionDetail() {
 
    async function handleAddMember() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiAddMemberDiscussionGeneral({ id: id, data: { user: hasil, member: selectMember } })
          if (response.success) {
-            ToastAndroid.show('Berhasil menambahkan anggota', ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: 'Berhasil menambahkan anggota', })
             dispatch(setUpdateDiscussionGeneralDetail(!update))
             router.back()
+         } else {
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error)
+         Toast.show({ type: 'small', text1: 'Gagal menambahkan anggota', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -92,7 +101,7 @@ export default function AddMemberDiscussionDetail() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="update"
-                     disable={selectMember.length > 0 ? false : true}
+                     disable={selectMember.length == 0 || loading ? true : false}
                      onPress={() => {
                         handleAddMember()
                      }}
@@ -107,13 +116,13 @@ export default function AddMemberDiscussionDetail() {
                selectMember.length > 0
                   ?
                   <View>
-                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]}>
+                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]} showsHorizontalScrollIndicator={false}>
                         {
                            selectMember.map((item: any, index: any) => (
                               <ImageWithLabel
                                  key={index}
                                  label={item.name}
-                                 src={item.img}
+                                 src={`${ConstEnv.url_storage}/files/${item.img}`}
                                  onClick={() => onChoose(item.idUser, item.name, item.img)}
                               />
                            ))
@@ -124,7 +133,9 @@ export default function AddMemberDiscussionDetail() {
                   :
                   <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
             }
-            <ScrollView>
+            <ScrollView
+               showsVerticalScrollIndicator={false}
+            >
 
                {
                   data.length > 0 ?
@@ -139,7 +150,7 @@ export default function AddMemberDiscussionDetail() {
                               }}
                            >
                               <View style={[Styles.rowItemsCenter]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]}>{item.name}</Text>
                                     {
@@ -148,7 +159,7 @@ export default function AddMemberDiscussionDetail() {
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} />
+                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )

app/(application)/discussion/create.tsx

@@ -2,19 +2,25 @@ import BorderBottomItem from "@/components/borderBottomItem";
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import ButtonSelect from "@/components/buttonSelect";
+import DrawerBottom from "@/components/drawerBottom";
 import ImageUser from "@/components/imageNew";
 import { InputForm } from "@/components/inputForm";
+import MenuItemRow from "@/components/menuItemRow";
 import ModalSelect from "@/components/modalSelect";
 import SelectForm from "@/components/selectForm";
 import Text from '@/components/Text';
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiCreateDiscussionGeneral } from "@/lib/api";
 import { setUpdateDiscussionGeneralDetail } from "@/lib/discussionGeneralDetail";
 import { setMemberChoose } from "@/lib/memberChoose";
 import { useAuthSession } from "@/providers/AuthProvider";
+import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
+import * as DocumentPicker from "expo-document-picker";
 import { router, Stack } from "expo-router";
 import { useEffect, useState } from "react";
-import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native";
+import { SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 
@@ -30,6 +36,10 @@ export default function CreateDiscussionGeneral() {
    const [isSelect, setSelect] = useState(false);
    const entitiesMember = useSelector((state: any) => state.memberChoose)
    const update = useSelector((state: any) => state.discussionGeneralDetailUpdate)
+   const [loading, setLoading] = useState(false)
+   const [fileForm, setFileForm] = useState<any[]>([])
+   const [isModalFile, setModalFile] = useState(false)
+   const [indexDelFile, setIndexDelFile] = useState<number>(0)
    const [dataForm, setDataForm] = useState({
       idGroup: "",
       title: "",
@@ -83,14 +93,37 @@ export default function CreateDiscussionGeneral() {
       checkForm();
    }, [error, dataForm]);
 
+   useEffect(() => {
+      dispatch(setMemberChoose([]))
+   }, [])
 
    function handleBack() {
       dispatch(setMemberChoose([]))
       router.back()
    }
 
+   const pickDocumentAsync = async () => {
+      let result = await DocumentPicker.getDocumentAsync({
+         type: ["*/*"],
+         multiple: true
+      });
+      if (!result.canceled) {
+         for (let i = 0; i < result.assets?.length; i++) {
+            if (result.assets[i].uri) {
+               setFileForm((prev) => [...prev, result.assets[i]])
+            }
+         }
+      }
+   };
+
+   function deleteFile(index: number) {
+      setFileForm([...fileForm.filter((val, i) => i !== index)])
+      setModalFile(false)
+   }
+
    async function handleCreate() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiCreateDiscussionGeneral({
             data: { ...dataForm, user: hasil, member: entitiesMember },
@@ -98,11 +131,16 @@ export default function CreateDiscussionGeneral() {
          if (response.success) {
             dispatch(setMemberChoose([]))
             dispatch(setUpdateDiscussionGeneralDetail(!update))
-            ToastAndroid.show('Berhasil menambahkan data', ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
             router.back()
+         } else {
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -120,20 +158,17 @@ export default function CreateDiscussionGeneral() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="create"
-                     disable={disableBtn}
+                     disable={disableBtn || loading ? true : false}
                      onPress={() => {
                         entitiesMember.length == 0
-                           ? ToastAndroid.show(
-                              "Anda belum memilih anggota",
-                              ToastAndroid.SHORT
-                           )
+                           ? Toast.show({ type: 'small', text1: 'Anda belum memilih anggota', })
                            : handleCreate()
                      }}
                   />
                ),
             }}
          />
-         <ScrollView>
+         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100]}>
             <View style={[Styles.p15, Styles.mb100]}>
                {
                   (entityUser.role == "supadmin" ||
@@ -170,7 +205,28 @@ export default function CreateDiscussionGeneral() {
                   error={error.desc}
                   errorText="Diskusi tidak boleh kosong"
                   onChange={(val) => { validationForm("desc", val) }}
+                  multiline
                />
+               <ButtonSelect value="Upload File" onPress={pickDocumentAsync} />
+               {
+                  fileForm.length > 0
+                  &&
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
+                     <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                     {
+                        fileForm.map((item, index) => (
+                           <BorderBottomItem
+                              key={index}
+                              borderType={fileForm.length > 1 ? "bottom" : "none"}
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
+                              title={item.name}
+                              titleWeight="normal"
+                              onPress={() => { setIndexDelFile(index); setModalFile(true) }}
+                           />
+                        ))
+                     }
+                  </View>
+               }
                <ButtonSelect
                   value="Pilih Anggota"
                   onPress={() => {
@@ -179,12 +235,9 @@ export default function CreateDiscussionGeneral() {
                            setSelect(true);
                            setValSelect("member");
                         } else {
-                           ToastAndroid.show(
-                              "Pilih Lembaga Desa terlebih dahulu",
-                              ToastAndroid.SHORT
-                           );
+                           Toast.show({ type: 'small', text1: 'Pilih Lembaga Desa terlebih dahulu', })
                         }
-                     }else{
+                     } else {
                         validationForm('group', userLogin.idGroup, userLogin.group);
                         setValChoose(userLogin.idGroup)
                         setSelect(true);
@@ -209,7 +262,7 @@ export default function CreateDiscussionGeneral() {
                                     key={index}
                                     borderType="bottom"
                                     icon={
-                                       <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} size="sm" />
+                                       <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="sm" />
                                     }
                                     title={item.name}
                                  />
@@ -233,6 +286,16 @@ export default function CreateDiscussionGeneral() {
             idParent={valSelect == "member" ? chooseGroup.val : ""}
             valChoose={valChoose}
          />
+
+         <DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
+            <View style={Styles.rowItemsCenter}>
+               <MenuItemRow
+                  icon={<Ionicons name="trash" color="black" size={25} />}
+                  title="Hapus"
+                  onPress={() => { deleteFile(indexDelFile) }}
+               />
+            </View>
+         </DrawerBottom>
       </SafeAreaView>
    );
 }

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

@@ -1,13 +1,21 @@
+import Text from "@/components/Text";
+import BorderBottomItem from "@/components/borderBottomItem";
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
+import ButtonSelect from "@/components/buttonSelect";
+import DrawerBottom from "@/components/drawerBottom";
 import { InputForm } from "@/components/inputForm";
+import MenuItemRow from "@/components/menuItemRow";
 import Styles from "@/constants/Styles";
 import { apiEditDiscussionGeneral, apiGetDiscussionGeneralOne } from "@/lib/api";
 import { setUpdateDiscussionGeneralDetail } from "@/lib/discussionGeneralDetail";
 import { useAuthSession } from "@/providers/AuthProvider";
+import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
+import * as DocumentPicker from "expo-document-picker";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native";
+import { SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function EditDiscussionGeneral() {
@@ -15,6 +23,10 @@ export default function EditDiscussionGeneral() {
    const { id } = useLocalSearchParams<{ id: string }>();
    const [disableBtn, setDisableBtn] = useState(false)
    const dispatch = useDispatch()
+   const [loading, setLoading] = useState(false)
+   const [fileForm, setFileForm] = useState<any[]>([])
+   const [isModalFile, setModalFile] = useState(false)
+   const [indexDelFile, setIndexDelFile] = useState<number>(0)
    const update = useSelector((state: any) => state.discussionGeneralDetailUpdate)
    const [dataForm, setDataForm] = useState({
       title: "",
@@ -76,18 +88,41 @@ export default function EditDiscussionGeneral() {
       checkForm()
    }, [error, dataForm])
 
+   const pickDocumentAsync = async () => {
+      let result = await DocumentPicker.getDocumentAsync({
+         type: ["*/*"],
+         multiple: true
+      });
+      if (!result.canceled) {
+         for (let i = 0; i < result.assets?.length; i++) {
+            if (result.assets[i].uri) {
+               setFileForm((prev) => [...prev, result.assets[i]])
+            }
+         }
+      }
+   };
+
+   function deleteFile(index: number) {
+      setFileForm([...fileForm.filter((val, i) => i !== index)])
+      setModalFile(false)
+   }
+
 
    async function handleEdit() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current));
          const response = await apiEditDiscussionGeneral({ user: hasil, title: dataForm.title, desc: dataForm.desc }, id);
          if (response.success) {
             dispatch(setUpdateDiscussionGeneralDetail(!update))
-            ToastAndroid.show("Berhasil mengubah data", ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
             router.back();
          }
       } catch (error) {
          console.error(error);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -106,14 +141,14 @@ export default function EditDiscussionGeneral() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disableBtn}
+                     disable={disableBtn || loading ? true : false}
                      category="update"
                      onPress={() => { handleEdit() }}
                   />
                ),
             }}
          />
-         <ScrollView>
+         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100]}>
             <View style={[Styles.p15]}>
                <InputForm
                   label="Judul"
@@ -134,9 +169,40 @@ export default function EditDiscussionGeneral() {
                   value={dataForm.desc}
                   errorText="Diskusi tidak boleh kosong"
                   onChange={(val) => validationForm("desc", val)}
+                  multiline
                />
+               <ButtonSelect value="Upload File" onPress={pickDocumentAsync} />
+               {
+                  fileForm.length > 0
+                  &&
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
+                     <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                     {
+                        fileForm.map((item, index) => (
+                           <BorderBottomItem
+                              key={index}
+                              borderType={fileForm.length > 1 ? "bottom" : "none"}
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
+                              title={item.name}
+                              titleWeight="normal"
+                              onPress={() => { setIndexDelFile(index); setModalFile(true) }}
+                           />
+                        ))
+                     }
+                  </View>
+               }
             </View>
          </ScrollView>
+
+         <DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
+            <View style={Styles.rowItemsCenter}>
+               <MenuItemRow
+                  icon={<Ionicons name="trash" color="black" size={25} />}
+                  title="Hapus"
+                  onPress={() => { deleteFile(indexDelFile) }}
+               />
+            </View>
+         </DrawerBottom>
       </SafeAreaView>
    );
 }

app/(application)/discussion/index.tsx

@@ -3,6 +3,7 @@ import ButtonTab from "@/components/buttonTab";
 import InputSearch from "@/components/inputSearch";
 import LabelStatus from "@/components/labelStatus";
 import SkeletonContent from "@/components/skeletonContent";
+import Text from "@/components/Text";
 import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
 import { apiGetDiscussionGeneral } from "@/lib/api";
@@ -10,7 +11,7 @@ import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign, Feather, Ionicons, MaterialIcons } from "@expo/vector-icons";
 import { router, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { RefreshControl, Text, View, VirtualizedList } from "react-native";
+import { RefreshControl, View, VirtualizedList } from "react-native";
 import { useSelector } from "react-redux";
 
 
@@ -97,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") &&
@@ -121,7 +126,7 @@ export default function Discussion() {
                </View>
             }
          </View>
-         <View style={[{ flex: 2 }]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   arrSkeleton.map((item: any, i: number) => {
@@ -152,7 +157,7 @@ export default function Discussion() {
                                     status != "false" && <LabelStatus category={item.status === 1 ? "success" : "error"} text={item.status === 1 ? "BUKA" : "TUTUP"} size="small" />
                                  }
                                  rightTopInfo={item.createdAt}
-                                 desc={item.desc}
+                                 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} />
@@ -175,34 +180,6 @@ export default function Discussion() {
                            />
                         }
                      />
-                     // data.map((item: any, i: number) => {
-                     //    return (
-                     //       <BorderBottomItem
-                     //          key={i}
-                     //          onPress={() => { router.push(`/discussion/${item.id}`) }}
-                     //          borderType="bottom"
-                     //          icon={
-                     //             <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                     //                <MaterialIcons name="chat" size={25} color={'#384288'} />
-                     //             </View>
-                     //          }
-                     //          title={item.title}
-                     //          subtitle={
-                     //             status != "false" && <LabelStatus category={item.status === 1 ? "success" : "error"} text={item.status === 1 ? "BUKA" : "TUTUP"} size="small" />
-                     //          }
-                     //          rightTopInfo={item.createdAt}
-                     //          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>
-                     //             </View>
-                     //          }
-                     //          rightBottomInfo={`${item.total_komentar} Komentar`}
-
-                     //       />
-                     //    )
-                     // })
                      :
                      <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
             }

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

@@ -7,13 +7,15 @@ import MenuItemRow from "@/components/menuItemRow";
 import SkeletonTwoItem from "@/components/skeletonTwoItem";
 import Text from '@/components/Text';
 import { ColorsStatus } from "@/constants/ColorsStatus";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiDeleteMemberDiscussionGeneral, apiGetDiscussionGeneralOne } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { Feather, MaterialCommunityIcons } from "@expo/vector-icons";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native";
+import { SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useSelector } from "react-redux";
 
 type Props = {
@@ -59,7 +61,7 @@ export default function MemberDiscussionDetail() {
       try {
          const hasil = await decryptToken(String(token?.current))
          await apiDeleteMemberDiscussionGeneral({ user: hasil, idUser: chooseUser.idUser }, id)
-         ToastAndroid.show("Berhasil mengeluarkan anggota dari diskusi", ToastAndroid.SHORT)
+         Toast.show({ type: 'small', text1: 'Berhasil mengeluarkan anggota dari diskusi', })
          handleLoad(false)
       } catch (error) {
          console.error(error)
@@ -108,7 +110,7 @@ export default function MemberDiscussionDetail() {
                                  key={index}
                                  borderType="bottom"
                                  icon={
-                                    <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} size="sm" />
+                                    <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="sm" />
                                  }
                                  title={item.name}
                                  onPress={() => {
@@ -133,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>

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

@@ -3,6 +3,8 @@ import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import ImageUser from "@/components/imageNew";
 import ImageWithLabel from "@/components/imageWithLabel";
 import InputSearch from "@/components/inputSearch";
+import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiAddMemberCalendar, apiGetCalendarOne, apiGetDivisionMember } from "@/lib/api";
 import { setUpdateCalendar } from "@/lib/calendarUpdate";
@@ -10,7 +12,8 @@ import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign } from "@expo/vector-icons";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { Pressable, SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native";
+import { Pressable, SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 type Props = {
@@ -29,6 +32,7 @@ export default function AddMemberCalendarEvent() {
    const [selectMember, setSelectMember] = useState<any[]>([])
    const [search, setSearch] = useState('')
    const [idCalendar, setIdCalendar] = useState('')
+   const [loading, setLoading] = useState(false)
 
    async function handleLoadOldMember() {
       try {
@@ -76,18 +80,21 @@ export default function AddMemberCalendarEvent() {
 
    async function handleAddMember() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiAddMemberCalendar({ id: idCalendar, data: { user: hasil, member: selectMember } })
          if (response.success) {
-            ToastAndroid.show('Berhasil menambahkan anggota', ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: 'Berhasil menambahkan anggota', })
             dispatch(setUpdateCalendar({ ...update, member: !update.member }))
             router.back()
          } else {
-            ToastAndroid.show(response.message, ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error)
-         ToastAndroid.show('Terjadi kesalahan', ToastAndroid.SHORT)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -102,7 +109,7 @@ export default function AddMemberCalendarEvent() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="update"
-                     disable={selectMember.length > 0 ? false : true}
+                     disable={selectMember.length == 0 || loading ? true : false}
                      onPress={() => {
                         handleAddMember()
                      }}
@@ -116,13 +123,13 @@ export default function AddMemberCalendarEvent() {
                selectMember.length > 0
                   ?
                   <View>
-                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]}>
+                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]} showsHorizontalScrollIndicator={false}>
                         {
                            selectMember.map((item: any, index: any) => (
                               <ImageWithLabel
                                  key={index}
                                  label={item.name}
-                                 src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                 src={`${ConstEnv.url_storage}/files/${item.img}`}
                                  onClick={() => onChoose(item.idUser, item.name, item.img)}
                               />
                            ))
@@ -133,7 +140,10 @@ export default function AddMemberCalendarEvent() {
                   :
                   <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
             }
-            <ScrollView>
+            <ScrollView
+               showsVerticalScrollIndicator={false}
+               style={[Styles.h100]}
+            >
                {
                   data.length > 0 ?
                      data.map((item: any, index: any) => {
@@ -144,11 +154,10 @@ export default function AddMemberCalendarEvent() {
                               style={[Styles.itemSelectModal]}
                               onPress={() => {
                                  !found && onChoose(item.idUser, item.name, item.img)
-                                 onChoose(item.idUser, item.name, item.img)
                               }}
                            >
                               <View style={[Styles.rowItemsCenter]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10, { width: '80%' }]}>
                                     <Text numberOfLines={1} ellipsizeMode="tail" style={[Styles.textDefault]}>{item.name}</Text>
                                     {
@@ -157,7 +166,7 @@ export default function AddMemberCalendarEvent() {
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} />
+                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )

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

@@ -9,10 +9,12 @@ import { valueTypeEventRepeat } from "@/constants/TypeEventRepeat"
 import { apiGetCalendarOne, apiUpdateCalendar } from "@/lib/api"
 import { stringToDateTime } from "@/lib/fun_stringToDate"
 import { useAuthSession } from "@/providers/AuthProvider"
+import { useHeaderHeight } from "@react-navigation/elements"
 import { Stack, router, useLocalSearchParams } from "expo-router"
 import moment from "moment"
 import { useEffect, useState } from "react"
-import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native"
+import { KeyboardAvoidingView, Platform, SafeAreaView, ScrollView, View } from "react-native"
+import Toast from "react-native-toast-message"
 
 export default function EditEventCalendar() {
    const { token, decryptToken } = useAuthSession();
@@ -20,6 +22,8 @@ export default function EditEventCalendar() {
    const [isSelect, setSelect] = useState(false)
    const { id, detail } = useLocalSearchParams<{ id: string, detail: string }>()
    const [idCalendar, setIdCalendar] = useState('')
+   const [loading, setLoading] = useState(false)
+   const headerHeight = useHeaderHeight()
 
    const [error, setError] = useState({
       title: false,
@@ -53,7 +57,7 @@ export default function EditEventCalendar() {
          setChoose({ val: response.data.repeatEventTyper, label: valueTypeEventRepeat.find((item) => item.id == response.data.repeatEventTyper)?.name || "" })
       } catch (error) {
          console.error(error);
-         ToastAndroid.show('Gagal mendapatkan data', ToastAndroid.SHORT)
+         Toast.show({ type: 'small', text1: 'Gagal mendapatkan data', })
       }
    }
 
@@ -139,17 +143,20 @@ export default function EditEventCalendar() {
 
    async function handleUpdate() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiUpdateCalendar({ data: { ...data, user: hasil }, id: idCalendar })
          if (response.success) {
             router.replace(`/division/${id}/calendar/`)
-            ToastAndroid.show('Berhasil mengubah acara', ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: 'Berhasil mengubah acara', })
          } else {
-            ToastAndroid.show(response.message, ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error)
-         ToastAndroid.show('Gagal mengubah acara', ToastAndroid.SHORT)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -163,7 +170,7 @@ export default function EditEventCalendar() {
                headerTitleAlign: 'center',
                headerRight: () =>
                   <ButtonSaveHeader
-                     disable={Object.values(error).some((val) => val == true) || data.title == "" || data.dateStart == "" || data.timeStart == "" || data.timeEnd == "" || data.repeatEventTyper == ""}
+                     disable={Object.values(error).some((val) => val == true) || data.title == "" || data.dateStart == "" || data.timeStart == "" || data.timeEnd == "" || data.repeatEventTyper == "" || loading}
                      category="update-calendar"
                      onPress={() => {
                         handleUpdate()
@@ -171,94 +178,100 @@ export default function EditEventCalendar() {
                   />
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
-               <InputForm
-                  label="Nama Acara"
-                  type="default"
-                  placeholder="Nama Acara"
-                  required
-                  bg="white"
-                  value={data.title}
-                  onChange={(val) => validationForm("title", val)}
-                  error={error.title}
-                  errorText="Nama acara tidak boleh kosong"
-               />
-               <InputDate
-                  onChange={(val) => validationForm("dateStart", val)}
-                  mode="date"
-                  value={data.dateStart}
-                  label="Tanggal Acara"
-                  required
-                  error={error.dateStart}
-                  errorText="Tanggal acara tidak boleh kosong"
-                  placeholder="Pilih Tanggal Acara"
-               />
-               <View style={[Styles.rowSpaceBetween, Styles.mv10]}>
-                  <View style={[{ width: "48%" }]}>
-                     <InputDate
-                        onChange={(val) => validationForm("timeStart", val)}
-                        mode="time"
-                        value={data.timeStart}
-                        label="Waktu Awal"
-                        required
-                        error={error.timeStart}
-                        errorText="Waktu awal tidak valid"
-                        placeholder="--:--"
-                     />
-                  </View>
-                  <View style={[{ width: "48%" }]}>
-                     <InputDate
-                        onChange={(val) => validationForm("timeEnd", val)}
-                        mode="time"
-                        value={data.timeEnd}
-                        label="Waktu Akhir"
-                        required
-                        error={error.timeEnd}
-                        errorText="Waktu akhir tidak valid"
-                        placeholder="--:--"
-                     />
+         <KeyboardAvoidingView
+            behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+            keyboardVerticalOffset={headerHeight}
+         >
+            <ScrollView>
+               <View style={[Styles.p15]}>
+                  <InputForm
+                     label="Nama Acara"
+                     type="default"
+                     placeholder="Nama Acara"
+                     required
+                     bg="white"
+                     value={data.title}
+                     onChange={(val) => validationForm("title", val)}
+                     error={error.title}
+                     errorText="Nama acara tidak boleh kosong"
+                  />
+                  <InputDate
+                     onChange={(val) => validationForm("dateStart", val)}
+                     mode="date"
+                     value={data.dateStart}
+                     label="Tanggal Acara"
+                     required
+                     error={error.dateStart}
+                     errorText="Tanggal acara tidak boleh kosong"
+                     placeholder="Pilih Tanggal Acara"
+                  />
+                  <View style={[Styles.rowSpaceBetween, Styles.mv10]}>
+                     <View style={[{ width: "48%" }]}>
+                        <InputDate
+                           onChange={(val) => validationForm("timeStart", val)}
+                           mode="time"
+                           value={data.timeStart}
+                           label="Waktu Awal"
+                           required
+                           error={error.timeStart}
+                           errorText="Waktu awal tidak valid"
+                           placeholder="--:--"
+                        />
+                     </View>
+                     <View style={[{ width: "48%" }]}>
+                        <InputDate
+                           onChange={(val) => validationForm("timeEnd", val)}
+                           mode="time"
+                           value={data.timeEnd}
+                           label="Waktu Akhir"
+                           required
+                           error={error.timeEnd}
+                           errorText="Waktu akhir tidak valid"
+                           placeholder="--:--"
+                        />
+                     </View>
                   </View>
+                  <InputForm
+                     label="Link Meet"
+                     type="default"
+                     placeholder="Link Meet"
+                     bg="white"
+                     value={data.linkMeet}
+                     onChange={(val) => validationForm("linkMeet", val)}
+                  />
+                  <SelectForm
+                     bg="white"
+                     label="Ulangi Acara"
+                     placeholder="Ulangi Acara"
+                     value={choose.label}
+                     required
+                     onPress={() => { setSelect(true) }}
+                  />
+                  <InputForm
+                     label="Jumlah Pengulangan"
+                     type="numeric"
+                     placeholder="Jumlah Pengulangan"
+                     required
+                     bg="white"
+                     value={String(data.repeatValue)}
+                     onChange={(val) => validationForm("repeatValue", val)}
+                     error={error.repeatValue}
+                     errorText="Jumlah pengulangan tidak valid"
+                     disable={choose.val == "once"}
+                  />
+                  <InputForm
+                     label="Deskripsi"
+                     type="default"
+                     placeholder="Deskripsi"
+                     bg="white"
+                     value={data.desc}
+                     onChange={(val) => validationForm("desc", val)}
+                     multiline
+                  />
                </View>
-               <InputForm
-                  label="Link Meet"
-                  type="default"
-                  placeholder="Link Meet"
-                  bg="white"
-                  value={data.linkMeet}
-                  onChange={(val) => validationForm("linkMeet", val)}
-               />
-               <SelectForm
-                  bg="white"
-                  label="Ulangi Acara"
-                  placeholder="Ulangi Acara"
-                  value={choose.label}
-                  required
-                  onPress={() => { setSelect(true) }}
-               />
-               <InputForm
-                  label="Jumlah Pengulangan"
-                  type="numeric"
-                  placeholder="Jumlah Pengulangan"
-                  required
-                  bg="white"
-                  value={String(data.repeatValue)}
-                  onChange={(val) => validationForm("repeatValue", val)}
-                  error={error.repeatValue}
-                  errorText="Jumlah pengulangan tidak valid"
-                  disable={choose.val == "once"}
-               />
-               <InputForm
-                  label="Deskripsi"
-                  type="default"
-                  placeholder="Deskripsi"
-                  bg="white"
-                  value={data.desc}
-                  onChange={(val) => validationForm("desc", val)}
-                  multiline
-               />
-            </View>
-         </ScrollView>
+            </ScrollView>
+         </KeyboardAvoidingView>
+
 
          <ModalSelect
             category={"type-event-repeat"}

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

@@ -6,14 +6,18 @@ import DrawerBottom from "@/components/drawerBottom"
 import ImageUser from "@/components/imageNew"
 import MenuItemRow from "@/components/menuItemRow"
 import Skeleton from "@/components/skeleton"
+import Text from "@/components/Text"
+import { ConstEnv } from "@/constants/ConstEnv"
 import Styles from "@/constants/Styles"
 import { apiDeleteCalendarMember, apiGetCalendarOne, apiGetDivisionOneFeature } from "@/lib/api"
 import { setUpdateCalendar } from "@/lib/calendarUpdate"
 import { useAuthSession } from "@/providers/AuthProvider"
 import { MaterialCommunityIcons } from "@expo/vector-icons"
+import Clipboard from "@react-native-clipboard/clipboard"
 import { router, Stack, useLocalSearchParams } from "expo-router"
 import { useEffect, useState } from "react"
-import { SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native"
+import { Pressable, RefreshControl, SafeAreaView, ScrollView, View } from "react-native"
+import Toast from "react-native-toast-message"
 import { useDispatch, useSelector } from "react-redux"
 
 type Props = {
@@ -51,7 +55,7 @@ export default function DetailEventCalendar() {
    const entityUser = useSelector((state: any) => state.user);
    const [isMemberDivision, setIsMemberDivision] = useState(false);
    const [loading, setLoading] = useState(true)
-   const arrSkeleton = Array.from({ length: 5 })
+   const [refreshing, setRefreshing] = useState(false)
 
    async function handleCheckMember() {
       try {
@@ -68,9 +72,9 @@ export default function DetailEventCalendar() {
       }
    }
 
-   async function handleLoad() {
+   async function handleLoad(loading: boolean) {
       try {
-         setLoading(true)
+         setLoading(loading)
          const hasil = await decryptToken(String(token?.current));
          const response = await apiGetCalendarOne({
             user: hasil,
@@ -104,7 +108,7 @@ export default function DetailEventCalendar() {
    }
 
    useEffect(() => {
-      handleLoad();
+      handleLoad(true);
       handleCheckMember()
    }, []);
 
@@ -112,6 +116,11 @@ export default function DetailEventCalendar() {
       handleLoadMember();
    }, [update.member]);
 
+   const handleCopy = (text: string) => {
+      Clipboard.setString(text);
+      Toast.show({ type: 'small', text1: 'Berhasil menyalin link', })
+   };
+
    async function handleDeleteUser() {
       try {
          const hasil = await decryptToken(String(token?.current));
@@ -122,18 +131,25 @@ export default function DetailEventCalendar() {
 
          if (response.success) {
             dispatch(setUpdateCalendar({ ...update, member: !update.member }));
-            ToastAndroid.show(response.message, ToastAndroid.SHORT);
-         } else {
-            ToastAndroid.show(response.message, ToastAndroid.SHORT);
          }
+         Toast.show({ type: 'small', text1: response.message, })
       } catch (error) {
          console.error(error);
-         ToastAndroid.show('Terjadi kesalahan', ToastAndroid.SHORT);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
       } finally {
          setModalMember(false)
       }
    }
 
+
+   const handleRefresh = async () => {
+      setRefreshing(true)
+      handleLoad(false)
+      handleLoadMember()
+      await new Promise(resolve => setTimeout(resolve, 2000));
+      setRefreshing(false)
+   };
+
    return (
       <SafeAreaView>
          <Stack.Screen
@@ -144,15 +160,23 @@ export default function DetailEventCalendar() {
                headerRight: () => (entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision ? <></> : <HeaderRightCalendarDetail id={String(data?.idCalendar)} idReminder={String(detail)} />
             }}
          />
-         <ScrollView>
+         <ScrollView
+            style={[Styles.h100]}
+            refreshControl={
+               <RefreshControl
+                  refreshing={refreshing}
+                  onRefresh={handleRefresh}
+               />
+            }
+         >
             <View style={[Styles.p15]}>
                <View style={[Styles.wrapPaper, Styles.mb15]}>
-                  <View style={Styles.rowItemsCenter}>
+                  <View style={[Styles.rowItemsCenter, { alignItems: 'flex-start' }]}>
                      <MaterialCommunityIcons name="calendar-text" size={30} color="black" style={Styles.mr10} />
                      {
                         loading ?
                            <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
-                           : <Text style={[Styles.textDefault]}>{data?.title}</Text>
+                           : <Text style={[Styles.textDefault, Styles.w90]}>{data?.title}</Text>
                      }
 
                   </View>
@@ -198,16 +222,20 @@ export default function DetailEventCalendar() {
                         loading ?
                            <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
                            :
-                           <Text style={[Styles.textDefault]}>{data?.linkMeet ? data.linkMeet : '-'}</Text>
+                           data?.linkMeet ?
+                              <Pressable onPress={() => { handleCopy(data.linkMeet) }}>
+                                 <Text style={[Styles.textDefault]}>{data.linkMeet}</Text>
+                              </Pressable>
+                              : <Text style={[Styles.textDefault]}>-</Text>
                      }
                   </View>
-                  <View style={[Styles.rowItemsCenter, Styles.mt10]}>
+                  <View style={[Styles.rowItemsCenter, Styles.mt10, { alignItems: 'flex-start' }]}>
                      <MaterialCommunityIcons name="card-text-outline" size={30} color="black" style={Styles.mr10} />
                      {
                         loading ?
                            <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
                            :
-                           <Text style={[Styles.textDefault]}>{data?.desc}</Text>
+                           <Text style={[Styles.textDefault, Styles.w90]}>{data?.desc}</Text>
                      }
                   </View>
                </View>
@@ -224,7 +252,7 @@ export default function DetailEventCalendar() {
                            <BorderBottomItem
                               key={index}
                               borderType="bottom"
-                              icon={<ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} />}
+                              icon={<ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} />}
                               title={item.name}
                               subtitle={item.email}
                               onPress={() => {

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

@@ -3,6 +3,8 @@ import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import ImageUser from "@/components/imageNew";
 import ImageWithLabel from "@/components/imageWithLabel";
 import InputSearch from "@/components/inputSearch";
+import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiCreateCalendar, apiGetDivisionMember } from "@/lib/api";
 import { setFormCreateCalendar } from "@/lib/calendarCreate";
@@ -11,7 +13,8 @@ import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign } from "@expo/vector-icons";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { Pressable, SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native";
+import { Pressable, SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 type Props = {
@@ -29,6 +32,7 @@ export default function CreateCalendarAddMember() {
    const update = useSelector((state: any) => state.calendarCreate)
    const dispatch = useDispatch()
    const updateRefresh = useSelector((state: any) => state.calendarUpdate)
+   const [loading, setLoading] = useState(false)
 
 
 
@@ -56,10 +60,11 @@ export default function CreateCalendarAddMember() {
 
    async function handleAddMember() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiCreateCalendar({ data: { ...update, user: hasil, idDivision: id, member: selectMember } })
          if (response.success) {
-            ToastAndroid.show('Berhasil membuat acara', ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: 'Berhasil membuat acara', })
             dispatch(setFormCreateCalendar({
                title: "",
                desc: "",
@@ -74,11 +79,13 @@ export default function CreateCalendarAddMember() {
             dispatch(setUpdateCalendar({ ...updateRefresh, data: !updateRefresh.data }));
             router.replace(`/division/${id}/calendar`)
          } else {
-            ToastAndroid.show(response.message, ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error)
-         ToastAndroid.show('Gagal membuat acara', ToastAndroid.SHORT)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -92,7 +99,7 @@ export default function CreateCalendarAddMember() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="create"
-                     disable={selectMember.length > 0 ? false : true}
+                     disable={selectMember.length == 0 || loading ? true : false}
                      onPress={() => { handleAddMember() }}
                   />
                )
@@ -105,13 +112,13 @@ export default function CreateCalendarAddMember() {
                selectMember.length > 0
                   ?
                   <View>
-                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]}>
+                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]} showsHorizontalScrollIndicator={false}>
                         {
                            selectMember.map((item: any, index: any) => (
                               <ImageWithLabel
                                  key={index}
                                  label={item.name}
-                                 src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                 src={`${ConstEnv.url_storage}/files/${item.img}`}
                                  onClick={() => onChoose(item.idUser, item.name, item.img)}
                               />
                            ))
@@ -122,7 +129,10 @@ export default function CreateCalendarAddMember() {
                   :
                   <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
             }
-            <ScrollView>
+            <ScrollView
+               showsVerticalScrollIndicator={false}
+               style={[Styles.h100]}
+            >
 
                {
                   data.length > 0 ?
@@ -131,16 +141,16 @@ export default function CreateCalendarAddMember() {
                            <Pressable
                               key={index}
                               style={[Styles.itemSelectModal]}
-                              onPress={() => {onChoose(item.idUser, item.name, item.img) }}
+                              onPress={() => { onChoose(item.idUser, item.name, item.img) }}
                            >
                               <View style={[Styles.rowItemsCenter, Styles.w70]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode="tail">{item.name}</Text>
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} />
+                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )

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

@@ -10,11 +10,14 @@ import { stringToDateTime } from "@/lib/fun_stringToDate";
 import { Stack, router, useLocalSearchParams } from "expo-router";
 import { useState } from "react";
 import {
+   KeyboardAvoidingView,
+   Platform,
    SafeAreaView,
    ScrollView,
    View
 } from "react-native";
 import { useDispatch, useSelector } from "react-redux";
+import { useHeaderHeight } from '@react-navigation/elements';
 
 export default function CalendarDivisionCreate() {
    const { id } = useLocalSearchParams<{ id: string }>()
@@ -22,6 +25,7 @@ export default function CalendarDivisionCreate() {
    const [isSelect, setSelect] = useState(false)
    const update = useSelector((state: any) => state.calendarCreate)
    const dispatch = useDispatch()
+   const headerHeight = useHeaderHeight();
    const [error, setError] = useState({
       title: false,
       dateStart: false,
@@ -141,94 +145,99 @@ export default function CalendarDivisionCreate() {
                ),
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
-               <InputForm
-                  label="Nama Acara"
-                  type="default"
-                  placeholder="Nama Acara"
-                  required
-                  bg="white"
-                  value={data.title}
-                  onChange={(val) => validationForm("title", val)}
-                  error={error.title}
-                  errorText="Nama acara tidak boleh kosong"
-               />
-               <InputDate
-                  onChange={(val) => validationForm("dateStart", val)}
-                  mode="date"
-                  value={data.dateStart}
-                  label="Tanggal Acara"
-                  required
-                  error={error.dateStart}
-                  errorText="Tanggal acara tidak boleh kosong"
-                  placeholder="Pilih Tanggal Acara"
-               />
-               <View style={[Styles.rowSpaceBetween, Styles.mv10]}>
-                  <View style={[{ width: "48%" }]}>
-                     <InputDate
-                        onChange={(val) => validationForm("timeStart", val)}
-                        mode="time"
-                        value={data.timeStart}
-                        label="Waktu Awal"
-                        required
-                        error={error.timeStart}
-                        errorText="Waktu awal tidak valid"
-                        placeholder="--:--"
-                     />
-                  </View>
-                  <View style={[{ width: "48%" }]}>
-                     <InputDate
-                        onChange={(val) => validationForm("timeEnd", val)}
-                        mode="time"
-                        value={data.timeEnd}
-                        label="Waktu Akhir"
-                        required
-                        error={error.timeEnd}
-                        errorText="Waktu akhir tidak valid"
-                        placeholder="--:--"
-                     />
+         <KeyboardAvoidingView
+            behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+            keyboardVerticalOffset={headerHeight}
+         >
+            <ScrollView>
+               <View style={[Styles.p15]}>
+                  <InputForm
+                     label="Nama Acara"
+                     type="default"
+                     placeholder="Nama Acara"
+                     required
+                     bg="white"
+                     value={data.title}
+                     onChange={(val) => validationForm("title", val)}
+                     error={error.title}
+                     errorText="Nama acara tidak boleh kosong"
+                  />
+                  <InputDate
+                     onChange={(val) => validationForm("dateStart", val)}
+                     mode="date"
+                     value={data.dateStart}
+                     label="Tanggal Acara"
+                     required
+                     error={error.dateStart}
+                     errorText="Tanggal acara tidak boleh kosong"
+                     placeholder="Pilih Tanggal Acara"
+                  />
+                  <View style={[Styles.rowSpaceBetween, Styles.mv10]}>
+                     <View style={[{ width: "48%" }]}>
+                        <InputDate
+                           onChange={(val) => validationForm("timeStart", val)}
+                           mode="time"
+                           value={data.timeStart}
+                           label="Waktu Awal"
+                           required
+                           error={error.timeStart}
+                           errorText="Waktu awal tidak valid"
+                           placeholder="--:--"
+                        />
+                     </View>
+                     <View style={[{ width: "48%" }]}>
+                        <InputDate
+                           onChange={(val) => validationForm("timeEnd", val)}
+                           mode="time"
+                           value={data.timeEnd}
+                           label="Waktu Akhir"
+                           required
+                           error={error.timeEnd}
+                           errorText="Waktu akhir tidak valid"
+                           placeholder="--:--"
+                        />
+                     </View>
                   </View>
+                  <InputForm
+                     label="Link Meet"
+                     type="default"
+                     placeholder="Link Meet"
+                     bg="white"
+                     value={data.linkMeet}
+                     onChange={(val) => validationForm("linkMeet", val)}
+                  />
+                  <SelectForm
+                     bg="white"
+                     label="Ulangi Acara"
+                     placeholder="Ulangi Acara"
+                     value={choose.label}
+                     required
+                     onPress={() => { setSelect(true) }}
+                  />
+                  <InputForm
+                     label="Jumlah Pengulangan"
+                     type="numeric"
+                     placeholder="Jumlah Pengulangan"
+                     required
+                     bg="white"
+                     value={String(data.repeatValue)}
+                     onChange={(val) => validationForm("repeatValue", val)}
+                     error={error.repeatValue}
+                     errorText="Jumlah pengulangan tidak valid"
+                     disable={choose.val == "once"}
+                  />
+                  <InputForm
+                     label="Deskripsi"
+                     type="default"
+                     placeholder="Deskripsi"
+                     bg="white"
+                     value={data.desc}
+                     onChange={(val) => validationForm("desc", val)}
+                     multiline
+                  />
                </View>
-               <InputForm
-                  label="Link Meet"
-                  type="default"
-                  placeholder="Link Meet"
-                  bg="white"
-                  value={data.linkMeet}
-                  onChange={(val) => validationForm("linkMeet", val)}
-               />
-               <SelectForm
-                  bg="white"
-                  label="Ulangi Acara"
-                  placeholder="Ulangi Acara"
-                  value={choose.label}
-                  required
-                  onPress={() => { setSelect(true) }}
-               />
-               <InputForm
-                  label="Jumlah Pengulangan"
-                  type="numeric"
-                  placeholder="Jumlah Pengulangan"
-                  required
-                  bg="white"
-                  value={String(data.repeatValue)}
-                  onChange={(val) => validationForm("repeatValue", val)}
-                  error={error.repeatValue}
-                  errorText="Jumlah pengulangan tidak valid"
-                  disable={choose.val == "once"}
-               />
-               <InputForm
-                  label="Deskripsi"
-                  type="default"
-                  placeholder="Deskripsi"
-                  bg="white"
-                  value={data.desc}
-                  onChange={(val) => validationForm("desc", val)}
-                  multiline
-               />
-            </View>
-         </ScrollView>
+            </ScrollView>
+         </KeyboardAvoidingView>
 
          <ModalSelect
             category={"type-event-repeat"}

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

@@ -1,12 +1,13 @@
 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";
 import { useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { FlatList, Text, View, VirtualizedList } from "react-native";
+import { FlatList, View, VirtualizedList } from "react-native";
 
 type Props = {
    dateStart: Date

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

@@ -1,19 +1,19 @@
-import 'intl';
-import 'intl/locale-data/jsonp/id';
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import HeaderRightCalendarList from "@/components/calendar/headerCalendarList";
 import ItemDateCalendar from "@/components/calendar/itemDateCalendar";
 import EventItem from "@/components/eventItem";
 import Skeleton from "@/components/skeleton";
+import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
 import { apiGetCalendarByDateDivision, apiGetIndicatorCalendar } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { Feather } from "@expo/vector-icons";
-import dayjs from "dayjs";
 import { router, Stack, useLocalSearchParams } from "expo-router";
+import 'intl';
+import 'intl/locale-data/jsonp/id';
 import moment from "moment";
 import { useEffect, useState } from "react";
-import { Pressable, RefreshControl, SafeAreaView, ScrollView, Text, View } from "react-native";
+import { Pressable, RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
 import Datepicker, {
    CalendarComponents,
    CalendarDay
@@ -52,7 +52,7 @@ export default function CalendarDivision() {
          const hasil = await decryptToken(String(token?.current));
          const response = await apiGetCalendarByDateDivision({
             user: hasil,
-            date: dayjs(selected).format("YYYY-MM-DD"),
+            date: moment(selected).format("YYYY-MM-DD"),
             division: id,
          });
          setData(response.data);
@@ -70,14 +70,16 @@ export default function CalendarDivision() {
          const hasil = await decryptToken(String(token?.current));
          const response = await apiGetIndicatorCalendar({
             user: hasil,
-            date: dayjs(newDate).format("YYYY-MM-DD"),
+            date: moment(newDate).format("YYYY-MM-DD"),
             division: id,
          });
          setDataIndicator(response.data);
       } catch (error) {
          console.error(error);
       } finally {
-         setLoadingBtn(false)
+         setTimeout(() => {
+            setLoadingBtn(false)
+         }, 500)
       }
    }
 
@@ -110,6 +112,7 @@ export default function CalendarDivision() {
                text={day.text}
                isSelected={day.isSelected}
                isSign={sign}
+               onPress={() => setSelected(new Date(today))}
             />
          );
       },
@@ -143,7 +146,9 @@ export default function CalendarDivision() {
                   refreshing={refreshing}
                   onRefresh={handleRefresh}
                />
-            }>
+            }
+            style={[Styles.h100]}
+         >
             <View style={[Styles.p15]}>
                <View style={[Styles.wrapPaper, Styles.p10]}>
                   <Datepicker
@@ -151,9 +156,16 @@ export default function CalendarDivision() {
                      mode="single"
                      date={selected}
                      month={month}
-                     onChange={({ date }) => setSelected(date)}
+                     onMonthChange={(month) => setMonth(month)}
                      styles={{
                         selected: Styles.selectedDate,
+                        month_label: Styles.cBlack,
+                        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,
                      }}
                   />
                </View>

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

@@ -1,13 +1,21 @@
+import BorderBottomItem from "@/components/borderBottomItem";
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
+import ButtonSelect from "@/components/buttonSelect";
+import DrawerBottom from "@/components/drawerBottom";
 import { InputForm } from "@/components/inputForm";
+import MenuItemRow from "@/components/menuItemRow";
+import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
 import { apiEditDiscussion, apiGetDiscussionOne } from "@/lib/api";
 import { setUpdateDiscussion } from "@/lib/discussionUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
+import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
+import * as DocumentPicker from "expo-document-picker";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native";
+import { SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function DiscussionDivisionEdit() {
@@ -16,6 +24,10 @@ export default function DiscussionDivisionEdit() {
    const [data, setData] = useState("");
    const update = useSelector((state: any) => state.discussionUpdate);
    const dispatch = useDispatch();
+   const [loading, setLoading] = useState(false)
+   const [fileForm, setFileForm] = useState<any[]>([])
+   const [isModalFile, setModalFile] = useState(false)
+   const [indexDelFile, setIndexDelFile] = useState<number>(0)
 
    async function handleLoad() {
       try {
@@ -37,21 +49,48 @@ export default function DiscussionDivisionEdit() {
 
    async function handleUpdate() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current));
          const response = await apiEditDiscussion({
             data: { user: hasil, desc: data },
             id: detail,
          });
          if (response.success) {
-            ToastAndroid.show("Berhasil mengubah data", ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
             dispatch(setUpdateDiscussion({ ...update, data: !update.data }));
             router.back();
+         } else {
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
+   const pickDocumentAsync = async () => {
+      let result = await DocumentPicker.getDocumentAsync({
+         type: ["*/*"],
+         multiple: true
+      });
+      if (!result.canceled) {
+         for (let i = 0; i < result.assets?.length; i++) {
+            if (result.assets[i].uri) {
+               setFileForm((prev) => [...prev, result.assets[i]])
+            }
+         }
+      }
+   };
+
+
+
+   function deleteFile(index: number) {
+      setFileForm([...fileForm.filter((val, i) => i !== index)])
+      setModalFile(false)
+   }
+
    return (
       <SafeAreaView>
          <Stack.Screen
@@ -67,7 +106,7 @@ export default function DiscussionDivisionEdit() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={data == ""}
+                     disable={data == "" || loading}
                      category="update"
                      onPress={() => {
                         handleUpdate();
@@ -85,9 +124,43 @@ export default function DiscussionDivisionEdit() {
                   required
                   value={data}
                   onChange={setData}
+                  multiline
                />
+
+               <ButtonSelect value="Upload File" onPress={pickDocumentAsync} />
+               {
+                  fileForm.length > 0
+                  &&
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
+                     <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                     {
+                        fileForm.map((item, index) => (
+                           <BorderBottomItem
+                              key={index}
+                              borderType={fileForm.length > 1 ? "bottom" : "none"}
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
+                              title={item.name}
+                              titleWeight="normal"
+                              onPress={() => { setIndexDelFile(index); setModalFile(true) }}
+                           />
+                        ))
+                     }
+                  </View>
+               }
             </View>
          </ScrollView>
+
+
+         <DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
+            <View style={Styles.rowItemsCenter}>
+               <MenuItemRow
+                  icon={<Ionicons name="trash" color="black" size={25} />}
+                  title="Hapus"
+                  onPress={() => { deleteFile(indexDelFile) }}
+               />
+            </View>
+         </DrawerBottom>
+
       </SafeAreaView>
    );
 }

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

@@ -1,23 +1,35 @@
+import AlertKonfirmasi from "@/components/alertKonfirmasi";
 import BorderBottomItem from "@/components/borderBottomItem";
+import BorderBottomItem2 from "@/components/borderBottomItem2";
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import HeaderRightDiscussionDetail from "@/components/discussion/headerDiscussionDetail";
+import DrawerBottom from "@/components/drawerBottom";
 import ImageUser from "@/components/imageNew";
 import { InputForm } from "@/components/inputForm";
 import LabelStatus from "@/components/labelStatus";
+import MenuItemRow from "@/components/menuItemRow";
 import Skeleton from "@/components/skeleton";
 import SkeletonContent from "@/components/skeletonContent";
+import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
+import { regexOnlySpacesOrEnter } from "@/constants/OnlySpaceOrEnter";
 import Styles from "@/constants/Styles";
 import {
+   apiDeleteDiscussionCommentar,
+   apiEditDiscussionCommentar,
    apiGetDiscussionOne,
    apiGetDivisionOneFeature,
    apiSendDiscussionCommentar,
 } from "@/lib/api";
+import { getDB } from "@/lib/firebaseDatabase";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { Ionicons, MaterialIcons } from "@expo/vector-icons";
-import { firebase } from "@react-native-firebase/database";
+import { Feather, Ionicons, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons";
+import { ref } from "@react-native-firebase/database";
+import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { Pressable, ScrollView, Text, View } from "react-native";
+import { KeyboardAvoidingView, Platform, Pressable, RefreshControl, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useSelector } from "react-redux";
 
 type Props = {
@@ -39,6 +51,9 @@ type PropsComment = {
    createdAt: string;
    username: string;
    img: string;
+   idUser: string;
+   isEdited: boolean;
+   updatedAt: string;
 };
 
 export default function DiscussionDetail() {
@@ -56,7 +71,18 @@ export default function DiscussionDetail() {
    const [loading, setLoading] = useState(true)
    const [loadingKomentar, setLoadingKomentar] = useState(true)
    const arrSkeleton = Array.from({ length: 3 })
-   const reference = firebase.app().database('https://mobile-darmasaba-default-rtdb.asia-southeast1.firebasedatabase.app').ref(`/discussion-division/${detail}`);
+   const reference = ref(getDB(), `/discussion-division/${detail}`);
+   const [refreshing, setRefreshing] = useState(false)
+   const headerHeight = useHeaderHeight();
+   const [detailMore, setDetailMore] = useState<any>([])
+   const entities = useSelector((state: any) => state.entities)
+   const [isVisible, setVisible] = useState(false)
+   const [selectKomentar, setSelectKomentar] = useState({
+      id: '',
+      comment: ''
+   })
+   const [viewEdit, setViewEdit] = useState(false)
+
 
 
    useEffect(() => {
@@ -164,6 +190,68 @@ export default function DiscussionDetail() {
       }
    }
 
+   async function handleEditKomentar() {
+      try {
+         setLoadingSend(true);
+         const hasil = await decryptToken(String(token?.current));
+         const response = await apiEditDiscussionCommentar({
+            id: selectKomentar.id,
+            data: { comment: selectKomentar.comment, user: hasil },
+         });
+         if (response.success) {
+            updateTrigger()
+         } else {
+            Toast.show({ type: 'small', text1: response.message })
+         }
+      } catch (error) {
+         console.error(error);
+      } finally {
+         setLoadingSend(false);
+         handleViewEditKomentar()
+      }
+   }
+
+   async function handleDeleteKomentar() {
+      try {
+         setLoadingSend(true);
+         const hasil = await decryptToken(String(token?.current));
+         const response = await apiDeleteDiscussionCommentar({
+            id: selectKomentar.id,
+            data: { user: hasil },
+         });
+         if (response.success) {
+            updateTrigger()
+         } else {
+            Toast.show({ type: 'small', text1: response.message })
+         }
+      } catch (error) {
+         console.error(error);
+      } finally {
+         setLoadingSend(false)
+         setVisible(false)
+      }
+   }
+
+   function handleMenuKomentar(id: string, comment: string) {
+      setSelectKomentar({ id, comment })
+      setVisible(true)
+   }
+
+
+   function handleViewEditKomentar() {
+      setVisible(false)
+      setViewEdit(!viewEdit)
+   }
+
+
+   const handleRefresh = async () => {
+      setRefreshing(true)
+      handleLoad(false)
+      handleLoadComment(false)
+      await new Promise(resolve => setTimeout(resolve, 2000));
+      setRefreshing(false)
+   };
+
    return (
       <>
          <Stack.Screen
@@ -188,19 +276,25 @@ export default function DiscussionDetail() {
             }}
          />
          <View style={{ flex: 1 }}>
-            <ScrollView>
+            <ScrollView
+               refreshControl={
+                  <RefreshControl
+                     refreshing={refreshing}
+                     onRefresh={handleRefresh}
+                  />
+               }
+            >
                <View style={[Styles.p15, Styles.mb100]}>
                   {
                      loading ?
                         <SkeletonContent />
                         :
-                        <BorderBottomItem
+                        <BorderBottomItem2
                            descEllipsize={false}
-                           width={55}
                            borderType="bottom"
                            icon={
                               <ImageUser
-                                 src={`https://wibu-storage.wibudev.com/api/files/${data?.user_img}`}
+                                 src={`${ConstEnv.url_storage}/files/${data?.user_img}`}
                                  size="sm"
                               />
                            }
@@ -226,9 +320,7 @@ export default function DiscussionDetail() {
                                     color="grey"
                                     style={Styles.mr05}
                                  />
-                                 <Text
-                                    style={[Styles.textInformation, Styles.cGray, Styles.mb05]}
-                                 >
+                                 <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]} >
                                     {dataComment.length} Komentar
                                  </Text>
                               </View>
@@ -246,18 +338,31 @@ export default function DiscussionDetail() {
                            dataComment.map((item, index) => (
                               <BorderBottomItem
                                  key={index}
-                                 width={55}
                                  borderType="bottom"
+                                 colorPress
                                  icon={
                                     <ImageUser
-                                       src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                       src={`${ConstEnv.url_storage}/files/${item.img}`}
                                        size="xs"
                                     />
                                  }
                                  title={item.username}
                                  rightTopInfo={item.createdAt}
                                  desc={item.comment}
-                                 descEllipsize={false}
+                                 rightBottomInfo={item.isEdited ? "Edited" : ""}
+                                 descEllipsize={detailMore.includes(item.id) ? false : true}
+                                 onPress={() => {
+                                    setDetailMore((prev: any) => {
+                                       if (prev.includes(item.id)) {
+                                          return prev.filter((id: string) => id !== item.id)
+                                       } else {
+                                          return [...prev, item.id]
+                                       }
+                                    })
+                                 }}
+                                 onLongPress={() => {
+                                    item.idUser == entities.id && data?.status != 2 && data?.isActive && handleMenuKomentar(item.id, item.comment)
+                                 }}
                               />
                            ))
                      }
@@ -265,64 +370,154 @@ export default function DiscussionDetail() {
                   </View>
                </View>
             </ScrollView>
-            <View
-               style={[
-                  Styles.contentItemCenter,
-                  Styles.absolute0,
-                  Styles.w100,
-                  { backgroundColor: "#f4f4f4" },
-               ]}
+            <KeyboardAvoidingView
+               behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+               keyboardVerticalOffset={headerHeight}
             >
-               <InputForm
-                  disable={
-                     data?.status == 2 ||
-                     data?.isActive == false ||
-                     ((entityUser.role == "user" || entityUser.role == "coadmin") &&
-                        !isMemberDivision)
-                  }
-                  bg="white"
-                  type="default"
-                  round
-                  placeholder="Kirim Komentar"
-                  onChange={setKomentar}
-                  value={komentar}
-                  itemRight={
-                     <Pressable
-                        onPress={() => {
-                           komentar != "" &&
-                              !loadingSend &&
-                              data?.status != 2 &&
-                              data?.isActive &&
-                              (((entityUser.role == "user" ||
-                                 entityUser.role == "coadmin") &&
-                                 isMemberDivision) ||
-                                 entityUser.role == "admin" ||
-                                 entityUser.role == "supadmin" ||
-                                 entityUser.role == "developer" ||
-                                 entityUser.role == "cosupadmin") &&
-                              handleKomentar();
-                        }}
-                     >
-                        <MaterialIcons
-                           name="send"
-                           size={25}
-                           style={
-                              komentar == "" ||
-                                 loadingSend ||
-                                 data?.status == 2 ||
-                                 data?.isActive == false ||
-                                 ((entityUser.role == "user" ||
-                                    entityUser.role == "coadmin") &&
-                                    !isMemberDivision)
-                                 ? Styles.cGray
-                                 : Styles.cDefault
-                           }
-                        />
-                     </Pressable>
+               <View
+                  style={[
+                     Styles.contentItemCenter,
+                     Styles.w100,
+                     { backgroundColor: "#f4f4f4" },
+                     viewEdit && Styles.borderTop
+                  ]}
+               >
+                  {
+                     viewEdit ?
+                        <>
+                           <View style={[Styles.w90, Styles.rowSpaceBetween, Styles.pv05]}>
+                              <View style={[Styles.rowItemsCenter]}>
+                                 <Feather name="edit-3" color="black" size={22} style={[Styles.mh05]} />
+                                 <Text style={[Styles.textMediumSemiBold]}>Edit Komentar</Text>
+                              </View>
+                              <Pressable onPress={() => handleViewEditKomentar()}>
+                                 <MaterialIcons name="close" color="black" size={22} />
+                              </Pressable>
+                           </View>
+                           <InputForm
+                              bg="white"
+                              type="default"
+                              round
+                              multiline
+                              placeholder="Kirim Komentar"
+                              onChange={(val: string) => setSelectKomentar({ ...selectKomentar, comment: val })}
+                              value={selectKomentar.comment}
+                              itemRight={
+                                 <Pressable
+                                    onPress={() => {
+                                       selectKomentar.comment != "" &&
+                                          !regexOnlySpacesOrEnter.test(selectKomentar.comment) &&
+                                          !loadingSend &&
+                                          data?.status != 2 &&
+                                          data?.isActive &&
+                                          (((entityUser.role == "user" ||
+                                             entityUser.role == "coadmin") &&
+                                             isMemberDivision) ||
+                                             entityUser.role == "admin" ||
+                                             entityUser.role == "supadmin" ||
+                                             entityUser.role == "developer" ||
+                                             entityUser.role == "cosupadmin") &&
+                                          handleEditKomentar();
+                                    }}
+                                    style={[
+                                       Platform.OS == 'android' && Styles.mb12,
+                                    ]}
+                                 >
+                                    <MaterialIcons
+                                       name="send"
+                                       size={25}
+                                       style={
+                                          [selectKomentar.comment == "" || regexOnlySpacesOrEnter.test(selectKomentar.comment) || loadingSend || ((entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision)
+                                             ? Styles.cGray
+                                             : Styles.cDefault,
+                                          ]
+                                       }
+                                    />
+                                 </Pressable>
+                              }
+                           />
+                        </>
+                        :
+                        data?.status != 2 && data?.isActive && ((entityUser.role != "user" && entityUser.role != "coadmin") ||
+                           isMemberDivision)
+                           ?
+                           <InputForm
+                              bg="white"
+                              type="default"
+                              round
+                              multiline
+                              placeholder="Kirim Komentar"
+                              onChange={setKomentar}
+                              value={komentar}
+                              itemRight={
+                                 <Pressable
+                                    onPress={() => {
+                                       komentar != "" &&
+                                          !regexOnlySpacesOrEnter.test(komentar) &&
+                                          !loadingSend &&
+                                          data?.status != 2 &&
+                                          data?.isActive &&
+                                          (((entityUser.role == "user" ||
+                                             entityUser.role == "coadmin") &&
+                                             isMemberDivision) ||
+                                             entityUser.role == "admin" ||
+                                             entityUser.role == "supadmin" ||
+                                             entityUser.role == "developer" ||
+                                             entityUser.role == "cosupadmin") &&
+                                          handleKomentar();
+                                    }}
+                                    style={[
+                                       Platform.OS == 'android' && Styles.mb12,
+                                    ]}
+                                 >
+                                    <MaterialIcons
+                                       name="send"
+                                       size={25}
+                                       style={
+                                          [komentar == "" || regexOnlySpacesOrEnter.test(komentar) || loadingSend || ((entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision)
+                                             ? Styles.cGray
+                                             : Styles.cDefault,
+                                          ]
+                                       }
+                                    />
+                                 </Pressable>
+                              }
+                           />
+                           :
+                           <View style={[Styles.pv20, { alignItems: 'center' }]}>
+                              <Text style={[Styles.textInformation, Styles.cGray]}>
+                                 {
+                                    data?.status == 2 ? "Diskusi telah ditutup" : data?.isActive == false ? "Diskusi telah diarsipkan" : "Hanya anggota divisi yang dapat memberikan komentar"
+                                 }
+                              </Text>
+                           </View>
                   }
+
+               </View>
+            </KeyboardAvoidingView>
+         </View>
+         <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Komentar">
+            <View style={Styles.rowItemsCenter}>
+               <MenuItemRow
+                  icon={<MaterialCommunityIcons name="pencil-outline" color="black" size={25} />}
+                  title="Edit"
+                  onPress={() => { handleViewEditKomentar() }}
+               />
+               <MenuItemRow
+                  icon={<MaterialIcons name="delete" color="black" size={25} />}
+                  title="Hapus"
+                  onPress={() => {
+                     AlertKonfirmasi({
+                        title: 'Konfirmasi',
+                        desc: 'Apakah anda yakin ingin menghapus komentar?',
+                        onPress: () => {
+                           handleDeleteKomentar()
+                        }
+                     })
+                  }}
                />
             </View>
-         </View>
+         </DrawerBottom>
       </>
    );
 }

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

@@ -1,36 +1,72 @@
+import BorderBottomItem from "@/components/borderBottomItem"
 import ButtonBackHeader from "@/components/buttonBackHeader"
 import ButtonSaveHeader from "@/components/buttonSaveHeader"
+import ButtonSelect from "@/components/buttonSelect"
+import DrawerBottom from "@/components/drawerBottom"
 import { InputForm } from "@/components/inputForm"
+import MenuItemRow from "@/components/menuItemRow"
+import Text from "@/components/Text"
 import Styles from "@/constants/Styles"
 import { apiCreateDiscussion } from "@/lib/api"
 import { setUpdateDiscussion } from "@/lib/discussionUpdate"
 import { useAuthSession } from "@/providers/AuthProvider"
+import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons"
+import * as DocumentPicker from "expo-document-picker"
 import { router, Stack, useLocalSearchParams } from "expo-router"
 import { useState } from "react"
-import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native"
+import { SafeAreaView, ScrollView, View } from "react-native"
+import Toast from "react-native-toast-message"
 import { useDispatch, useSelector } from "react-redux"
 
+
 export default function CreateDiscussionDivision() {
    const { id } = useLocalSearchParams<{ id: string }>()
    const [desc, setDesc] = useState('')
    const { token, decryptToken } = useAuthSession()
    const update = useSelector((state: any) => state.discussionUpdate)
    const dispatch = useDispatch();
+   const [loading, setLoading] = useState(false)
+   const [fileForm, setFileForm] = useState<any[]>([])
+   const [isModalFile, setModalFile] = useState(false)
+   const [indexDelFile, setIndexDelFile] = useState<number>(0)
+
+   const pickDocumentAsync = async () => {
+      let result = await DocumentPicker.getDocumentAsync({
+         type: ["*/*"],
+         multiple: true
+      });
+      if (!result.canceled) {
+         for (let i = 0; i < result.assets?.length; i++) {
+            if (result.assets[i].uri) {
+               setFileForm((prev) => [...prev, result.assets[i]])
+            }
+         }
+      }
+   };
+
+   function deleteFile(index: number) {
+      setFileForm([...fileForm.filter((val, i) => i !== index)])
+      setModalFile(false)
+   }
+
 
    async function handleCreate() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiCreateDiscussion({ data: { user: hasil, desc, idDivision: id } })
          if (response.success) {
-            ToastAndroid.show('Berhasil menambahkan data', ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
             dispatch(setUpdateDiscussion({ ...update, data: !update.data }));
             router.back()
          } else {
-            ToastAndroid.show(response.message, ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error)
-         ToastAndroid.show('Terjadi kesalahan', ToastAndroid.SHORT)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -42,7 +78,7 @@ export default function CreateDiscussionDivision() {
                headerTitle: 'Tambah Diskusi',
                headerTitleAlign: 'center',
                headerRight: () => <ButtonSaveHeader
-                  disable={desc == ""}
+                  disable={desc == "" || loading}
                   category="create"
                   onPress={() => {
                      handleCreate()
@@ -51,9 +87,46 @@ export default function CreateDiscussionDivision() {
          />
          <ScrollView>
             <View style={[Styles.p15, Styles.mb100]}>
-               <InputForm label="Diskusi" type="default" placeholder="Hal yang didiskusikan" required onChange={setDesc} />
+               <InputForm
+                  label="Diskusi"
+                  type="default"
+                  placeholder="Hal yang didiskusikan"
+                  required
+                  onChange={setDesc}
+                  multiline
+               />
+               <ButtonSelect value="Upload File" onPress={pickDocumentAsync} />
+               {
+                  fileForm.length > 0
+                  &&
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
+                     <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                     {
+                        fileForm.map((item, index) => (
+                           <BorderBottomItem
+                              key={index}
+                              borderType={fileForm.length > 1 ? "bottom" : "none"}
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
+                              title={item.name}
+                              titleWeight="normal"
+                              onPress={() => { setIndexDelFile(index); setModalFile(true) }}
+                           />
+                        ))
+                     }
+                  </View>
+               }
             </View>
          </ScrollView>
+
+         <DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
+            <View style={Styles.rowItemsCenter}>
+               <MenuItemRow
+                  icon={<Ionicons name="trash" color="black" size={25} />}
+                  title="Hapus"
+                  onPress={() => { deleteFile(indexDelFile) }}
+               />
+            </View>
+         </DrawerBottom>
       </SafeAreaView>
    )
 }

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

@@ -4,13 +4,15 @@ import ImageUser from "@/components/imageNew";
 import InputSearch from "@/components/inputSearch";
 import LabelStatus from "@/components/labelStatus";
 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";
 import { useEffect, useState } from "react";
-import { RefreshControl, Text, View, VirtualizedList } from "react-native";
+import { RefreshControl, View, VirtualizedList } from "react-native";
 import { useSelector } from "react-redux";
 
 
@@ -39,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 {
@@ -78,6 +104,10 @@ export default function DiscussionDivision() {
       }, 1000);
    }
 
+   useEffect(() => {
+      handleCheckMember()
+   }, [])
+
    const handleRefresh = async () => {
       setRefreshing(true)
       handleLoad(false, 1)
@@ -99,27 +129,31 @@ 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 }]}>
+
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   arrSkeleton.map((item: any, i: number) => {
@@ -137,11 +171,10 @@ export default function DiscussionDivision() {
                            return (
                               <BorderBottomItem
                                  key={index}
-                                 width={55}
                                  onPress={() => { router.push(`./discussion/${item.id}`) }}
                                  borderType="bottom"
                                  icon={
-                                    <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} size="sm" />
+                                    <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="sm" />
                                  }
                                  title={item.user_name}
                                  subtitle={
@@ -170,34 +203,8 @@ export default function DiscussionDivision() {
                            />
                         }
                      />
-                     // data.map((item, index) => (
-                     //    <BorderBottomItem
-                     //       key={index}
-                     //       width={55}
-                     //       onPress={() => { router.push(`./discussion/${item.id}`) }}
-                     //       borderType="bottom"
-                     //       icon={
-                     //          <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} size="sm" />
-                     //       }
-                     //       title={item.user_name}
-                     //       subtitle={
-                     //          active == "true" ? item.status == 1 ? <LabelStatus category='success' text='BUKA' size="small" /> : <LabelStatus category='error' text='TUTUP' size="small" /> : <></>
-                     //       }
-                     //       rightTopInfo={item.createdAt}
-                     //       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>
-                     //          </View>
-                     //       }
-                     //       rightBottomInfo={item.total_komentar + ' Komentar'}
-                     //    />
-                     // ))
                      :
-                     (
-                        <Text style={[Styles.textDefault, Styles.cGray, Styles.mv10, { textAlign: "center" }]}>Tidak ada diskusi</Text>
-                     )
+                     (<Text style={[Styles.textDefault, Styles.cGray, Styles.mv10, { textAlign: "center" }]}>Tidak ada diskusi</Text>)
             }
          </View>
       </View>

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

@@ -13,10 +13,12 @@ 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 {
    apiDocumentDelete,
    apiDocumentRename,
+   apiGetDivisionOneFeature,
    apiGetDocument,
    apiShareDocument,
 } from "@/lib/api";
@@ -39,10 +41,10 @@ import {
    RefreshControl,
    SafeAreaView,
    ScrollView,
-   ToastAndroid,
-   View,
+   View
 } from "react-native";
 import * as mime from 'react-native-mime-types';
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 type Props = {
@@ -64,6 +66,7 @@ type PropsPath = {
 };
 
 export default function DocumentDivision() {
+   const [loadingRename, setLoadingRename] = useState(false)
    const [isShare, setShare] = useState(false)
    const { token, decryptToken } = useAuthSession()
    const { id } = useLocalSearchParams<{ id: string }>()
@@ -83,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: "",
@@ -91,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)
@@ -110,10 +133,6 @@ export default function DocumentDivision() {
       }
    }
 
-   useEffect(() => {
-      handleLoad(true);
-   }, [path, update]);
-
    const handleCheckboxChange = (index: number) => {
       setDariSelectAll(false);
       if (selectedFiles.some((i: any) => i.id == data[index].id)) {
@@ -204,20 +223,22 @@ export default function DocumentDivision() {
 
    async function handleRename() {
       try {
+         setLoadingRename(true)
          const hasil = await decryptToken(String(token?.current));
          const response = await apiDocumentRename({ user: hasil, ...bodyRename });
          if (response.success) {
-            ToastAndroid.show("Berhasil mengubah nama", ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: 'Berhasil mengubah nama', })
             dispatch(setUpdateDokumen(!update));
             handleBatal();
          } else {
-            ToastAndroid.show(response.message, ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error);
-         ToastAndroid.show("Terjadi kesalahan", ToastAndroid.SHORT);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
       } finally {
-         setRename(false);
+         setLoadingRename(false)
+         setRename(false)
       }
    }
 
@@ -229,20 +250,21 @@ export default function DocumentDivision() {
             data: selectedFiles,
          });
          if (response.success) {
-            ToastAndroid.show("Berhasil menghapus", ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: 'Berhasil menghapus', })
             dispatch(setUpdateDokumen(!update));
             handleBatal();
          } else {
-            ToastAndroid.show(response.message, ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error);
-         ToastAndroid.show("Terjadi kesalahan", ToastAndroid.SHORT);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
       }
    }
 
    useEffect(() => {
       handleBatal();
+      handleLoad(false)
    }, [update]);
 
    async function handleShare(selectedDivision: any[]) {
@@ -254,15 +276,15 @@ export default function DocumentDivision() {
             dataItem: selectedFiles,
          });
          if (response.success) {
-            ToastAndroid.show("Berhasil membagikan item", ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: 'Berhasil membagikan item', })
             dispatch(setUpdateDokumen(!update));
             handleBatal();
          } else {
-            ToastAndroid.show(response.message, ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error);
-         ToastAndroid.show("Terjadi kesalahan", ToastAndroid.SHORT);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
       } finally {
          setShare(false);
       }
@@ -270,17 +292,17 @@ export default function DocumentDivision() {
 
 
    const openFile = (item: Props) => {
-      setLoadingOpen(true)
-      let remoteUrl = 'https://wibu-storage.wibudev.com/api/files/' + item.idStorage;
+      if (Platform.OS == 'android') setLoadingOpen(true)
+      let remoteUrl = ConstEnv.url_storage + '/files/' + item.idStorage;
       const fileName = item.name + '.' + item.extension;
       let localPath = `${FileSystem.documentDirectory}/${fileName}`;
       const mimeType = mime.lookup(fileName)
 
       FileSystem.downloadAsync(remoteUrl, localPath).then(async ({ uri }) => {
          const contentURL = await FileSystem.getContentUriAsync(uri);
+         setLoadingOpen(false)
          try {
             if (Platform.OS == 'android') {
-               // open with android intent
                await startActivityAsync(
                   'android.intent.action.VIEW',
                   {
@@ -289,16 +311,13 @@ export default function DocumentDivision() {
                      type: mimeType as string,
                   }
                );
-               // or
-               // Sharing.shareAsync(localPath);
-
             } else if (Platform.OS == 'ios') {
                Sharing.shareAsync(localPath);
             }
          } catch (error) {
             Alert.alert('INFO', 'Gagal membuka file, tidak ada aplikasi yang dapat membuka file ini');
          } finally {
-            setLoadingOpen(false)
+            if (Platform.OS == 'android') setLoadingOpen(false)
          }
       });
    };
@@ -310,6 +329,10 @@ export default function DocumentDivision() {
       setRefreshing(false)
    };
 
+   useEffect(() => {
+      handleLoad(true);
+   }, [path]);
+
    return (
       <SafeAreaView>
          <Stack.Screen
@@ -345,13 +368,13 @@ export default function DocumentDivision() {
                         }}
                      />
                   ) : (
-                     <HeaderRightDocument path={path} />
+                     <HeaderRightDocument path={path} isMember={isMemberDivision} />
                   ),
             }}
          />
          <ModalLoading isVisible={loadingOpen} setVisible={setLoadingOpen} />
          <ScrollView
-            style={{ height: "100%" }}
+            style={[Styles.h100]}
             refreshControl={
                <RefreshControl
                   refreshing={refreshing}
@@ -361,25 +384,20 @@ export default function DocumentDivision() {
             <View style={[Styles.p15, Styles.mb100]}>
                <View style={[Styles.rowItemsCenter]}>
                   {
-                     loading ?
-                        arrSkeleton.map((item, index) => (
-                           <Skeleton key={index} width={60} height={10} borderRadius={10} style={[Styles.mr05]} />
-                        ))
-                        :
-                        dataJalur.map((item, index) => (
-                           <Pressable
-                              key={index}
-                              style={[Styles.rowItemsCenter]}
-                              onPress={() => {
-                                 setPath(item.id);
-                              }}
-                           >
-                              {item.id != "home" && (
-                                 <AntDesign name="right" style={[Styles.mh05, Styles.mt02]} />
-                              )}
-                              <Text> {item.name} </Text>
-                           </Pressable>
-                        ))
+                     dataJalur.map((item, index) => (
+                        <Pressable
+                           key={index}
+                           style={[Styles.rowItemsCenter]}
+                           onPress={() => {
+                              setPath(item.id);
+                           }}
+                        >
+                           {item.id != "home" && (
+                              <AntDesign name="right" style={[Styles.mh05, Styles.mt02]} color="black" />
+                           )}
+                           <Text> {item.name} </Text>
+                        </Pressable>
+                     ))
                   }
                </View>
                <View>
@@ -410,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);
                                     }}
@@ -442,20 +461,6 @@ export default function DocumentDivision() {
          {(selectedFiles.length > 0 || dariSelectAll) && (
             <View style={[ColorsStatus.primary, Styles.bottomMenuSelectDocument]}>
                <View style={[Styles.rowItemsCenter, { justifyContent: "center" }]}>
-                  {/* <MenuItemRow
-                     icon={
-                        <MaterialCommunityIcons
-                           name="download-outline"
-                           color="white"
-                           size={25}
-                        />
-                     }
-                     title="Unduh"
-                     onPress={() => { }}
-                     column="many"
-                     color="white"
-                     disabled={selectedFiles.length == 0 || !copyAllowed}
-                  /> */}
                   <MenuItemRow
                      icon={
                         <MaterialCommunityIcons
@@ -538,13 +543,11 @@ export default function DocumentDivision() {
          <DrawerBottom
             animation="slide"
             isVisible={modalMore}
-            setVisible={setModalMore}
+            setVisible={() => { setModalMore(false) }}
             title=""
          >
             <ModalMore
-               onClose={() => {
-                  setModalMore(false);
-               }}
+               onClose={() => { setModalMore(false); }}
                data={selectedFiles}
                share={shareSelected}
             />
@@ -553,11 +556,9 @@ export default function DocumentDivision() {
          <ModalFloat
             title="Ganti Nama"
             isVisible={isRename}
-            setVisible={setRename}
-            onSubmit={() => {
-               handleRename();
-            }}
-            disableSubmit={bodyRename.name == ""}
+            setVisible={() => { setRename(false) }}
+            onSubmit={() => { handleRename() }}
+            disableSubmit={bodyRename.name == "" || loadingRename}
          >
             <View>
                <InputForm
@@ -576,7 +577,7 @@ export default function DocumentDivision() {
             title="Bagikan"
             category="share-division"
             open={isShare}
-            close={setShare}
+            close={() => { setShare(false) }}
             onSelect={(value) => {
                handleShare(value)
             }}

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

@@ -4,6 +4,7 @@ import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import ButtonSelect from "@/components/buttonSelect";
 import DrawerBottom from "@/components/drawerBottom";
 import MenuItemRow from "@/components/menuItemRow";
+import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
 import { apiAddFileTask, apiCheckFileTask } from "@/lib/api";
 import { setUpdateTask } from "@/lib/taskUpdate";
@@ -16,10 +17,9 @@ import {
    ActivityIndicator,
    SafeAreaView,
    ScrollView,
-   Text,
-   ToastAndroid,
-   View,
+   View
 } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function TaskDivisionAddFile() {
@@ -32,20 +32,23 @@ export default function TaskDivisionAddFile() {
    const [loadingCheck, setLoadingCheck] = useState(false);
    const dispatch = useDispatch();
    const update = useSelector((state: any) => state.taskUpdate);
+   const [loading, setLoading] = useState(false);
 
    const pickDocumentAsync = async () => {
       let result = await DocumentPicker.getDocumentAsync({
          type: ["*/*"],
-         multiple: false,
+         multiple: true,
       });
       if (!result.canceled) {
-         if (result.assets?.[0].uri) {
-            const check = await handleCheckFile(result.assets?.[0]);
-            if (check) {
-               setFileForm([...fileForm, result.assets?.[0]]);
-               setListFile([...listFile, result.assets?.[0].name]);
-            } else {
-               ToastAndroid.show("File sudah ada", ToastAndroid.SHORT);
+         for (let i = 0; i < result.assets?.length; i++) {
+            if (result.assets?.[i].uri) {
+               const check = await handleCheckFile(result.assets?.[i]);
+               if (check) {
+                  setFileForm((prev) => [...prev, result.assets?.[i]]);
+                  setListFile((prev) => [...prev, result.assets?.[i].name]);
+               } else {
+                  Toast.show({ type: 'small', text1: 'File sudah ada', })
+               }
             }
          }
       }
@@ -88,6 +91,7 @@ export default function TaskDivisionAddFile() {
 
    async function handleAddFile() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current));
          const fd = new FormData();
 
@@ -108,15 +112,17 @@ export default function TaskDivisionAddFile() {
 
          const response = await apiAddFileTask({ data: fd, id: detail });
          if (response.success) {
-            ToastAndroid.show("Berhasil menambahkan file", ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: 'Berhasil menambahkan file', })
             dispatch(setUpdateTask({ ...update, file: !update.file }));
             router.back();
          } else {
-            ToastAndroid.show(response.message, ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error);
-         ToastAndroid.show("Terjadi kesalahan", ToastAndroid.SHORT);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -136,7 +142,7 @@ export default function TaskDivisionAddFile() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="create"
-                     disable={fileForm.length == 0 ? true : false}
+                     disable={fileForm.length == 0 || loading ? true : false}
                      onPress={() => { handleAddFile() }}
                   />
                ),
@@ -169,6 +175,9 @@ export default function TaskDivisionAddFile() {
                {
                   loadingCheck && <ActivityIndicator size="small" />
                }
+               {
+                  loading && <ActivityIndicator size="large" />
+               }
             </View>
          </ScrollView>
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title="Menu">

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

@@ -3,6 +3,8 @@ import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import ImageUser from "@/components/imageNew";
 import ImageWithLabel from "@/components/imageWithLabel";
 import InputSearch from "@/components/inputSearch";
+import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiAddMemberTask, apiGetDivisionMember, apiGetTaskOne } from "@/lib/api";
 import { setUpdateTask } from "@/lib/taskUpdate";
@@ -10,7 +12,8 @@ import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign } from "@expo/vector-icons";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { Pressable, SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native";
+import { Pressable, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 type Props = {
@@ -28,6 +31,7 @@ export default function AddMemberTask() {
    const [data, setData] = useState<Props[]>([])
    const [selectMember, setSelectMember] = useState<any[]>([])
    const [search, setSearch] = useState('')
+   const [loading, setLoading] = useState(false)
 
    async function handleLoadOldMember() {
       try {
@@ -70,24 +74,27 @@ export default function AddMemberTask() {
 
    async function handleAddMember() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiAddMemberTask({ id: detail, data: { user: hasil, member: selectMember, idDivision: id } })
          if (response.success) {
-            ToastAndroid.show('Berhasil menambahkan anggota', ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: 'Berhasil menambahkan anggota', })
             dispatch(setUpdateTask({ ...update, member: !update.member }))
             router.back()
          } else {
-            ToastAndroid.show(response.message, ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error)
-         ToastAndroid.show('Gagal menambahkan anggota', ToastAndroid.SHORT)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
 
    return (
-      <SafeAreaView>
+      <>
          <Stack.Screen
             options={{
                headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -96,7 +103,7 @@ export default function AddMemberTask() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="update"
-                     disable={selectMember.length > 0 ? false : true}
+                     disable={selectMember.length == 0 || loading ? true : false}
                      onPress={() => {
                         handleAddMember()
                      }}
@@ -104,20 +111,20 @@ export default function AddMemberTask() {
                )
             }}
          />
-         <View style={[Styles.p15, Styles.mb100]}>
+         <View style={[Styles.p15, { flex: 1 }]}>
             <InputSearch onChange={(val) => setSearch(val)} value={search} />
 
             {
                selectMember.length > 0
                   ?
                   <View>
-                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]}>
+                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]} showsHorizontalScrollIndicator={false}>
                         {
                            selectMember.map((item: any, index: any) => (
                               <ImageWithLabel
                                  key={index}
                                  label={item.name}
-                                 src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                 src={`${ConstEnv.url_storage}/files/${item.img}`}
                                  onClick={() => onChoose(item.idUser, item.name, item.img)}
                               />
                            ))
@@ -128,7 +135,9 @@ export default function AddMemberTask() {
                   :
                   <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
             }
-            <ScrollView>
+            <ScrollView
+               showsVerticalScrollIndicator={false}
+            >
 
                {
                   data.length > 0 ?
@@ -143,7 +152,7 @@ export default function AddMemberTask() {
                               }}
                            >
                               <View style={[Styles.rowItemsCenter, Styles.w80]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]} numberOfLines={1}>{item.name}</Text>
                                     {
@@ -152,7 +161,7 @@ export default function AddMemberTask() {
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} />
+                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )
@@ -163,6 +172,6 @@ export default function AddMemberTask() {
                }
             </ScrollView>
          </View>
-      </SafeAreaView>
+      </>
    )
 }

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

@@ -1,20 +1,26 @@
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
+import ModalAddDetailTugasTask from "@/components/task/modalAddDetailTugasTask";
+import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
 import { apiCreateTaskTugas } 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 dayjs from "dayjs";
+import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack, useLocalSearchParams } from "expo-router";
+import 'intl';
+import 'intl/locale-data/jsonp/id';
+import moment from "moment";
 import { useEffect, useState } from "react";
 import {
-   SafeAreaView,
+   KeyboardAvoidingView, Platform, Pressable, SafeAreaView,
    ScrollView,
-   Text,
-   ToastAndroid,
-   View,
+   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";
 
@@ -24,6 +30,8 @@ export default function TaskDivisionAddTask() {
    const update = useSelector((state: any) => state.taskUpdate);
    const { id, detail } = useLocalSearchParams<{ id: string; detail: string }>();
    const [disable, setDisable] = useState(true);
+   const [loading, setLoading] = useState(false)
+   const headerHeight = useHeaderHeight();
    const [range, setRange] = useState<{
       startDate: DateType;
       endDate: DateType;
@@ -33,12 +41,13 @@ export default function TaskDivisionAddTask() {
       endDate: false,
       title: false,
    });
-   const [title, setTitle] = useState("");
+   const [title, setTitle] = useState("")
+   const [dataDetail, setDataDetail] = useState<any>([])
+   const [modalDetail, setModalDetail] = useState(false)
+   const [dsbButton, setDsbButton] = useState(true)
 
-   const from = range.startDate
-      ? dayjs(range.startDate).format("DD-MM-YYYY")
-      : "";
-   const to = range.endDate ? dayjs(range.endDate).format("DD-MM-YYYY") : "";
+   const from = formatDateOnly(range.startDate);
+   const to = formatDateOnly(range.endDate);
 
    function checkAll() {
       if (
@@ -67,33 +76,64 @@ export default function TaskDivisionAddTask() {
       }
    }
 
+
+   function checkButton() {
+      if (range.startDate == null || range.endDate == null || range.startDate == undefined || range.endDate == undefined) {
+         setDsbButton(true)
+         setDataDetail([])
+      } else {
+         setDsbButton(false)
+         const awal = formatDateOnly(range.startDate, "YYYY-MM-DD")
+         const akhir = formatDateOnly(range.endDate, "YYYY-MM-DD")
+         const datanya = getDatesInRange(awal, akhir)
+         setDataDetail(datanya.map((item: any) => ({
+            date: item,
+            timeStart: null,
+            timeEnd: null,
+         })))
+      }
+   }
+
    useEffect(() => {
       checkAll();
    }, [from, to, title, error]);
 
+   useEffect(() => {
+      checkButton()
+   }, [range])
+
    async function handleCreate() {
       try {
+         setLoading(true)
+         const dataDetailFix = dataDetail.map((item: any) => ({
+            date: moment(item.date, "DD-MM-YYYY").format("YYYY-MM-DD"),
+            timeStart: item.timeStart,
+            timeEnd: item.timeEnd,
+         }))
          const hasil = await decryptToken(String(token?.current));
          const response = await apiCreateTaskTugas({
             data: {
                title,
-               dateStart: dayjs(range.startDate).format("YYYY-MM-DD"),
-               dateEnd: dayjs(range.endDate).format("YYYY-MM-DD"),
+               dateStart: formatDateOnly(range.startDate, "YYYY-MM-DD"),
+               dateEnd: formatDateOnly(range.endDate, "YYYY-MM-DD"),
                user: hasil,
                idDivision: id,
+               dataDetail: dataDetailFix,
             },
             id: detail,
          });
          if (response.success) {
             dispatch(setUpdateTask({ ...update, task: !update.task, progress: !update.progress }));
-            ToastAndroid.show("Berhasil menambah data", ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: 'Berhasil menambah data', })
             router.back();
          } else {
-            ToastAndroid.show(response.message, ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error);
-         ToastAndroid.show("Gagal menambah data", ToastAndroid.SHORT);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -113,7 +153,7 @@ export default function TaskDivisionAddTask() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="create"
-                     disable={disable}
+                     disable={disable || loading}
                      onPress={() => {
                         handleCreate();
                      }}
@@ -121,59 +161,86 @@ export default function TaskDivisionAddTask() {
                ),
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
-               <View style={[Styles.wrapPaper, Styles.p10]}>
-                  <DateTimePicker
-                     mode="range"
-                     startDate={range.startDate}
-                     endDate={range.endDate}
-                     onChange={(param) => setRange(param)}
-                     styles={{
-                        selected: Styles.selectedDate,
-                        selected_label: Styles.cWhite,
-                        range_fill: Styles.selectRangeDate,
+         <KeyboardAvoidingView
+            behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+            keyboardVerticalOffset={headerHeight}
+         >
+            <ScrollView>
+               <View style={[Styles.p15, Styles.mb100]}>
+                  <View style={[Styles.wrapPaper, Styles.p10]}>
+                     <DateTimePicker
+                        mode="range"
+                        startDate={range.startDate}
+                        endDate={range.endDate}
+                        onChange={(param) => setRange(param)}
+                        styles={{
+                           selected: Styles.selectedDate,
+                           selected_label: Styles.cWhite,
+                           range_fill: Styles.selectRangeDate,
+                           month_label: Styles.cBlack,
+                           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,
+                        }}
+                     />
+                  </View>
+                  <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]}>
+                              <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]}>
+                              <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>
+                     }
+                     <Pressable
+                        style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
+                        disabled={dsbButton}
+                        onPress={() => { setModalDetail(true) }}
+                     >
+                        <Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
+                     </Pressable>
+                  </View>
+                  <InputForm
+                     label="Judul Tugas"
+                     type="default"
+                     placeholder="Judul Tugas"
+                     required
+                     bg="white"
+                     value={title}
+                     error={error.title}
+                     errorText="Judul tidak boleh kosong"
+                     onChange={(e) => {
+                        onValidation("title", e)
                      }}
                   />
                </View>
-               <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]}>
-                           <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]}>
-                           <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>
-                  }
-               </View>
-               <InputForm
-                  label="Judul Tugas"
-                  type="default"
-                  placeholder="Judul Tugas"
-                  required
-                  bg="white"
-                  value={title}
-                  error={error.title}
-                  errorText="Judul tidak boleh kosong"
-                  onChange={(e) => {
-                     onValidation("title", e)
-                  }}
-               />
-            </View>
-         </ScrollView>
+            </ScrollView>
+         </KeyboardAvoidingView>
+         <ModalAddDetailTugasTask
+            isVisible={modalDetail}
+            setVisible={setModalDetail}
+            dataTanggal={dataDetail}
+            onSubmit={(data) => {
+               setDataDetail(data)
+            }}
+         />
       </SafeAreaView>
    );
 }

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

@@ -7,7 +7,8 @@ import { setUpdateTask } from "@/lib/taskUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native";
+import { SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function TaskDivisionCancel() {
@@ -18,6 +19,7 @@ export default function TaskDivisionCancel() {
    const [reason, setReason] = useState("");
    const [error, setError] = useState(false);
    const [disable, setDisable] = useState(false);
+   const [loading, setLoading] = useState(false)
 
    function onValidation(val: string) {
       setReason(val);
@@ -42,6 +44,7 @@ export default function TaskDivisionCancel() {
 
    async function handleCancel() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current));
          const response = await apiCancelTask(
             {
@@ -52,14 +55,16 @@ export default function TaskDivisionCancel() {
          );
          if (response.success) {
             dispatch(setUpdateTask({ ...update, data: !update.data }));
-            ToastAndroid.show("Berhasil membatalkan kegiatan", ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: 'Berhasil membatalkan kegiatan', })
             router.back();
          } else {
-            ToastAndroid.show(response.message, ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error);
-         ToastAndroid.show("Gagal membatalkan kegiatan", ToastAndroid.SHORT);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -78,7 +83,7 @@ export default function TaskDivisionCancel() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disable}
+                     disable={disable || loading}
                      category="cancel"
                      onPress={() => {
                         handleCancel();

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

@@ -7,7 +7,8 @@ import { setUpdateTask } from "@/lib/taskUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native";
+import { SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function TaskDivisionEdit() {
@@ -18,6 +19,7 @@ export default function TaskDivisionEdit() {
    const [disable, setDisable] = useState(false);
    const dispatch = useDispatch();
    const update = useSelector((state: any) => state.taskUpdate);
+   const [loading, setLoading] = useState(false)
 
    async function handleLoad() {
       try {
@@ -41,7 +43,7 @@ export default function TaskDivisionEdit() {
       setJudul(val);
       if (val == "" || val == "null") {
          setError(true);
-      }else{
+      } else {
          setError(false);
       }
    }
@@ -60,6 +62,7 @@ export default function TaskDivisionEdit() {
 
    async function handleUpdate() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current));
          const response = await apiEditTask(
             {
@@ -70,14 +73,16 @@ export default function TaskDivisionEdit() {
          );
          if (response.success) {
             dispatch(setUpdateTask({ ...update, data: !update.data }));
-            ToastAndroid.show("Berhasil mengubah data", ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
             router.back();
          } else {
-            ToastAndroid.show(response.message, ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error);
-         ToastAndroid.show("Terjadi kesalahan", ToastAndroid.SHORT);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -97,7 +102,7 @@ export default function TaskDivisionEdit() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="update"
-                     disable={disable}
+                     disable={disable || loading}
                      onPress={() => { handleUpdate() }}
                   />
                ),

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

@@ -3,14 +3,16 @@ import SectionCancel from "@/components/sectionCancel";
 import SectionProgress from "@/components/sectionProgress";
 import HeaderRightTaskDetail from "@/components/task/headerTaskDetail";
 import SectionFileTask from "@/components/task/sectionFileTask";
+import SectionLinkTask from "@/components/task/sectionLinkTask";
 import SectionMemberTask from "@/components/task/sectionMemberTask";
+import SectionReportTask from "@/components/task/sectionReportTask";
 import SectionTanggalTugasTask from "@/components/task/sectionTanggalTugasTask";
 import Styles from "@/constants/Styles";
-import { apiGetTaskOne } from "@/lib/api";
+import { apiGetDivisionOneFeature, apiGetTaskOne } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { SafeAreaView, ScrollView, View } from "react-native";
+import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
 import { useSelector } from "react-redux";
 
 type Props = {
@@ -29,6 +31,36 @@ export default function DetailTaskDivision() {
    const [loading, setLoading] = useState(true)
    const [progress, setProgress] = useState(0)
    const update = useSelector((state: any) => state.taskUpdate)
+   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",
+         });
+
+         setIsMemberDivision(response.data);
+
+         const response2 = await apiGetDivisionOneFeature({
+            id,
+            user: hasil,
+            cat: "check-admin",
+         });
+         setIsAdminDivision(response2.data);
+      } catch (error) {
+         console.error(error);
+      }
+   }
+
+   useEffect(() => {
+      handleCheckMember()
+   }, [])
 
 
    async function handleLoad(cat: 'data' | 'progress') {
@@ -56,6 +88,14 @@ export default function DetailTaskDivision() {
       handleLoad('progress')
    }, [update.progress])
 
+   const handleRefresh = async () => {
+      setRefreshing(true)
+      await handleLoad('data')
+      await handleLoad('progress')
+      await new Promise(resolve => setTimeout(resolve, 2000));
+      setRefreshing(false)
+   };
+
    return (
       <SafeAreaView>
          <Stack.Screen
@@ -63,18 +103,29 @@ export default function DetailTaskDivision() {
                headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: loading ? 'Loading...                            ' : data?.title,
                headerTitleAlign: 'center',
-               headerRight: () => <HeaderRightTaskDetail id={detail} division={id} status={data?.status} />,
+               headerRight: () => (entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision
+                  ? <></>
+                  : <HeaderRightTaskDetail id={detail} division={id} status={data?.status} isAdminDivision={isAdminDivision} />,
             }}
          />
-         <ScrollView>
+         <ScrollView
+            refreshControl={
+               <RefreshControl
+                  refreshing={refreshing}
+                  onRefresh={handleRefresh}
+               />
+            }
+         >
             <View style={[Styles.p15, Styles.mb100]}>
                {
                   data?.reason != null && data?.reason != "" && <SectionCancel text={data?.reason} />
                }
                <SectionProgress text={`Kemajuan Kegiatan ${progress}%`} progress={progress} />
-               <SectionTanggalTugasTask />
-               <SectionFileTask />
-               <SectionMemberTask />
+               <SectionReportTask refreshing={refreshing} />
+               <SectionTanggalTugasTask refreshing={refreshing} isMemberDivision={isMemberDivision} />
+               <SectionFileTask refreshing={refreshing} isMemberDivision={isMemberDivision} />
+               <SectionLinkTask refreshing={refreshing} isMemberDivision={isMemberDivision} />
+               <SectionMemberTask refreshing={refreshing} isAdminDivision={isAdminDivision} />
             </View>
          </ScrollView>
       </SafeAreaView>

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

@@ -0,0 +1,129 @@
+import ButtonBackHeader from "@/components/buttonBackHeader";
+import ButtonSaveHeader from "@/components/buttonSaveHeader";
+import { InputForm } from "@/components/inputForm";
+import Styles from "@/constants/Styles";
+import { apiGetTaskOne, apiReportTask } from "@/lib/api";
+import { setUpdateTask } from "@/lib/taskUpdate";
+import { useAuthSession } from "@/providers/AuthProvider";
+import { router, Stack, useLocalSearchParams } from "expo-router";
+import { useEffect, useState } from "react";
+import { SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
+import { useDispatch, useSelector } from "react-redux";
+
+export default function TaskDivisionReport() {
+   const { id, detail } = useLocalSearchParams<{ id: string; detail: string }>();
+   const { token, decryptToken } = useAuthSession();
+   const [laporan, setLaporan] = useState("");
+   const [error, setError] = useState(false);
+   const [disable, setDisable] = useState(false);
+   const dispatch = useDispatch();
+   const update = useSelector((state: any) => state.taskUpdate);
+   const [loading, setLoading] = useState(false)
+
+   async function handleLoad() {
+      try {
+         const hasil = await decryptToken(String(token?.current));
+         const response = await apiGetTaskOne({
+            user: hasil,
+            cat: "data",
+            id: detail,
+         });
+         setLaporan(response.data.report);
+      } catch (error) {
+         console.error(error);
+      }
+   }
+
+   useEffect(() => {
+      handleLoad();
+   }, []);
+
+   function onValidation(val: string) {
+      setLaporan(val);
+      if (val == "" || val == "null") {
+         setError(true);
+      } else {
+         setError(false);
+      }
+   }
+
+   function checkAll() {
+      if (laporan == "" || laporan == "null" || laporan == undefined || laporan == null || error) {
+         setDisable(true);
+      } else {
+         setDisable(false);
+      }
+   }
+
+   useEffect(() => {
+      checkAll();
+   }, [laporan, error]);
+
+   async function handleUpdate() {
+      try {
+         setLoading(true)
+         const hasil = await decryptToken(String(token?.current));
+         const response = await apiReportTask(
+            {
+               report: laporan,
+               user: hasil,
+            },
+            detail
+         );
+         if (response.success) {
+            dispatch(setUpdateTask({ ...update, report: !update.report }));
+            Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
+            router.back();
+         } else {
+            Toast.show({ type: 'small', text1: response.message, })
+         }
+      } catch (error) {
+         console.error(error);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
+      }
+   }
+
+   return (
+      <SafeAreaView>
+         <Stack.Screen
+            options={{
+               headerLeft: () => (
+                  <ButtonBackHeader
+                     onPress={() => {
+                        router.back();
+                     }}
+                  />
+               ),
+               headerTitle: "Laporan Kegiatan",
+               headerTitleAlign: "center",
+               headerRight: () => (
+                  <ButtonSaveHeader
+                     category="update"
+                     disable={disable || loading}
+                     onPress={() => { handleUpdate() }}
+                  />
+               ),
+            }}
+         />
+         <ScrollView>
+            <View style={[Styles.p15, Styles.mb100]}>
+               <InputForm
+                  label="Laporan Kegiatan"
+                  type="default"
+                  placeholder="Laporan Kegiatan"
+                  required
+                  bg="white"
+                  value={laporan}
+                  onChange={(val) => { onValidation(val) }}
+                  error={error}
+                  errorText="Laporan kegiatan harus diisi"
+                  multiline
+               />
+            </View>
+         </ScrollView>
+      </SafeAreaView>
+   );
+}

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

@@ -8,6 +8,8 @@ import { InputForm } from "@/components/inputForm";
 import MenuItemRow from "@/components/menuItemRow";
 import ModalSelect from "@/components/modalSelect";
 import SectionListAddTask from "@/components/project/sectionListAddTask";
+import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiCreateTask } from "@/lib/api";
 import { setMemberChoose } from "@/lib/memberChoose";
@@ -18,7 +20,8 @@ import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
 import * as DocumentPicker from "expo-document-picker";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native";
+import { SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 
@@ -36,6 +39,7 @@ export default function CreateTaskDivision() {
    const [title, setTitle] = useState('')
    const [error, setError] = useState(false);
    const [isModal, setModal] = useState(false)
+   const [loading, setLoading] = useState(false)
    let hitung = 0;
 
    useEffect(() => {
@@ -50,11 +54,13 @@ export default function CreateTaskDivision() {
    const pickDocumentAsync = async () => {
       let result = await DocumentPicker.getDocumentAsync({
          type: ["*/*"],
-         multiple: false
+         multiple: true
       });
       if (!result.canceled) {
-         if (result.assets[0].uri) {
-            setFileForm([...fileForm, result.assets[0]])
+         for (let i = 0; i < result.assets?.length; i++) {
+            if (result.assets[i].uri) {
+               setFileForm((prev) => [...prev, result.assets[i]])
+            }
          }
       }
    };
@@ -73,6 +79,7 @@ export default function CreateTaskDivision() {
 
    async function handleCreate() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const fd = new FormData()
 
@@ -91,13 +98,16 @@ export default function CreateTaskDivision() {
          const response = await apiCreateTask(fd)
          if (response.success) {
             dispatch(setUpdateTask({ ...update, data: !update.data }))
-            ToastAndroid.show('Berhasil menambahkan data', ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
             handleBack()
          } else {
-            ToastAndroid.show(response.message, ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -117,7 +127,7 @@ export default function CreateTaskDivision() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={title == "" || entitiesMember.length == 0 || taskCreate.length == 0}
+                     disable={title == "" || entitiesMember.length == 0 || taskCreate.length == 0 || loading}
                      category="create"
                      onPress={() => { handleCreate() }}
                   />
@@ -180,7 +190,7 @@ export default function CreateTaskDivision() {
                                     borderType="bottom"
                                     icon={
                                        <ImageUser
-                                          src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                          src={`${ConstEnv.url_storage}/files/${item.img}`}
                                           size="sm"
                                        />
                                     }

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

@@ -3,6 +3,8 @@ import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import ImageUser from "@/components/imageNew";
 import ImageWithLabel from "@/components/imageWithLabel";
 import InputSearch from "@/components/inputSearch";
+import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiGetDivisionMember } from "@/lib/api";
 import { setMemberChoose } from "@/lib/memberChoose";
@@ -10,7 +12,8 @@ import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign } from "@expo/vector-icons";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { Pressable, SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native";
+import { Pressable, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 type Props = {
@@ -23,7 +26,6 @@ export default function AddMemberCreateTask() {
    const dispatch = useDispatch()
    const { token, decryptToken } = useAuthSession()
    const { id } = useLocalSearchParams<{ id: string, detail: string }>()
-   const [dataOld, setDataOld] = useState<Props[]>([])
    const [data, setData] = useState<Props[]>([])
    const [selectMember, setSelectMember] = useState<any[]>([])
    const [search, setSearch] = useState('')
@@ -56,13 +58,13 @@ export default function AddMemberCreateTask() {
          router.back()
       } catch (error) {
          console.error(error)
-         ToastAndroid.show('Gagal menambahkan anggota', ToastAndroid.SHORT)
+         Toast.show({ type: 'small', text1: 'Gagal menambahkan anggota', })
       }
    }
 
 
    return (
-      <SafeAreaView>
+      <>
          <Stack.Screen
             options={{
                headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -79,20 +81,20 @@ export default function AddMemberCreateTask() {
                )
             }}
          />
-         <View style={[Styles.p15]}>
+         <View style={[Styles.p15, { flex: 1 }]}>
             <InputSearch onChange={(val) => setSearch(val)} value={search} />
 
             {
                selectMember.length > 0
                   ?
                   <View>
-                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]}>
+                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]} showsHorizontalScrollIndicator={false}>
                         {
                            selectMember.map((item: any, index: any) => (
                               <ImageWithLabel
                                  key={index}
                                  label={item.name}
-                                 src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                 src={`${ConstEnv.url_storage}/files/${item.img}`}
                                  onClick={() => onChoose(item.idUser, item.name, item.img)}
                               />
                            ))
@@ -103,7 +105,9 @@ export default function AddMemberCreateTask() {
                   :
                   <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
             }
-            <ScrollView>
+            <ScrollView
+               showsVerticalScrollIndicator={false}
+            >
 
                {
                   data.length > 0 ?
@@ -117,13 +121,13 @@ export default function AddMemberCreateTask() {
                               }}
                            >
                               <View style={[Styles.rowItemsCenter]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]}>{item.name}</Text>
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} />
+                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )
@@ -134,6 +138,6 @@ export default function AddMemberCreateTask() {
                }
             </ScrollView>
          </View>
-      </SafeAreaView>
+      </>
    )
 }

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

@@ -1,15 +1,24 @@
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
+import ModalAddDetailTugasTask from "@/components/task/modalAddDetailTugasTask";
+import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
+import { formatDateOnly } from "@/lib/fun_formatDateOnly";
+import { getDatesInRange } from "@/lib/fun_getDatesInRange";
 import { setTaskCreate } from "@/lib/taskCreate";
-import dayjs from "dayjs";
+import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack } from "expo-router";
+import 'intl';
+import 'intl/locale-data/jsonp/id';
+import moment from "moment";
 import { useEffect, useState } from "react";
 import {
+   KeyboardAvoidingView,
+   Platform,
+   Pressable,
    SafeAreaView,
    ScrollView,
-   Text,
    View
 } from "react-native";
 import DateTimePicker, {
@@ -18,6 +27,7 @@ import DateTimePicker, {
 import { useDispatch, useSelector } from "react-redux";
 
 export default function CreateTaskAddTugas() {
+   const headerHeight = useHeaderHeight();
    const dispatch = useDispatch()
    const [disable, setDisable] = useState(true);
    const [range, setRange] = useState<{
@@ -31,11 +41,12 @@ export default function CreateTaskAddTugas() {
    })
    const [title, setTitle] = useState('');
    const taskCreate = useSelector((state: any) => state.taskCreate)
+   const [dsbButton, setDsbButton] = useState(true)
+   const [dataDetail, setDataDetail] = useState<any>([])
+   const [modalDetail, setModalDetail] = useState(false)
 
-   const from = range.startDate
-      ? dayjs(range.startDate).format("DD-MM-YYYY")
-      : "";
-   const to = range.endDate ? dayjs(range.endDate).format("DD-MM-YYYY") : "";
+   const from = formatDateOnly(range.startDate, "DD-MM-YYYY")
+   const to = formatDateOnly(range.endDate, "DD-MM-YYYY")
 
    function checkAll() {
       if (from == "" || to == "" || title == "" || title == "null" || error.startDate || error.endDate || error.title) {
@@ -56,19 +67,50 @@ export default function CreateTaskAddTugas() {
       }
    }
 
+   function checkButton() {
+      if (range.startDate == null || range.endDate == null || range.startDate == undefined || range.endDate == undefined) {
+         setDsbButton(true)
+         setDataDetail([])
+      } else {
+         setDsbButton(false)
+         const awal = formatDateOnly(range.startDate, "YYYY-MM-DD")
+         const akhir = formatDateOnly(range.endDate, "YYYY-MM-DD")
+         const datanya = getDatesInRange(awal, akhir)
+         setDataDetail(datanya.map((item: any) => ({
+            date: item,
+            timeStart: null,
+            timeEnd: null,
+         })))
+      }
+   }
+
    useEffect(() => {
       checkAll()
    }, [from, to, title, error])
 
+   useEffect(() => {
+      checkButton()
+   }, [range])
+
    async function handleCreate() {
       try {
-         dispatch(setTaskCreate([...taskCreate, {
+         const dataDetailFix = dataDetail.map((item: any) => ({
+            date: moment(item.date, "DD-MM-YYYY").format("YYYY-MM-DD"),
+            timeStart: item.timeStart,
+            timeEnd: item.timeEnd,
+         }))
+         const hasilOrder = [...taskCreate, {
             title: title,
             dateStart: from,
             dateEnd: to,
-            dateStartFix: dayjs(range.startDate).format("YYYY-MM-DD"),
-            dateEndFix: dayjs(range.endDate).format("YYYY-MM-DD"),
-         }]))
+            dateStartFix: formatDateOnly(range.startDate, "YYYY-MM-DD"),
+            dateEndFix: formatDateOnly(range.endDate, "YYYY-MM-DD"),
+            dataDetail: dataDetailFix
+         }].sort((a, b) => {
+            return new Date(a.dateStartFix).getTime() - new Date(b.dateStartFix).getTime();
+         });
+
+         dispatch(setTaskCreate(hasilOrder))
          router.back();
       } catch (error) {
          console.error(error);
@@ -97,59 +139,86 @@ export default function CreateTaskAddTugas() {
                ),
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
-               <View style={[Styles.wrapPaper, Styles.p10]}>
-                  <DateTimePicker
-                     mode="range"
-                     startDate={range.startDate}
-                     endDate={range.endDate}
-                     onChange={(param) => setRange(param)}
-                     styles={{
-                        selected: Styles.selectedDate,
-                        selected_label: Styles.cWhite,
-                        range_fill: Styles.selectRangeDate,
+         <KeyboardAvoidingView
+            behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+            keyboardVerticalOffset={headerHeight}
+         >
+            <ScrollView>
+               <View style={[Styles.p15, Styles.mb100]}>
+                  <View style={[Styles.wrapPaper, Styles.p10]}>
+                     <DateTimePicker
+                        mode="range"
+                        startDate={range.startDate}
+                        endDate={range.endDate}
+                        onChange={(param) => setRange(param)}
+                        styles={{
+                           selected: Styles.selectedDate,
+                           selected_label: Styles.cWhite,
+                           range_fill: Styles.selectRangeDate,
+                           month_label: Styles.cBlack,
+                           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,
+                        }}
+                     />
+                  </View>
+                  <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]}>
+                              <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]}>
+                              <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>
+                     }
+                     <Pressable
+                        style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
+                        disabled={dsbButton}
+                        onPress={() => { setModalDetail(true) }}
+                     >
+                        <Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
+                     </Pressable>
+                  </View>
+                  <InputForm
+                     label="Judul Tugas"
+                     type="default"
+                     placeholder="Judul Tugas"
+                     required
+                     bg="white"
+                     value={title}
+                     error={error.title}
+                     errorText="Judul tidak boleh kosong"
+                     onChange={(e) => {
+                        onValidation("title", e)
                      }}
                   />
                </View>
-               <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]}>
-                           <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]}>
-                           <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>
-                  }
-               </View>
-               <InputForm
-                  label="Judul Tugas"
-                  type="default"
-                  placeholder="Judul Tugas"
-                  required
-                  bg="white"
-                  value={title}
-                  error={error.title}
-                  errorText="Judul tidak boleh kosong"
-                  onChange={(e) => {
-                     onValidation("title", e)
-                  }}
-               />
-            </View>
-         </ScrollView>
+            </ScrollView>
+         </KeyboardAvoidingView>
+         <ModalAddDetailTugasTask
+            isVisible={modalDetail}
+            setVisible={setModalDetail}
+            dataTanggal={dataDetail}
+            onSubmit={(data) => {
+               setDataDetail(data)
+            }}
+         />
       </SafeAreaView>
    );
 }

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

@@ -6,6 +6,7 @@ import PaperGridContent from "@/components/paperGridContent";
 import ProgressBar from "@/components/progressBar";
 import Skeleton from "@/components/skeleton";
 import SkeletonTwoItem from "@/components/skeletonTwoItem";
+import Text from "@/components/Text";
 import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
 import { apiGetTask } from "@/lib/api";
@@ -17,7 +18,7 @@ import {
 } from "@expo/vector-icons";
 import { router, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { Pressable, RefreshControl, ScrollView, Text, View, VirtualizedList } from "react-native";
+import { Pressable, RefreshControl, ScrollView, View, VirtualizedList } from "react-native";
 import { useSelector } from "react-redux";
 
 type Props = {
@@ -105,7 +106,7 @@ export default function ListTask() {
    return (
       <View style={[Styles.p15, { flex: 1 }]}>
          <View>
-            <ScrollView horizontal style={[Styles.mb10]}>
+            <ScrollView horizontal style={[Styles.mb10]} showsHorizontalScrollIndicator={false}>
                <ButtonTab
                   active={statusFix}
                   value="0"
@@ -178,7 +179,7 @@ export default function ListTask() {
                </Pressable>
             </View>
          </View>
-         <View style={[{ flex: 2 }]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   isList ?
@@ -192,7 +193,7 @@ export default function ListTask() {
                   :
                   data.length > 0 ? (
                      isList ? (
-                        <View>
+                        <View style={[Styles.h100]}>
                            <VirtualizedList
                               data={data}
                               getItemCount={() => data.length}
@@ -240,7 +241,7 @@ export default function ListTask() {
                            ))} */}
                         </View>
                      ) : (
-                        <View>
+                        <View style={[Styles.h100]}>
                            <VirtualizedList
                               data={data}
                               getItemCount={() => data.length}
@@ -257,7 +258,7 @@ export default function ListTask() {
                                  >
                                     <ProgressBar category="list" value={item.progress} />
                                     <View style={[Styles.rowSpaceBetween]}>
-                                       <Text></Text>
+                                       <Text> </Text>
                                        <LabelStatus
                                           size="default"
                                           category={

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

@@ -1,24 +1,34 @@
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
+import ModalAddDetailTugasTask from "@/components/task/modalAddDetailTugasTask";
+import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
 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 dayjs from "dayjs";
+import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack, useLocalSearchParams } from "expo-router";
+import 'intl';
+import 'intl/locale-data/jsonp/id';
+import moment from "moment";
 import { useEffect, useState } from "react";
 import {
+   KeyboardAvoidingView,
+   Platform,
+   Pressable,
    SafeAreaView,
    ScrollView,
-   Text,
-   ToastAndroid,
-   View,
+   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";
 
 export default function UpdateProjectTaskDivision() {
+   const headerHeight = useHeaderHeight();
    const { detail } = useLocalSearchParams<{ detail: string }>();
    const dispatch = useDispatch();
    const update = useSelector((state: any) => state.taskUpdate);
@@ -27,10 +37,14 @@ export default function UpdateProjectTaskDivision() {
       startDate: DateType;
       endDate: DateType;
    }>({ startDate: undefined, endDate: undefined });
+   const [loadingSubmit, setLoadingSubmit] = useState(false)
    const [month, setMonth] = useState<any>();
    const [year, setYear] = useState<any>();
    const [loading, setLoading] = useState(true);
    const [disableBtn, setDisableBtn] = useState(false);
+   const [dataDetail, setDataDetail] = useState<any>([])
+   const [modalDetail, setModalDetail] = useState(false)
+   const [dsbButton, setDsbButton] = useState(true)
    const [title, setTitle] = useState("");
    const [error, setError] = useState({
       startDate: false,
@@ -38,10 +52,8 @@ export default function UpdateProjectTaskDivision() {
       title: false,
    });
 
-   const from = range.startDate
-      ? dayjs(range.startDate).format("MMM DD, YYYY")
-      : "";
-   const to = range.endDate ? dayjs(range.endDate).format("MMM DD, YYYY") : "";
+   const from = formatDateOnly(range.startDate);
+   const to = formatDateOnly(range.endDate);
 
    async function handleLoad() {
       try {
@@ -58,6 +70,22 @@ export default function UpdateProjectTaskDivision() {
          });
          setMonth(new Date(response.data.dateStart).getMonth());
          setYear(new Date(response.data.dateStart).getFullYear());
+
+         const response2 = await apiGetTaskTugas({
+            user: hasil,
+            id: detail,
+            cat: "detailTask"
+         });
+         if (response2.data.length == 0) {
+            const datanya = getDatesInRange(response.data.dateStart, response.data.dateEnd)
+            setDataDetail(datanya.map((item: any) => ({
+               date: item,
+               timeStart: null,
+               timeEnd: null,
+            })))
+         } else {
+            setDataDetail(response2.data)
+         }
       } catch (error) {
          console.error(error);
       } finally {
@@ -71,18 +99,35 @@ export default function UpdateProjectTaskDivision() {
 
    async function handleEdit() {
       try {
+         setLoadingSubmit(true)
+         const dataDetailFix = dataDetail.map((item: any) => ({
+            date: moment(item.date, "DD-MM-YYYY").format("YYYY-MM-DD"),
+            timeStart: item.timeStart,
+            timeEnd: item.timeEnd,
+         }))
          const hasil = await decryptToken(String(token?.current));
-         const response = await apiEditTaskTugas({ data: { title, dateStart: dayjs(range.startDate).format("YYYY-MM-DD"), dateEnd: dayjs(range.endDate).format("YYYY-MM-DD"), user: hasil }, id: detail });
+         const response = await apiEditTaskTugas({
+            data: {
+               title,
+               dateStart: formatDateOnly(range.startDate, "YYYY-MM-DD"),
+               dateEnd: formatDateOnly(range.endDate, "YYYY-MM-DD"),
+               user: hasil,
+               dataDetail: dataDetailFix
+            },
+            id: detail
+         });
          if (response.success) {
             dispatch(setUpdateTask({ ...update, task: !update.task }))
-            ToastAndroid.show("Berhasil mengubah data", ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
             router.back();
          } else {
-            ToastAndroid.show(response.message, ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error);
-         ToastAndroid.show("Gagal mengubah data", ToastAndroid.SHORT);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoadingSubmit(false)
       }
    }
 
@@ -113,10 +158,33 @@ export default function UpdateProjectTaskDivision() {
       }
    }
 
+
+   function checkButton() {
+      if (range.startDate == null || range.endDate == null || range.startDate == undefined || range.endDate == undefined) {
+         setDsbButton(true)
+         setDataDetail([])
+      } else {
+         setDsbButton(false)
+         const awal = formatDateOnly(range.startDate, "YYYY-MM-DD")
+         const akhir = formatDateOnly(range.endDate, "YYYY-MM-DD")
+         const datanya = getDatesInRange(awal, akhir)
+         setDataDetail(datanya.map((item: any) => ({
+            date: item,
+            timeStart: null,
+            timeEnd: null,
+         })))
+      }
+   }
+
    useEffect(() => {
       checkAll();
    }, [from, to, title, error]);
 
+
+   useEffect(() => {
+      checkButton()
+   }, [range])
+
    return (
       <SafeAreaView>
          <Stack.Screen
@@ -132,7 +200,7 @@ export default function UpdateProjectTaskDivision() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disableBtn}
+                     disable={disableBtn || loadingSubmit}
                      category="update"
                      onPress={() => {
                         handleEdit()
@@ -141,67 +209,92 @@ export default function UpdateProjectTaskDivision() {
                ),
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
-               <View style={[Styles.wrapPaper, Styles.p10]}>
-                  {!loading && (
-                     <DateTimePicker
-                        mode="range"
-                        startDate={range.startDate}
-                        endDate={range.endDate}
-                        onChange={(param) => setRange(param)}
-                        month={month}
-                        year={year}
-                        styles={{
-                           selected: Styles.selectedDate,
-                           selected_label: Styles.cWhite,
-                           range_fill: Styles.selectRangeDate,
-                        }}
-                     />
-                  )}
-               </View>
-               <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]}>
-                           <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]}>
-                           <Text style={{ textAlign: "center" }}>{to}</Text>
-                        </View>
-                     </View>
+         <KeyboardAvoidingView
+            behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+            keyboardVerticalOffset={headerHeight}
+         >
+            <ScrollView>
+               <View style={[Styles.p15, Styles.mb100]}>
+                  <View style={[Styles.wrapPaper, Styles.p10]}>
+                     {!loading && (
+                        <DateTimePicker
+                           mode="range"
+                           startDate={range.startDate}
+                           endDate={range.endDate}
+                           onChange={(param) => setRange(param)}
+                           month={month}
+                           year={year}
+                           styles={{
+                              selected: Styles.selectedDate,
+                              selected_label: Styles.cWhite,
+                              range_fill: Styles.selectRangeDate,
+                              month_label: Styles.cBlack,
+                              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,
+                           }}
+                        />
+                     )}
                   </View>
-                  {(error.endDate || error.startDate) && (
-                     <Text
-                        style={[Styles.textInformation, Styles.cError, Styles.mt05]}
+                  <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]}>
+                              <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]}>
+                              <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>
+                     )}
+                     <Pressable
+                        style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
+                        disabled={dsbButton}
+                        onPress={() => { setModalDetail(true) }}
                      >
-                        Tanggal tidak boleh kosong
-                     </Text>
-                  )}
+                        <Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
+                     </Pressable>
+                  </View>
+                  <InputForm
+                     label="Judul Tugas"
+                     type="default"
+                     placeholder="Judul Tugas"
+                     required
+                     bg="white"
+                     value={title}
+                     error={error.title}
+                     errorText="Judul tidak boleh kosong"
+                     onChange={(e) => {
+                        onValidation("title", e)
+                     }}
+                  />
                </View>
-               <InputForm
-                  label="Judul Tugas"
-                  type="default"
-                  placeholder="Judul Tugas"
-                  required
-                  bg="white"
-                  value={title}
-                  error={error.title}
-                  errorText="Judul tidak boleh kosong"
-                  onChange={(e) => {
-                     onValidation("title", e)
-                  }}
-               />
-            </View>
-         </ScrollView>
+            </ScrollView>
+         </KeyboardAvoidingView>
+         <ModalAddDetailTugasTask
+            isVisible={modalDetail}
+            setVisible={setModalDetail}
+            dataTanggal={dataDetail}
+            onSubmit={(data) => {
+               setDataDetail(data)
+            }}
+         />
       </SafeAreaView>
    );
 }

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

@@ -3,6 +3,8 @@ import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import ImageUser from "@/components/imageNew";
 import ImageWithLabel from "@/components/imageWithLabel";
 import InputSearch from "@/components/inputSearch";
+import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiAddMemberDivision, apiGetDivisionOneDetail, apiGetUser } from "@/lib/api";
 import { setUpdateDivision } from "@/lib/divisionUpdate";
@@ -10,7 +12,8 @@ import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign } from "@expo/vector-icons";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { Pressable, SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native";
+import { Pressable, SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 type Props = {
@@ -29,9 +32,11 @@ export default function AddMemberDivision() {
    const [search, setSearch] = useState('')
    const update = useSelector((state: any) => state.divisionUpdate)
    const dispatch = useDispatch()
+   const [loading, setLoading] = useState(false)
 
    async function handleLoad() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiGetDivisionOneDetail({ user: hasil, id })
          setDataOld(response.data.member)
@@ -40,6 +45,8 @@ export default function AddMemberDivision() {
          setData(responsemember.data.filter((i: any) => i.idUserRole != 'supadmin'))
       } catch (error) {
          console.error(error)
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -70,24 +77,27 @@ export default function AddMemberDivision() {
 
    async function handleAddMember() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiAddMemberDivision({ id: id, data: { user: hasil, member: selectMember } })
          if (response.success) {
             dispatch(setUpdateDivision(!update))
-            ToastAndroid.show('Berhasil menambahkan anggota', ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: 'Berhasil menambahkan anggota', })
             router.replace(`/division/${id}/info`)
          } else {
-            ToastAndroid.show(response.message, ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error)
-         ToastAndroid.show('Gagal menambahkan anggota', ToastAndroid.SHORT)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
 
    return (
-      <SafeAreaView>
+      <>
          <Stack.Screen
             options={{
                headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -96,7 +106,7 @@ export default function AddMemberDivision() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="update"
-                     disable={selectMember.length > 0 ? false : true}
+                     disable={selectMember.length == 0 || loading ? true : false}
                      onPress={() => {
                         handleAddMember()
                      }}
@@ -104,20 +114,20 @@ export default function AddMemberDivision() {
                )
             }}
          />
-         <View style={[Styles.p15]}>
+         <View style={[Styles.p15, { flex: 1 }]}>
             <InputSearch onChange={(val) => handleSearch(val)} value={search} />
 
             {
                selectMember.length > 0
                   ?
                   <View>
-                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]}>
+                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]} showsHorizontalScrollIndicator={false}>
                         {
                            selectMember.map((item: any, index: any) => (
                               <ImageWithLabel
                                  key={index}
                                  label={item.name}
-                                 src={item.img}
+                                 src={`${ConstEnv.url_storage}/files/${item.img}`}
                                  onClick={() => onChoose(item.idUser, item.name, item.img)}
                               />
                            ))
@@ -128,7 +138,9 @@ export default function AddMemberDivision() {
                   :
                   <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
             }
-            <ScrollView>
+            <ScrollView
+               showsVerticalScrollIndicator={false}
+            >
 
                {
                   data.length > 0 ?
@@ -143,7 +155,7 @@ export default function AddMemberDivision() {
                               }}
                            >
                               <View style={[Styles.rowItemsCenter]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode="tail">{item.name}</Text>
                                     {
@@ -152,7 +164,7 @@ export default function AddMemberDivision() {
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} />
+                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )
@@ -163,6 +175,6 @@ export default function AddMemberDivision() {
                }
             </ScrollView>
          </View>
-      </SafeAreaView>
+      </>
    )
 }

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

@@ -7,7 +7,8 @@ import { setUpdateDivision } from "@/lib/divisionUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native";
+import { SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function EditDivision() {
@@ -15,6 +16,7 @@ export default function EditDivision() {
    const update = useSelector((state: any) => state.divisionUpdate)
    const { token, decryptToken } = useAuthSession();
    const { id } = useLocalSearchParams<{ id: string }>();
+   const [loading, setLoading] = useState(false)
    const [data, setData] = useState({
       name: "",
       desc: "",
@@ -42,18 +44,21 @@ export default function EditDivision() {
 
    async function handleEdit() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiEditDivision({ user: hasil, name: data.name, desc: data.desc }, id)
          if (response.success) {
             dispatch(setUpdateDivision(!update))
-            ToastAndroid.show('Berhasil mengubah data', ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
             router.back()
          } else {
-            ToastAndroid.show(response.message, ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error)
-         ToastAndroid.show('Terjadi kesalahan', ToastAndroid.SHORT)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -72,7 +77,7 @@ export default function EditDivision() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={error.name}
+                     disable={error.name || loading ? true : false}
                      category="update"
                      onPress={() => { handleEdit() }}
                   />

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

@@ -10,7 +10,7 @@ import { apiGetDivisionOneDetail } from "@/lib/api"
 import { useAuthSession } from "@/providers/AuthProvider"
 import { router, Stack, useLocalSearchParams } from "expo-router"
 import { useEffect, useState } from "react"
-import { SafeAreaView, ScrollView, View } from "react-native"
+import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native"
 
 type Props = {
    id: string,
@@ -26,11 +26,12 @@ export default function DetailDivisionFitur() {
    const { id } = useLocalSearchParams<{ id: string }>()
    const [data, setData] = useState<Props>()
    const [loading, setLoading] = useState(true)
+   const [refreshing, setRefreshing] = useState(false)
 
 
-   async function handleLoad() {
+   async function handleLoad(loading: boolean) {
       try {
-         setLoading(true)
+         setLoading(loading)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiGetDivisionOneDetail({ user: hasil, id })
          setData(response.data.division)
@@ -42,9 +43,16 @@ export default function DetailDivisionFitur() {
    }
 
    useEffect(() => {
-      handleLoad()
+      handleLoad(true)
    }, [])
 
+   const handleRefresh = async () => {
+      setRefreshing(true)
+      handleLoad(false)
+      await new Promise(resolve => setTimeout(resolve, 2000));
+      setRefreshing(false)
+   };
+
    return (
       <SafeAreaView>
          <Stack.Screen
@@ -55,13 +63,21 @@ export default function DetailDivisionFitur() {
                headerRight: () => <HeaderRightDivisionDetail id={id} />,
             }}
          />
-         <ScrollView>
-            <CaraouselHome />
+         <ScrollView
+            refreshControl={
+               <RefreshControl
+                  refreshing={refreshing}
+                  onRefresh={handleRefresh}
+               />
+            }
+            showsVerticalScrollIndicator={false}
+         >
+            <CaraouselHome refreshing={refreshing} />
             <View style={[Styles.ph15, Styles.mb100]}>
-               <FiturDivisionDetail />
-               <TaskDivisionDetail />
-               <FileDivisionDetail />
-               <DiscussionDivisionDetail />
+               <FiturDivisionDetail refreshing={refreshing}/>
+               <TaskDivisionDetail refreshing={refreshing}/>
+               <FileDivisionDetail refreshing={refreshing}/>
+               <DiscussionDivisionDetail refreshing={refreshing}/>
             </View>
          </ScrollView>
       </SafeAreaView>

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

@@ -7,14 +7,17 @@ import ImageUser from "@/components/imageNew"
 import SectionCancel from "@/components/sectionCancel"
 import Skeleton from "@/components/skeleton"
 import SkeletonTwoItem from "@/components/skeletonTwoItem"
+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"
 import { useEffect, useState } from "react"
-import { Pressable, SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native"
+import { Pressable, RefreshControl, SafeAreaView, ScrollView, View } from "react-native"
+import Toast from "react-native-toast-message"
 import { useSelector } from "react-redux"
 
 type PropsDetail = {
@@ -36,6 +39,8 @@ type PropsMember = {
 }
 
 export default function InformationDivision() {
+   const [refreshing, setRefreshing] = useState(false)
+   const entityUser = useSelector((state: any) => state.user)
    const { id } = useLocalSearchParams<{ id: string }>()
    const [isModal, setModal] = useState(false)
    const { token, decryptToken } = useAuthSession()
@@ -45,6 +50,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: '',
@@ -66,13 +73,13 @@ export default function InformationDivision() {
          const response = await apiDeleteMemberDivision({ user: hasil, id: dataMemberChoose.id }, id)
          if (response.success) {
             setRefresh(!refresh)
-            ToastAndroid.show('Berhasil mengeluarkan anggota', ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: 'Berhasil mengeluarkan anggota', })
          } else {
-            ToastAndroid.show(response.message, ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error)
-         ToastAndroid.show('Terjadi kesalahan', ToastAndroid.SHORT)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
       } finally {
          setModal(false)
       }
@@ -84,13 +91,13 @@ export default function InformationDivision() {
          const response = await apiUpdateStatusAdminDivision({ user: hasil, id: dataMemberChoose.id, isAdmin: dataMemberChoose.isAdmin }, id)
          if (response.success) {
             setRefresh(!refresh)
-            ToastAndroid.show(dataMemberChoose.isAdmin ? 'Berhasil memberhentikan admin' : 'Berhasil menjadi admin', ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: dataMemberChoose.isAdmin ? 'Berhasil memberhentikan admin' : 'Berhasil menjadi admin', })
          } else {
-            ToastAndroid.show(response.message, ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error)
-         ToastAndroid.show('Terjadi kesalahan', ToastAndroid.SHORT)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
       } finally {
          setModal(false)
       }
@@ -110,12 +117,42 @@ export default function InformationDivision() {
       }
    }
 
+   const handleRefresh = async () => {
+      setRefreshing(true)
+      handleLoad(false)
+      handleCheckMember()
+      await new Promise(resolve => setTimeout(resolve, 2000));
+      setRefreshing(false)
+   };
+
+   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) {
@@ -130,14 +167,22 @@ 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>
-            <View style={[Styles.p15, Styles.mb100]}>
+         <ScrollView
+            refreshControl={
+               <RefreshControl
+                  refreshing={refreshing}
+                  onRefresh={handleRefresh}
+               />
+            }
+            style={[Styles.h100]}
+         >
+            <View style={[Styles.p15]}>
                {
                   dataDetail?.isActive == false && (
-                     <SectionCancel title={'Divisi dinonaktifkan'} />
+                     <SectionCancel title={'Divisi nonaktif'} />
                   )
                }
                <View style={[Styles.mb15]}>
@@ -158,6 +203,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`) }}
@@ -183,12 +229,11 @@ export default function InformationDivision() {
                            dataMember.map((item, index) => {
                               return (
                                  <BorderBottomItem
-                                    width={55}
                                     key={index}
                                     borderType="bottom"
-                                    onPress={() => { dataDetail?.isActive && handleChooseMember(item) }}
+                                    onPress={() => { dataDetail?.isActive && (isAdminDivision || (entityUser.role != "user" && entityUser.role != "coadmin")) && handleChooseMember(item) }}
                                     icon={
-                                       <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} size="sm" />
+                                       <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="sm" />
                                     }
                                     title={item.name}
                                     rightTopInfo={item.isAdmin ? "Admin" : "Anggota"}

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

@@ -10,7 +10,8 @@ import { useAuthSession } from "@/providers/AuthProvider"
 import dayjs from "dayjs"
 import { router, Stack, useLocalSearchParams } from "expo-router"
 import { useEffect, useState } from "react"
-import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native"
+import { SafeAreaView, ScrollView, View } from "react-native"
+import Toast from "react-native-toast-message"
 
 export default function ReportDivision() {
    const { id } = useLocalSearchParams<{ id: string }>()
@@ -31,7 +32,7 @@ export default function ReportDivision() {
       dateEnd: false,
    });
 
-   function validationForm( cat: "date" | "dateEnd", val: string) {
+   function validationForm(cat: "date" | "dateEnd", val: string) {
       if (cat == "date") {
          setData({ ...data, date: val, dateEnd: "" });
          if (val == "" || val == "null") {
@@ -89,7 +90,7 @@ export default function ReportDivision() {
             })
             setShowReport(true);
          } else {
-            ToastAndroid.show(response.message, ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: response.message, });
          }
       } catch (error) {
          console.error(error);

app/(application)/division/create.tsx

@@ -1,22 +1,28 @@
+import AlertKonfirmasi from "@/components/alertKonfirmasi";
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonNextHeader from "@/components/buttonNextHeader";
 import { InputForm } from "@/components/inputForm";
 import ModalSelect from "@/components/modalSelect";
 import SelectForm from "@/components/selectForm";
 import Styles from "@/constants/Styles";
+import { apiCheckDivisionName } from "@/lib/api";
 import { setFormCreateDivision } from "@/lib/divisionCreate";
+import { useAuthSession } from "@/providers/AuthProvider";
 import { router, Stack } from "expo-router";
 import { useEffect, useState } from "react";
 import { SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function CreateDivision() {
-   const [isSelect, setSelect] = useState(false);
-   const [chooseGroup, setChooseGroup] = useState({ val: "", label: "" });
-   const dispatch = useDispatch();
-   const update = useSelector((state: any) => state.divisionCreate);
+   const { token, decryptToken } = useAuthSession()
+   const [isSelect, setSelect] = useState(false)
+   const [chooseGroup, setChooseGroup] = useState({ val: "", label: "" })
+   const dispatch = useDispatch()
+   const update = useSelector((state: any) => state.divisionCreate)
    const entityUser = useSelector((state: any) => state.user)
    const userLogin = useSelector((state: any) => state.entities)
+   const [loadingBtn, setLoadingBtn] = useState(false)
    const [error, setError] = useState({
       idGroup: false,
       name: false,
@@ -54,7 +60,34 @@ export default function CreateDivision() {
       }
    }
 
-   function handleSetData() {
+   async function handleCheckName() {
+      try {
+         setLoadingBtn(true)
+         const hasil = await decryptToken(String(token?.current))
+         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: () => { }
+               })
+            } else {
+               handleSetData()
+            }
+         } else {
+            Toast.show({ type: 'small', text1: response.message, })
+         }
+      } catch (error) {
+         console.error(error)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoadingBtn(false)
+      }
+   }
+
+   async function handleSetData() {
       dispatch(setFormCreateDivision({ ...update, data: dataForm }))
       router.push(`./create/add-member`)
    }
@@ -80,8 +113,8 @@ export default function CreateDivision() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonNextHeader
-                     onPress={() => { handleSetData() }}
-                     disable={error.idGroup || error.name || chooseGroup.val == "" || chooseGroup.val == "null" || dataForm.name == "" || dataForm.name == "null"}
+                     onPress={() => { handleCheckName() }}
+                     disable={loadingBtn || error.idGroup || error.name || chooseGroup.val == "" || chooseGroup.val == "null" || dataForm.name == "" || dataForm.name == "null"}
                   />
                ),
             }}

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

@@ -1,15 +1,19 @@
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import ImageUser from "@/components/imageNew";
+import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiCreateDivision } from "@/lib/api";
 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, Text, ToastAndroid, View } from "react-native";
+import { Pressable, SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 type Props = {
@@ -20,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[]>([])
@@ -27,6 +32,7 @@ export default function CreateDivisionAddAdmin() {
    const update = useSelector((state: any) => state.divisionCreate)
    const updateDivision = useSelector((state: any) => state.divisionUpdate)
    const dispatch = useDispatch()
+   const [loading, setLoading] = useState(false)
 
    async function handleLoadMember() {
       setData(update.member)
@@ -46,26 +52,29 @@ export default function CreateDivisionAddAdmin() {
 
    async function handleAddMember() {
       try {
-         dispatch(setFormCreateDivision({ ...update, admin: selectMember }))
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
-         const response = await apiCreateDivision({ ...update, user: hasil })
+         const response = await apiCreateDivision({ ...update, admin: selectMember, user: hasil })
          if (response.success) {
-            ToastAndroid.show('Berhasil membuat divisi', ToastAndroid.SHORT)
+            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 {
-            ToastAndroid.show(response.message, ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error)
-         ToastAndroid.show('Gagal membuat divisi', ToastAndroid.SHORT)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
 
    return (
-      <SafeAreaView>
+      <>
          <Stack.Screen
             options={{
                headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -74,7 +83,7 @@ export default function CreateDivisionAddAdmin() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="create"
-                     disable={selectMember.length > 0 ? false : true}
+                     disable={selectMember.length == 0 || loading ? true : false}
                      onPress={() => {
                         handleAddMember()
                      }}
@@ -82,7 +91,7 @@ export default function CreateDivisionAddAdmin() {
                )
             }}
          />
-         <View style={[Styles.p15]}>
+         <View style={[Styles.p15, { flex: 1 }]}>
             <ScrollView>
                {
                   data.length > 0 ?
@@ -97,7 +106,7 @@ export default function CreateDivisionAddAdmin() {
                               }}
                            >
                               <View style={[Styles.rowItemsCenter, Styles.w70]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode="tail">{item.name}</Text>
                                     {
@@ -106,7 +115,7 @@ export default function CreateDivisionAddAdmin() {
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i == item.idUser) && <AntDesign name="check" size={20} />
+                                 selectMember.some((i: any) => i == item.idUser) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )
@@ -117,6 +126,6 @@ export default function CreateDivisionAddAdmin() {
                }
             </ScrollView>
          </View>
-      </SafeAreaView>
+      </>
    )
 }

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

@@ -3,15 +3,16 @@ import ButtonNextHeader from "@/components/buttonNextHeader";
 import ImageUser from "@/components/imageNew";
 import ImageWithLabel from "@/components/imageWithLabel";
 import InputSearch from "@/components/inputSearch";
+import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiGetUser } from "@/lib/api";
 import { setFormCreateDivision } from "@/lib/divisionCreate";
-import { setUpdateDivision } from "@/lib/divisionUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign } from "@expo/vector-icons";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { Pressable, SafeAreaView, ScrollView, Text, View } from "react-native";
+import { Pressable, ScrollView, View } from "react-native";
 import { useDispatch, useSelector } from "react-redux";
 
 type Props = {
@@ -59,7 +60,7 @@ export default function CreateDivisionAddMember() {
 
 
    return (
-      <SafeAreaView>
+      <>
          <Stack.Screen
             options={{
                headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -73,20 +74,20 @@ export default function CreateDivisionAddMember() {
                )
             }}
          />
-         <View style={[Styles.p15]}>
+         <View style={[Styles.p15, { flex: 1 }]}>
             <InputSearch onChange={(val) => setSearch(val)} value={search} />
 
             {
                selectMember.length > 0
                   ?
                   <View>
-                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]}>
+                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]} showsHorizontalScrollIndicator={false}>
                         {
                            selectMember.map((item: any, index: any) => (
                               <ImageWithLabel
                                  key={index}
                                  label={item.name}
-                                 src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                 src={`${ConstEnv.url_storage}/files/${item.img}`}
                                  onClick={() => onChoose(item.idUser, item.name, item.img)}
                               />
                            ))
@@ -97,7 +98,9 @@ export default function CreateDivisionAddMember() {
                   :
                   <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
             }
-            <ScrollView>
+            <ScrollView
+               showsVerticalScrollIndicator={false}
+            >
 
                {
                   data.length > 0 ?
@@ -112,7 +115,7 @@ export default function CreateDivisionAddMember() {
                               }}
                            >
                               <View style={[Styles.rowItemsCenter, Styles.w70]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode="tail">{item.name}</Text>
                                     {
@@ -121,7 +124,7 @@ export default function CreateDivisionAddMember() {
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} />
+                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )
@@ -132,6 +135,6 @@ export default function CreateDivisionAddMember() {
                }
             </ScrollView>
          </View>
-      </SafeAreaView>
+      </>
    )
 }

app/(application)/division/index.tsx

@@ -4,6 +4,7 @@ import InputSearch from "@/components/inputSearch";
 import PaperGridContent from "@/components/paperGridContent";
 import Skeleton from "@/components/skeleton";
 import SkeletonTwoItem from "@/components/skeletonTwoItem";
+import Text from "@/components/Text";
 import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
 import { apiGetDivision } from "@/lib/api";
@@ -18,7 +19,6 @@ import {
 import { router, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
 import { Pressable, RefreshControl, View, VirtualizedList } from "react-native";
-import Text from "@/components/Text";
 import { useSelector } from "react-redux";
 
 type Props = {
@@ -180,7 +180,7 @@ export default function ListDivision() {
                   </View>
             }
 
-            <View style={[Styles.rowSpaceBetween]}>
+            <View style={[Styles.rowSpaceBetween, { alignItems: 'center' }]}>
                <InputSearch width={68} onChange={setSearch} />
                <Pressable
                   onPress={() => {
@@ -200,7 +200,7 @@ export default function ListDivision() {
                </View>
             )}
          </View>
-         <View style={[{ flex: 2 }]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   isList ?
@@ -218,7 +218,7 @@ export default function ListDivision() {
                      </View>
                   ) : (
                      isList ? (
-                        <View style={[Styles.mb50]}>
+                        <View style={[Styles.h100]}>
                            <VirtualizedList
                               data={data}
                               style={[{ paddingBottom: 100 }]}
@@ -253,7 +253,7 @@ export default function ListDivision() {
                            />
                         </View>
                      ) : (
-                        <View>
+                        <View style={[Styles.h100]}>
                            <VirtualizedList
                               data={data}
                               style={[{ paddingBottom: 100 }]}

app/(application)/division/report.tsx

@@ -12,7 +12,8 @@ import { useAuthSession } from "@/providers/AuthProvider";
 import dayjs from "dayjs";
 import { router, Stack } from "expo-router";
 import { useEffect, useState } from "react";
-import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native";
+import { SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 
 export default function Report() {
    const { token, decryptToken } = useAuthSession();
@@ -107,7 +108,7 @@ export default function Report() {
             })
             setShowReport(true);
          } else {
-            ToastAndroid.show(response.message, ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error);

app/(application)/edit-profile.tsx

@@ -3,22 +3,28 @@ import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
 import ModalSelect from "@/components/modalSelect";
 import SelectForm from "@/components/selectForm";
+import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiEditProfile, apiGetProfile } from "@/lib/api";
 import { setEntities } from "@/lib/entitiesSlice";
+import { validateName } from "@/lib/fun_validateName";
 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,
-   Text,
-   ToastAndroid,
-   View,
+   View
 } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 type Props = {
@@ -35,6 +41,7 @@ type Props = {
 };
 
 export default function EditProfile() {
+   const headerHeight = useHeaderHeight()
    const dispatch = useDispatch()
    const entities = useSelector((state: any) => state.entities)
    const { token, decryptToken } = useAuthSession()
@@ -46,7 +53,8 @@ export default function EditProfile() {
    const [isSelect, setSelect] = useState(false);
    const [disableBtn, setDisableBtn] = useState(false)
    const [valChoose, setValChoose] = useState("")
-   const [imgForm, setImgForm] = useState<any>();
+   const [imgForm, setImgForm] = useState<any>()
+   const [loading, setLoading] = useState(false)
    const [data, setData] = useState<Props>({
       id: entities.id,
       name: entities.name,
@@ -102,7 +110,7 @@ export default function EditProfile() {
          }
       } else if (cat == "name") {
          setData({ ...data, name: val });
-         if (val == "") {
+         if (!validateName(val)) {
             setError({ ...error, name: true });
          } else {
             setError({ ...error, name: false });
@@ -119,7 +127,7 @@ export default function EditProfile() {
          }
       } else if (cat == "phone") {
          setData({ ...data, phone: val });
-         if (val == "" || !(val.length >= 10 && val.length <= 15)) {
+         if (val == "" || !(val.length >= 9 && val.length <= 16)) {
             setError({ ...error, phone: true });
          } else {
             setError({ ...error, phone: false });
@@ -150,14 +158,15 @@ export default function EditProfile() {
 
    async function handleEdit() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const fd = new FormData()
 
          if (imgForm != undefined) {
             fd.append("file", {
                uri: imgForm.uri,
-               type: imgForm.mimeType,
-               name: imgForm.fileName,
+               type: imgForm.mimeType || "image/jpeg",
+               name: imgForm.fileName || "image.jpg",
             } as any);
          } else {
             fd.append("file", "undefined",);
@@ -170,15 +179,17 @@ export default function EditProfile() {
          const response = await apiEditProfile(fd)
 
          if (response.success) {
-            ToastAndroid.show('Berhasil mengupdate data', ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: 'Berhasil mengupdate data', })
             await handleLoad()
             router.back()
          } else {
-            ToastAndroid.show(response.message, ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error)
-         ToastAndroid.show('Gagal mengupdate data', ToastAndroid.SHORT)
+         Toast.show({ type: 'small', text1: 'Gagal mengupdate data', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -188,8 +199,8 @@ export default function EditProfile() {
       let result = await ImagePicker.launchImageLibraryAsync({
          mediaTypes: ["images"],
          allowsEditing: true,
-         quality: 1,
-         aspect: [1, 1],
+         quality: 0.9,
+         aspect: [1, 1]
       });
 
       if (!result.canceled) {
@@ -197,7 +208,6 @@ export default function EditProfile() {
          setSelectedImage(result.assets[0].uri);
          setImgForm(result.assets[0]);
       } else {
-         alert("Tidak ada gambar yang dipilih");
          setErrorImg(false)
       }
    };
@@ -217,7 +227,7 @@ export default function EditProfile() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disableBtn}
+                     disable={disableBtn || loading ? true : false}
                      category="update"
                      onPress={() => {
                         handleEdit()
@@ -226,112 +236,122 @@ export default function EditProfile() {
                ),
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
-               <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) }}
-                           />
-                        </Pressable>
-                     ) : (
-                        <Pressable onPress={pickImageAsync}>
-                           {
+         <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
-                                 source={errorImg ? require("../../assets/images/user.jpg") : { uri: `https://wibu-storage.wibudev.com/api/files/${data?.img}` }}
+                                 src={
+                                    typeof selectedImage === "string"
+                                       ? selectedImage
+                                       : selectedImage.uri
+                                 }
                                  style={[Styles.userProfileBig]}
                                  onError={() => { setErrorImg(true) }}
                               />
-                           }
-                        </Pressable>
-                     )
-                  }
+                              <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 harus 3–50 karakter (huruf, angka, spasi, dan simbol ringan (. , ' _ -))"
+                     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}

app/(application)/group/index.tsx

@@ -7,6 +7,7 @@ import { InputForm } from "@/components/inputForm";
 import InputSearch from "@/components/inputSearch";
 import MenuItemRow from "@/components/menuItemRow";
 import SkeletonTwoItem from "@/components/skeletonTwoItem";
+import Text from "@/components/Text";
 import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
 import { apiDeleteGroup, apiEditGroup, apiGetGroup } from "@/lib/api";
@@ -14,7 +15,8 @@ import { setUpdateGroup } from "@/lib/groupSlice";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign, Feather, MaterialCommunityIcons } from "@expo/vector-icons";
 import { useEffect, useState } from "react";
-import { RefreshControl, SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native";
+import { RefreshControl, View, VirtualizedList } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 type Props = {
@@ -32,7 +34,7 @@ export default function Index() {
    const arrSkeleton = Array.from({ length: 5 }, (_, index) => index)
    const [loading, setLoading] = useState(true)
    const [status, setStatus] = useState<'true' | 'false'>('true')
-
+   const [loadingSubmit, setLoadingSubmit] = useState(false)
    const [idChoose, setIdChoose] = useState('')
    const [activeChoose, setActiveChoose] = useState(true)
    const [titleChoose, setTitleChoose] = useState('')
@@ -40,27 +42,24 @@ export default function Index() {
 
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.groupUpdate)
-
-   const [data11, setData1] = useState(Array.from({ length: 20 }, (_, i) => `Item ${i}`));
-
-   const renderItem = ({ item }: { item: string }) => (
-      <View style={{ padding: 20, borderBottomWidth: 1, borderColor: '#ccc' }}>
-         <Text>{item}</Text>
-      </View>
-   );
+   const [error, setError] = useState({
+      title: false,
+   });
 
 
    async function handleEdit() {
       try {
+         setLoadingSubmit(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiEditGroup({ user: hasil, name: titleChoose }, idChoose)
          dispatch(setUpdateGroup(!update))
       } catch (error) {
          console.error(error)
       } finally {
+         setLoadingSubmit(false)
          setVisibleEdit(false)
          setModal(false)
-         ToastAndroid.show('Berhasil mengupdate data', ToastAndroid.SHORT)
+         Toast.show({ type: 'small', text1: 'Berhasil mengupdate data', })
       }
 
    }
@@ -74,7 +73,7 @@ export default function Index() {
          console.error(error)
       } finally {
          setModal(false)
-         ToastAndroid.show('Berhasil mengupdate data', ToastAndroid.SHORT)
+         Toast.show({ type: 'small', text1: 'Berhasil mengupdate data', })
       }
    }
 
@@ -107,74 +106,96 @@ export default function Index() {
       setRefreshing(false)
    };
 
+   function validationForm(val: any, cat: 'title') {
+      if (cat === 'title') {
+         setTitleChoose(val)
+         if (val == "" || val.length < 3) {
+            setError((prev) => ({ ...prev, title: true }))
+         } else {
+            setError((prev) => ({ ...prev, title: false }))
+         }
+      }
+   }
+
+
+   const getItem = (_data: unknown, index: number): Props => ({
+      id: data[index].id,
+      name: data[index].name,
+      isActive: data[index].isActive,
+   });
+
+
 
    return (
-      <SafeAreaView>
-         <ScrollView
-            refreshControl={
-               <RefreshControl
-                  refreshing={refreshing}
-                  onRefresh={handleRefresh}
-               />
-            }
-         >
-            <View style={[Styles.p15]}>
-               <View style={[Styles.wrapBtnTab]}>
-                  <ButtonTab
-                     active={status == "false" ? "false" : "true"}
-                     value="true"
-                     onPress={() => { setStatus("true") }}
-                     label="Aktif"
-                     icon={<Feather name="check-circle" color={status == "true" ? 'white' : 'black'} size={20} />}
-                     n={2} />
-                  <ButtonTab
-                     active={status == "false" ? "false" : "true"}
-                     value="false"
-                     onPress={() => { setStatus("false") }}
-                     label="Tidak Aktif"
-                     icon={<AntDesign name="closecircleo" color={status == "false" ? 'white' : 'black'} size={20} />}
-                     n={2} />
-               </View>
-               <InputSearch onChange={setSearch} />
-               <View>
-                  {
-
-                     loading ?
-                        arrSkeleton.map((item, index) => {
-                           return (
-                              <SkeletonTwoItem key={index} />
-                           )
-                        })
-                        :
-                        data.length > 0 ?
-                           data.map((item, index) => {
-                              return (
-                                 <BorderBottomItem
-                                    key={index}
-                                    onPress={() => {
-                                       setIdChoose(item.id)
-                                       setActiveChoose(item.isActive)
-                                       setTitleChoose(item.name)
-                                       setModal(true)
-                                    }}
-                                    borderType="all"
-                                    icon={
-                                       <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                                          <MaterialCommunityIcons name="office-building-outline" size={25} color={'#384288'} />
-                                       </View>
-                                    }
-                                    title={item.name}
-                                 />
-                              )
-                           })
-                           :
-                           <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
-                  }
-               </View>
+      <View style={[Styles.p15, { flex: 1 }]}>
+         <View style={[Styles.mb10]}>
+            <View style={[Styles.wrapBtnTab]}>
+               <ButtonTab
+                  active={status == "false" ? "false" : "true"}
+                  value="true"
+                  onPress={() => { setStatus("true") }}
+                  label="Aktif"
+                  icon={<Feather name="check-circle" color={status == "true" ? 'white' : 'black'} size={20} />}
+                  n={2} />
+               <ButtonTab
+                  active={status == "false" ? "false" : "true"}
+                  value="false"
+                  onPress={() => { setStatus("false") }}
+                  label="Tidak Aktif"
+                  icon={<AntDesign name="closecircleo" color={status == "false" ? 'white' : 'black'} size={20} />}
+                  n={2} />
             </View>
-         </ScrollView>
+            <InputSearch onChange={setSearch} />
+         </View>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
+            {
+               loading ?
+                  arrSkeleton.map((item, index) => {
+                     return (
+                        <SkeletonTwoItem key={index} />
+                     )
+                  })
+                  :
+                  data.length > 0 ?
+                     <VirtualizedList
+                        data={data}
+                        getItemCount={() => data.length}
+                        getItem={getItem}
+                        renderItem={({ item, index }: { item: Props, index: number }) => {
+                           return (
+                              <BorderBottomItem
+                                 key={index}
+                                 onPress={() => {
+                                    setIdChoose(item.id)
+                                    setActiveChoose(item.isActive)
+                                    setTitleChoose(item.name)
+                                    setModal(true)
+                                 }}
+                                 borderType="all"
+                                 icon={
+                                    <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
+                                       <MaterialCommunityIcons name="office-building-outline" size={25} color={'#384288'} />
+                                    </View>
+                                 }
+                                 title={item.name}
+                              />
+                           )
+                        }}
+                        keyExtractor={(item, index) => String(index)}
+                        showsVerticalScrollIndicator={false}
+                        refreshControl={
+                           <RefreshControl
+                              refreshing={refreshing}
+                              onRefresh={handleRefresh}
+                           />
+                        }
+                     />
+                     :
+                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
+            }
+         </View>
 
-         <DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title={titleChoose}>
+         <DrawerBottom animation="slide" isVisible={isModal} setVisible={() => setModal(false)} title={titleChoose}>
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
                   icon={<MaterialCommunityIcons name="toggle-switch-off-outline" color="black" size={25} />}
@@ -193,24 +214,33 @@ export default function Index() {
                   title="Edit"
                   onPress={() => {
                      setModal(false)
-                     setVisibleEdit(true)
+                     setTimeout(() => {
+                        setVisibleEdit(true)
+                     }, 600);
                   }}
                />
             </View>
          </DrawerBottom>
 
-         <DrawerBottom animation="none" height={30} isVisible={isVisibleEdit} setVisible={setVisibleEdit} title="Edit Lembaga Desa">
+         <DrawerBottom animation="none" keyboard height={30} isVisible={isVisibleEdit} setVisible={() => setVisibleEdit(false)} title="Edit Lembaga Desa">
             <View style={{ flex: 1 }}>
                <View>
-                  <InputForm type="default" placeholder="Nama Lembaga Desa" required label="Lembaga Desa" value={titleChoose} onChange={setTitleChoose} />
+                  <InputForm
+                     type="default"
+                     placeholder="Nama Lembaga Desa"
+                     required
+                     label="Lembaga Desa"
+                     value={titleChoose}
+                     error={error.title}
+                     errorText="Lembaga Desa tidak boleh kosong & minimal 3 karakter"
+                     onChange={(val) => { validationForm(val, 'title') }} />
                </View>
                <View>
-                  <ButtonForm text="SIMPAN" onPress={() => { handleEdit() }} />
+                  <ButtonForm text="SIMPAN" disabled={Object.values(error).some((v) => v == true) || titleChoose == "" || loadingSubmit} onPress={() => { handleEdit() }} />
                </View>
             </View>
          </DrawerBottom>
+      </View >
 
-
-      </SafeAreaView>
    )
 }

app/(application)/home.tsx

@@ -7,19 +7,24 @@ import EventHome from "@/components/home/eventHome";
 import FiturHome from "@/components/home/fiturHome";
 import { HeaderRightHome } from "@/components/home/headerRightHome";
 import ProjectHome from "@/components/home/projectHome";
+import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
 import { apiGetProfile } from "@/lib/api";
 import { setEntities } from "@/lib/entitiesSlice";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { Stack } from "expo-router";
-import { useEffect } from "react";
-import { SafeAreaView, ScrollView, View } from "react-native";
+import { useEffect, useState } from "react";
+import { Platform, RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useDispatch, useSelector } from "react-redux";
 
+
 export default function Home() {
    const entities = useSelector((state: any) => state.entities)
    const dispatch = useDispatch()
-   const { token, decryptToken } = useAuthSession()
+   const { token, decryptToken, signOut } = useAuthSession()
+   const insets = useSafeAreaInsets()
+   const [refreshing, setRefreshing] = useState(false)
 
    useEffect(() => {
       handleUserLogin()
@@ -27,30 +32,52 @@ export default function Home() {
 
    async function handleUserLogin() {
       const hasil = await decryptToken(String(token?.current))
-      apiGetProfile({ id: hasil }).then((data) => dispatch(setEntities(data.data)));
+      apiGetProfile({ id: hasil })
+         .then((data) => dispatch(setEntities(data.data)))
+         .catch((error) => {
+            signOut()
+         });
    }
 
+   const handleRefresh = async () => {
+      setRefreshing(true)
+      handleUserLogin()
+      await new Promise(resolve => setTimeout(resolve, 2000));
+      setRefreshing(false)
+   };
+
    return (
       <SafeAreaView>
          <Stack.Screen
             options={{
                title: 'Home',
-               headerLeft: () => <></>,
                headerTitle: entities.village,
-               headerRight: () => <HeaderRightHome />,
-               headerTitleAlign: 'left',
+               header: () => (
+                  <View style={[Styles.rowItemsCenter, Styles.ph20, Platform.OS === 'ios' ? Styles.pb07 : Styles.pb13, { backgroundColor: '#19345E', paddingTop: Platform.OS === 'ios' ? insets.top : 10 }]}>
+                     <Text style={Styles.textHeaderHome}>{entities.village}</Text>
+                     <HeaderRightHome />
+                  </View>
+               ),
             }}
          />
-         <ScrollView>
-            <CaraouselHome />
-            <View style={[Styles.ph15]}>
+         <ScrollView
+            refreshControl={
+               <RefreshControl
+                  refreshing={refreshing}
+                  onRefresh={handleRefresh}
+               />
+            }
+            showsVerticalScrollIndicator={false}
+         >
+            <CaraouselHome refreshing={refreshing}/>
+            <View style={[Styles.ph15, Styles.mb100]}>
                <FiturHome />
-               <ProjectHome />
-               <DivisionHome />
-               <ChartProgresHome />
-               <ChartDokumenHome />
-               <EventHome />
-               <DisccussionHome />
+               <ProjectHome refreshing={refreshing}/>
+               <DivisionHome refreshing={refreshing}/>
+               <ChartProgresHome refreshing={refreshing}/>
+               <ChartDokumenHome refreshing={refreshing}/>
+               <EventHome refreshing={refreshing}/>
+               <DisccussionHome refreshing={refreshing}/>
             </View>
          </ScrollView>
       </SafeAreaView>

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

@@ -1,14 +1,18 @@
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import ImageUser from "@/components/imageNew";
 import ItemDetailMember from "@/components/itemDetailMember";
+import LabelStatus from "@/components/labelStatus";
 import HeaderRightMemberDetail from "@/components/member/headerMemberDetail";
 import Skeleton from "@/components/skeleton";
+import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import { valueRoleUser } from "@/constants/RoleUser";
 import Styles from "@/constants/Styles";
 import { apiGetProfile } from "@/lib/api";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { SafeAreaView, ScrollView, Text, View } from "react-native";
+import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useSelector } from "react-redux";
 
 type Props = {
@@ -33,15 +37,21 @@ export default function MemberDetail() {
    const [isEdit, setEdit] = useState(true)
    const arrSkeleton = Array.from({ length: 5 }, (_, index) => index)
    const [loading, setLoading] = useState(true)
+   const [refreshing, setRefreshing] = useState(false)
 
-   async function handleLoad() {
+   async function handleLoad(loading: boolean) {
       try {
-         setLoading(true)
+         setLoading(loading)
          const response = await apiGetProfile({ id: id })
-         setData(response.data)
-         setEdit(valueRoleUser.filter((v) => v.login == entityUser.role)[0]?.data.some((i: any) => i.id == response.data.idUserRole))
+         if (response.success) {
+            setData(response.data)
+            setEdit(valueRoleUser.filter((v) => v.login == entityUser.role)[0]?.data.some((i: any) => i.id == response.data.idUserRole))
+         } else {
+            Toast.show({ type: 'small', text1: response.message })
+         }
       } catch (error) {
          console.error(error)
+         Toast.show({ type: 'small', text1: 'Gagal mengambil data' })
       } finally {
          setLoading(false)
       }
@@ -49,9 +59,17 @@ export default function MemberDetail() {
 
 
    useEffect(() => {
-      handleLoad()
+      handleLoad(true)
    }, []);
 
+
+   const handleRefresh = async () => {
+      setRefreshing(true)
+      handleLoad(false)
+      await new Promise(resolve => setTimeout(resolve, 2000));
+      setRefreshing(false)
+   };
+
    return (
       <SafeAreaView>
          <Stack.Screen
@@ -63,48 +81,59 @@ export default function MemberDetail() {
                headerShadowVisible: false
             }}
          />
-         <ScrollView>
-            <View style={{ flexDirection: 'column' }}>
-               <View style={[Styles.wrapHeadViewMember]}>
-                  {
-                     loading ?
-                        <>
-                           <Skeleton width={100} height={100} borderRadius={100} />
-                           <Skeleton width={200} height={10} borderRadius={5} />
-                           <Skeleton width={150} height={10} borderRadius={5} />
-                        </>
-                        :
-                        <>
-                           <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${data?.img}`} size="lg" />
-                           <Text style={[Styles.textSubtitle, Styles.cWhite, Styles.mt10]}>{data?.name}</Text>
-                           <Text style={[Styles.textMediumNormal, Styles.cWhite]}>{data?.role}</Text>
-                        </>
+         <ScrollView
+            style={[Styles.h100]}
+            refreshControl={
+               <RefreshControl
+                  refreshing={refreshing}
+                  onRefresh={handleRefresh}
+               />
+            }
+         >
+            <View style={[Styles.wrapHeadViewMember]}>
+               {
+                  loading ?
+                     <>
+                        <Skeleton width={100} height={100} borderRadius={100} />
+                        <Skeleton width={200} height={10} borderRadius={5} />
+                        <Skeleton width={150} height={10} borderRadius={5} />
+                     </>
+                     :
+                     <>
+                        <ImageUser src={`${ConstEnv.url_storage}/files/${data?.img}`} size="lg" />
+                        <Text style={[Styles.textSubtitle, Styles.cWhite, Styles.mt10, { textAlign: 'center' }]}>{data?.name}</Text>
+                        <Text style={[Styles.textMediumNormal, Styles.cWhite]}>{data?.role}</Text>
+                     </>
 
-                  }
+               }
+            </View>
+            <View style={[Styles.p15]}>
+               <View style={[Styles.rowSpaceBetween]}>
+                  <Text style={[Styles.textDefaultSemiBold]}>Informasi</Text>
+                  <LabelStatus
+                     size="small"
+                     category={data?.isActive ? 'success' : 'error'}
+                     text={data?.isActive ? 'AKTIF' : 'TIDAK AKTIF'}
+                  />
                </View>
-               <View style={[Styles.p15]}>
-                  <View style={[Styles.rowSpaceBetween]}>
-                     <Text style={[Styles.textDefaultSemiBold]}>Informasi</Text>
-                  </View>
-                  {
-                     loading ?
-                        arrSkeleton.map((item, index) => {
-                           return (
-                              <Skeleton key={index} width={100} widthType="percent" height={25} borderRadius={5} />
-                           )
-                        })
-                        :
-                        <>
-                           <ItemDetailMember category="nik" value={data?.nik} />
-                           <ItemDetailMember category="group" value={data?.group} />
-                           <ItemDetailMember category="position" value={data?.position} />
-                           <ItemDetailMember category="phone" value={`+62${data?.phone}`} />
-                           <ItemDetailMember category="email" value={data?.email} />
-                           <ItemDetailMember category="gender" value={data?.gender == "F" ? "Perempuan" : "Laki-Laki"} />
-                        </>
-                  }
+               {
+                  loading ?
+                     arrSkeleton.map((item, index) => {
+                        return (
+                           <Skeleton key={index} width={100} widthType="percent" height={25} borderRadius={5} />
+                        )
+                     })
+                     :
+                     <>
+                        <ItemDetailMember category="nik" value={data?.nik} />
+                        <ItemDetailMember category="group" value={data?.group} />
+                        <ItemDetailMember category="position" value={data?.position} />
+                        <ItemDetailMember category="phone" value={`+62${data?.phone}`} />
+                        <ItemDetailMember category="email" value={data?.email} />
+                        <ItemDetailMember category="gender" value={data?.gender == "F" ? "Perempuan" : "Laki-Laki"} />
+                     </>
+               }
 
-               </View>
             </View>
          </ScrollView>
       </SafeAreaView>

app/(application)/member/create.tsx

@@ -3,27 +3,32 @@ import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
 import ModalSelect from "@/components/modalSelect";
 import SelectForm from "@/components/selectForm";
+import Text from "@/components/Text";
 import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
 import { apiCreateUser } from "@/lib/api";
+import { validateName } from "@/lib/fun_validateName";
 import { setUpdateMember } from "@/lib/memberSlice";
 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,
-   Text,
-   ToastAndroid,
-   View,
+   View
 } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function CreateMember() {
+   const headerHeight = useHeaderHeight();
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.memberUpdate)
    const { token, decryptToken } = useAuthSession()
@@ -34,10 +39,12 @@ export default function CreateMember() {
    const [chooseGender, setChooseGender] = useState({ val: "", label: "" });
    const [selectedImage, setSelectedImage] = useState<string | undefined>(undefined);
    const entityUser = useSelector((state: any) => state.user);
+   const entities = useSelector((state: any) => state.entities)
    const [isSelect, setSelect] = useState(false);
    const [disableBtn, setDisableBtn] = useState(true)
    const [valChoose, setValChoose] = useState("")
    const [imgForm, setImgForm] = useState<any>()
+   const [loading, setLoading] = useState(false)
    const [error, setError] = useState({
       group: false,
       position: false,
@@ -94,7 +101,7 @@ export default function CreateMember() {
          }
       } else if (cat == "name") {
          setDataForm({ ...dataForm, name: val });
-         if (val == "") {
+         if (!validateName(val)) {
             setError({ ...error, name: true });
          } else {
             setError({ ...error, name: false });
@@ -111,7 +118,7 @@ export default function CreateMember() {
          }
       } else if (cat == "phone") {
          setDataForm({ ...dataForm, phone: val });
-         if (val == "" || !(val.length >= 10 && val.length <= 15)) {
+         if (val == "" || !(val.length >= 9 && val.length <= 16)) {
             setError({ ...error, phone: true });
          } else {
             setError({ ...error, phone: false });
@@ -140,9 +147,16 @@ export default function CreateMember() {
       checkForm()
    }, [error, dataForm])
 
+   useEffect(() => {
+      if (entityUser.role != "supadmin" && entityUser.role != "developer") {
+         validationForm("group", entities.idGroup, entities.group)
+      }
+   }, [])
+
 
    async function handleCreate() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const fd = new FormData()
 
@@ -153,23 +167,26 @@ export default function CreateMember() {
          if (imgForm != undefined) {
             fd.append("file", {
                uri: imgForm.uri,
-               type: imgForm.mimeType,
-               name: imgForm.fileName,
+               type: imgForm.mimeType || "image/jpeg",
+               name: imgForm.fileName || "image.jpg",
             } as any)
          } else {
             fd.append("file", "undefined")
          }
 
-         const response = await apiCreateUser(fd)
+         const response = await apiCreateUser({ data: fd })
          if (response.success) {
-            ToastAndroid.show('Berhasil menambahkan data', ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
             dispatch(setUpdateMember(!update))
             router.back()
          } else {
-            ToastAndroid.show(response.message, ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -178,16 +195,13 @@ export default function CreateMember() {
       let result = await ImagePicker.launchImageLibraryAsync({
          mediaTypes: ["images"],
          allowsEditing: true,
-         quality: 1,
-         aspect: [1, 1],
+         quality: 0.9,
+         aspect: [1, 1]
       });
 
       if (!result.canceled) {
          setSelectedImage(result.assets[0].uri);
          setImgForm(result.assets[0]);
-
-      } else {
-         alert("Tidak ada gambar yang dipilih");
       }
    };
 
@@ -206,139 +220,145 @@ export default function CreateMember() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disableBtn}
+                     disable={disableBtn || loading}
                      category="create"
                      onPress={() => { handleCreate() }}
                   />
                ),
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
-               <View style={{ justifyContent: "center", alignItems: "center" }}>
-                  {selectedImage != undefined ? (
-                     <Pressable onPress={pickImageAsync}>
-                        <Image src={selectedImage} style={[Styles.userProfileBig]} />
-                     </Pressable>
-                  ) : (
-                     <Pressable
-                        onPress={pickImageAsync}
-                        style={[Styles.iconContent, ColorsStatus.gray]}
-                     >
-                        <MaterialCommunityIcons
-                           name="account-tie"
-                           size={100}
-                           color={"gray"}
+         <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={selectedImage} style={[Styles.userProfileBig]} />
+                           <View style={[Styles.absoluteIconPicker]}>
+                              <MaterialCommunityIcons name="image" color={'white'} size={15} />
+                           </View>
+                        </Pressable>
+                     ) : (
+                        <Pressable onPress={pickImageAsync} style={[Styles.iconContent, ColorsStatus.gray]} >
+                           <MaterialCommunityIcons name="account-tie" size={85} color={"gray"} />
+                           <View style={[Styles.absoluteIconPicker]}>
+                              <MaterialCommunityIcons name="image" color={'white'} size={15} />
+                           </View>
+                        </Pressable>
+                     )}
+                  </View>
+                  {(entityUser.role == "supadmin" ||
+                     entityUser.role == "developer") && (
+                        <SelectForm
+                           label="Lembaga Desa"
+                           placeholder="Pilih Lembaga Desa"
+                           value={chooseGroup.label}
+                           required
+                           onPress={() => {
+                              setValChoose(chooseGroup.val);
+                              setValSelect("group");
+                              setSelect(true);
+                           }}
+                           error={error.group}
+                           errorText="Lembaga Desa tidak boleh kosong"
                         />
-                     </Pressable>
-                  )}
+                     )}
+                  <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"
+                  />
+                  <SelectForm
+                     label="User Role"
+                     placeholder="Pilih Role"
+                     value={chooseRole.label}
+                     required
+                     onPress={() => {
+                        setValChoose(chooseRole.val);
+                        setValSelect("role");
+                        setSelect(true);
+                     }}
+                     error={error.role}
+                     errorText="Role tidak boleh kosong"
+                  />
+                  <InputForm
+                     label="NIK"
+                     type="numeric"
+                     placeholder="NIK"
+                     required
+                     error={error.nik}
+                     errorText="NIK Harus 16 Karakter"
+                     onChange={val => {
+                        validationForm("nik", val)
+                     }}
+                  />
+                  <InputForm
+                     label="Nama"
+                     type="default"
+                     placeholder="Nama"
+                     required
+                     error={error.name}
+                     errorText="Nama harus 3–50 karakter (huruf, angka, spasi, dan simbol ringan (. , ' _ -))"
+                     onChange={val => {
+                        validationForm("name", val)
+                     }}
+                  />
+                  <InputForm
+                     label="Email"
+                     type="default"
+                     placeholder="Email"
+                     required
+                     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>}
+                     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>
-               {(entityUser.role == "supadmin" ||
-                  entityUser.role == "developer") && (
-                     <SelectForm
-                        label="Lembaga Desa"
-                        placeholder="Pilih Lembaga Desa"
-                        value={chooseGroup.label}
-                        required
-                        onPress={() => {
-                           setValChoose(chooseGroup.val);
-                           setValSelect("group");
-                           setSelect(true);
-                        }}
-                        error={error.group}
-                        errorText="Lembaga Desa tidak boleh kosong"
-                     />
-                  )}
-               <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"
-               />
-               <SelectForm
-                  label="User Role"
-                  placeholder="Pilih Role"
-                  value={chooseRole.label}
-                  required
-                  onPress={() => {
-                     setValChoose(chooseRole.val);
-                     setValSelect("role");
-                     setSelect(true);
-                  }}
-                  error={error.role}
-                  errorText="Role tidak boleh kosong"
-               />
-               <InputForm
-                  label="NIK"
-                  type="numeric"
-                  placeholder="NIK"
-                  required
-                  error={error.nik}
-                  errorText="NIK Harus 16 Karakter"
-                  onChange={val => {
-                     validationForm("nik", val)
-                  }}
-               />
-               <InputForm
-                  label="Nama"
-                  type="default"
-                  placeholder="Nama"
-                  required
-                  error={error.name}
-                  errorText="Nama tidak boleh kosong"
-                  onChange={val => {
-                     validationForm("name", val)
-                  }}
-               />
-               <InputForm
-                  label="Email"
-                  type="default"
-                  placeholder="Email"
-                  required
-                  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>}
-                  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}
-            close={setSelect}
+            close={() => { setSelect(false) }}
             onSelect={(value) => {
                validationForm(valSelect, value.val, value.label);
             }}

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

@@ -3,22 +3,28 @@ import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
 import ModalSelect from "@/components/modalSelect";
 import SelectForm from "@/components/selectForm";
+import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiEditUser, apiGetProfile } from "@/lib/api";
+import { validateName } from "@/lib/fun_validateName";
 import { setUpdateMember } from "@/lib/memberSlice";
 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, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
 import {
    Image,
+   KeyboardAvoidingView,
+   Platform,
    Pressable,
    SafeAreaView,
    ScrollView,
-   Text,
-   ToastAndroid,
-   View,
+   View
 } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 type Props = {
@@ -36,6 +42,7 @@ type Props = {
 };
 
 export default function EditMember() {
+   const headerHeight = useHeaderHeight();
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.memberUpdate)
    const { token, decryptToken } = useAuthSession()
@@ -50,6 +57,7 @@ export default function EditMember() {
    const [disableBtn, setDisableBtn] = useState(false)
    const [valChoose, setValChoose] = useState("")
    const [imgForm, setImgForm] = useState<any>();
+   const [loading, setLoading] = useState(false)
    const [data, setData] = useState<Props>({
       id: "",
       name: "",
@@ -77,7 +85,7 @@ export default function EditMember() {
       try {
          const response = await apiGetProfile({ id: id });
          setData(response.data);
-         setSelectedImage({ uri: `https://wibu-storage.wibudev.com/api/files/${response.data.img}`, });
+         setSelectedImage({ uri: `${ConstEnv.url_storage}/files/${response.data.img}`, });
          setChoosePosition({
             val: response.data.idPosition,
             label: response.data.position,
@@ -125,7 +133,7 @@ export default function EditMember() {
          }
       } else if (cat == "name") {
          setData({ ...data, name: val });
-         if (val == "") {
+         if (!validateName(val)) {
             setError({ ...error, name: true });
          } else {
             setError({ ...error, name: false });
@@ -142,7 +150,7 @@ export default function EditMember() {
          }
       } else if (cat == "phone") {
          setData({ ...data, phone: val });
-         if (val == "" || !(val.length >= 10 && val.length <= 15)) {
+         if (val == "" || !(val.length >= 9 && val.length <= 16)) {
             setError({ ...error, phone: true });
          } else {
             setError({ ...error, phone: false });
@@ -173,14 +181,15 @@ export default function EditMember() {
 
    async function handleEdit() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const fd = new FormData()
 
          if (imgForm != undefined) {
             fd.append("file", {
                uri: imgForm.uri,
-               type: imgForm.mimeType,
-               name: imgForm.fileName,
+               type: imgForm.mimeType || "image/jpeg",
+               name: imgForm.fileName || "image.jpg",
             } as any);
          } else {
             fd.append("file", "undefined",);
@@ -193,15 +202,17 @@ export default function EditMember() {
          const response = await apiEditUser(fd, id)
 
          if (response.success) {
-            ToastAndroid.show('Berhasil mengupdate data', ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: 'Berhasil mengupdate data', })
             dispatch(setUpdateMember(!update))
             router.back()
          } else {
-            ToastAndroid.show(response.message, ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error)
-         ToastAndroid.show('Gagal mengupdate data', ToastAndroid.SHORT)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -211,8 +222,8 @@ export default function EditMember() {
       let result = await ImagePicker.launchImageLibraryAsync({
          mediaTypes: ["images"],
          allowsEditing: true,
-         quality: 1,
-         aspect: [1, 1],
+         quality: 0.9,
+         aspect: [1, 1]
       });
 
       if (!result.canceled) {
@@ -220,7 +231,6 @@ export default function EditMember() {
          setSelectedImage(result.assets[0].uri);
          setImgForm(result.assets[0]);
       } else {
-         alert("Tidak ada gambar yang dipilih");
          setErrorImg(false)
       }
    };
@@ -240,7 +250,7 @@ export default function EditMember() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disableBtn}
+                     disable={disableBtn || loading}
                      category="update"
                      onPress={() => {
                         handleEdit()
@@ -249,131 +259,142 @@ export default function EditMember() {
                ),
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
-               <View style={{ justifyContent: "center", alignItems: "center" }}>
-                  {
-                     errorImg ?
-                        <Pressable onPress={pickImageAsync}>
-                           {
-                              <Image
-                                 source={errorImg ? require("../../../../assets/images/user.jpg") : { uri: `https://wibu-storage.wibudev.com/api/files/${data?.img}` }}
-                                 style={[Styles.userProfileBig]}
-                                 onError={() => { setErrorImg(true) }}
-                              />
-                           }
-                        </Pressable>
-                        :
-                        selectedImage != undefined ? (
+
+         <KeyboardAvoidingView
+            style={[Styles.h100]}
+            behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+            keyboardVerticalOffset={headerHeight}
+         >
+            <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100]}>
+               <View style={[Styles.p15]}>
+                  <View style={{ justifyContent: "center", alignItems: "center" }}>
+                     {
+                        errorImg ?
                            <Pressable onPress={pickImageAsync}>
                               <Image
-                                 src={
-                                    typeof selectedImage === "string"
-                                       ? selectedImage
-                                       : selectedImage.uri
-                                 }
+                                 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>
-                        ) : (
-                           <Image
-                              source={require("../../../../assets/images/user.jpg")}
-                              style={[Styles.userProfileBig]}
-                           />
-                        )
-                  }
+                           :
+                           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>
+                           ) : (
+                              <Image
+                                 source={require("../../../../assets/images/user.jpg")}
+                                 style={[Styles.userProfileBig]}
+                              />
+                           )
+                     }
+                  </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"
+                  />
+                  <SelectForm
+                     label="User Role"
+                     placeholder="Pilih Role"
+                     value={chooseRole.label}
+                     required
+                     onPress={() => {
+                        setValChoose(chooseRole.val);
+                        setValSelect("role");
+                        setSelect(true);
+                     }}
+                     error={error.role}
+                     errorText="Role 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 harus 3–50 karakter (huruf, angka, spasi, dan simbol ringan (. , ' _ -))"
+                     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"
-               />
-               <SelectForm
-                  label="User Role"
-                  placeholder="Pilih Role"
-                  value={chooseRole.label}
-                  required
-                  onPress={() => {
-                     setValChoose(chooseRole.val);
-                     setValSelect("role");
-                     setSelect(true);
-                  }}
-                  error={error.role}
-                  errorText="Role 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}

app/(application)/member/index.tsx

@@ -3,13 +3,15 @@ import ButtonTab from "@/components/buttonTab";
 import ImageUser from "@/components/imageNew";
 import InputSearch from "@/components/inputSearch";
 import SkeletonTwoItem from "@/components/skeletonTwoItem";
+import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiGetUser } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign, Feather } from "@expo/vector-icons";
 import { router, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { RefreshControl, Text, View, VirtualizedList } from "react-native";
+import { RefreshControl, View, VirtualizedList } from "react-native";
 import { useSelector } from "react-redux";
 
 type Props = {
@@ -127,7 +129,7 @@ export default function Index() {
                </View>
             }
          </View>
-         <View style={[{ flex: 2 }]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   arrSkeleton.map((item, index) => {
@@ -149,7 +151,7 @@ export default function Index() {
                                  onPress={() => { router.push(`/member/${item.id}`) }}
                                  borderType="all"
                                  icon={
-                                    <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} />
+                                    <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} />
                                  }
                                  title={item.name}
                                  subtitle={`${item.group} - ${item.position}`}

app/(application)/notification.tsx

@@ -1,5 +1,6 @@
 import BorderBottomItem from "@/components/borderBottomItem";
 import SkeletonTwoItem from "@/components/skeletonTwoItem";
+import Text from "@/components/Text";
 import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
 import { apiGetNotification, apiReadOneNotification } from "@/lib/api";
@@ -8,7 +9,7 @@ import { pushToPage } from "@/lib/pushToPage";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { Feather } from "@expo/vector-icons";
 import { useEffect, useState } from "react";
-import { SafeAreaView, Text, View, VirtualizedList } from "react-native";
+import { RefreshControl, SafeAreaView, View, VirtualizedList } from "react-native";
 import { useDispatch, useSelector } from "react-redux";
 
 type Props = {
@@ -30,6 +31,7 @@ export default function Notification() {
    const arrSkeleton = Array.from({ length: 5 }, (_, index) => index)
    const dispatch = useDispatch()
    const updateNotification = useSelector((state: any) => state.notificationUpdate)
+   const [refreshing, setRefreshing] = useState(false)
 
    async function handleLoad(loading: boolean, thisPage: number) {
       try {
@@ -87,33 +89,12 @@ export default function Notification() {
       }
    }
 
-   // function pushToPage(category: string, idContent: string) {
-   //    const cat = category.split('/')
-   //    if (cat.length > 1) {
-   //       if (cat[2] == 'calendar') {
-   //          router.push(`/division/${cat[1]}/calendar/${idContent}`)
-   //       } else if (cat[2] == 'discussion') {
-   //          router.push(`/division/${cat[1]}/discussion/${idContent}`)
-   //       } else if (cat[2] == 'document') {
-   //          router.push(`/division/${cat[1]}/document/${idContent}`)
-   //       } else if (cat[2] == 'task') {
-   //          router.push(`/division/${cat[1]}/task/${idContent}`)
-   //       }
-   //    } else {
-   //       if (cat[0] == 'announcement') {
-   //          router.push(`/announcement/${idContent}`)
-   //       } else if (cat[0] == 'discussion-general') {
-   //          router.push(`/discussion/${idContent}`)
-   //       } else if (cat[0] == 'division') {
-   //          router.push(`/division/${idContent}`)
-   //       } else if (cat[0] == 'member') {
-   //          router.push(`/member/${idContent}`)
-   //       } else if (cat[0] == 'project') {
-   //          router.push(`/project/${idContent}`)
-   //       }
-   //    }
-   // }
-
+   const handleRefresh = async () => {
+      setRefreshing(true)
+      handleLoad(false, 1)
+      await new Promise(resolve => setTimeout(resolve, 2000));
+      setRefreshing(false)
+   };
 
    return (
       <SafeAreaView>
@@ -135,7 +116,6 @@ export default function Notification() {
                            return (
                               <BorderBottomItem
                                  borderType="bottom"
-                                 width={55}
                                  icon={
                                     <View style={[Styles.iconContent, item.isRead ? ColorsStatus.secondary : ColorsStatus.primary]}>
                                        <Feather name="bell" size={25} color="white" />
@@ -156,6 +136,12 @@ export default function Notification() {
                         onEndReached={loadMoreData}
                         onEndReachedThreshold={0.5}
                         showsVerticalScrollIndicator={false}
+                        refreshControl={
+                           <RefreshControl
+                              refreshing={refreshing}
+                              onRefresh={handleRefresh}
+                           />
+                        }
                      />
                      :
                      <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>

app/(application)/position/index.tsx

@@ -7,6 +7,7 @@ import { InputForm } from "@/components/inputForm";
 import InputSearch from "@/components/inputSearch";
 import MenuItemRow from "@/components/menuItemRow";
 import SkeletonTwoItem from "@/components/skeletonTwoItem";
+import Text from "@/components/Text";
 import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
 import { apiDeletePosition, apiEditPosition, apiGetPosition } from "@/lib/api";
@@ -15,7 +16,8 @@ import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign, Feather, MaterialCommunityIcons } from "@expo/vector-icons";
 import { useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { RefreshControl, SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native";
+import { RefreshControl, View, VirtualizedList } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 type Props = {
@@ -38,6 +40,7 @@ export default function Index() {
    const [data, setData] = useState<Props[]>([])
    const [search, setSearch] = useState('')
    const [nameGroup, setNameGroup] = useState('')
+   const [loadingSubmit, setLoadingSubmit] = useState(false)
    const [chooseData, setChooseData] = useState({ name: '', id: '', active: false, idGroup: '' })
    const [error, setError] = useState({
       name: false,
@@ -85,22 +88,27 @@ export default function Index() {
          console.error(error)
       } finally {
          setModal(false)
-         ToastAndroid.show('Berhasil mengupdate data', ToastAndroid.SHORT)
+         Toast.show({ type: 'small', text1: 'Berhasil mengupdate data', })
       }
    }
 
 
    async function handleEdit() {
       try {
+         setLoadingSubmit(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiEditPosition({ user: hasil, name: chooseData.name, idGroup: chooseData.idGroup }, chooseData.id)
-         dispatch(setUpdatePosition(!update))
+         if (response.success) {
+            dispatch(setUpdatePosition(!update))
+         } else {
+            Toast.show({ type: 'small', text1: response.message, })
+         }
       } catch (error) {
          console.error(error)
       } finally {
+         setLoadingSubmit(false)
          setVisibleEdit(false)
          setModal(false)
-         ToastAndroid.show('Berhasil mengupdate data', ToastAndroid.SHORT)
       }
 
    }
@@ -127,72 +135,89 @@ export default function Index() {
       setRefreshing(false)
    };
 
-   return (
-      <SafeAreaView>
-         <ScrollView refreshControl={
-            <RefreshControl
-               refreshing={refreshing}
-               onRefresh={handleRefresh}
-            />
-         }>
-            <View style={[Styles.p15]}>
-               <View style={[Styles.wrapBtnTab]}>
-                  <ButtonTab
-                     active={status == "false" ? "false" : "true"}
-                     value="true"
-                     onPress={() => { setStatus("true") }}
-                     label="Aktif"
-                     icon={<Feather name="check-circle" color={status == "true" ? 'white' : 'black'} size={20} />}
-                     n={2} />
-                  <ButtonTab
-                     active={status == "false" ? "false" : "true"}
-                     value="false"
-                     onPress={() => { setStatus("false") }}
-                     label="Tidak Aktif"
-                     icon={<AntDesign name="closecircleo" color={status == "false" ? 'white' : 'black'} size={20} />}
-                     n={2} />
-               </View>
-               <InputSearch onChange={setSearch} />
-               {
-                  (entityUser.role == "supadmin" || entityUser.role == "developer") &&
-                  <View style={[Styles.mv05]}>
-                     <Text>Filter : {nameGroup}</Text>
-                  </View>
-               }
-               <View>
-                  {
-                     loading ?
-                        arrSkeleton.map((item, index) => {
-                           return (
-                              <SkeletonTwoItem key={index} />
-                           )
-                        })
-                        :
-                        data.length > 0 ?
-                           data.map((item, index) => {
-                              return (
-                                 <BorderBottomItem
-                                    key={index}
-                                    onPress={() => { handleChooseData(item.id, item.name, item.isActive, item.idGroup) }}
-                                    borderType="all"
-                                    icon={
-                                       <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                                          <MaterialCommunityIcons name="account-tie" size={25} color={'#384288'} />
-                                       </View>
-                                    }
-                                    title={item.name}
-                                    subtitle={item.group}
-                                 />
-                              )
-                           })
-                           :
-                           <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
-                  }
-               </View>
-            </View>
-         </ScrollView>
 
-         <DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title={chooseData.name}>
+   const getItem = (_data: unknown, index: number): Props => ({
+      id: data[index].id,
+      name: data[index].name,
+      idGroup: data[index].idGroup,
+      group: data[index].group,
+      isActive: data[index].isActive,
+   });
+
+   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 == "true" ? 'white' : 'black'} size={20} />}
+                  n={2} />
+               <ButtonTab
+                  active={status == "false" ? "false" : "true"}
+                  value="false"
+                  onPress={() => { setStatus("false") }}
+                  label="Tidak Aktif"
+                  icon={<AntDesign name="closecircleo" color={status == "false" ? 'white' : 'black'} size={20} />}
+                  n={2} />
+            </View>
+            <InputSearch onChange={setSearch} />
+            {
+               (entityUser.role == "supadmin" || entityUser.role == "developer") &&
+               <View style={[Styles.mv05]}>
+                  <Text>Filter : {nameGroup}</Text>
+               </View>
+            }
+         </View>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
+            {
+               loading ?
+                  arrSkeleton.map((item, index) => {
+                     return (
+                        <SkeletonTwoItem key={index} />
+                     )
+                  })
+                  :
+                  data.length > 0 ?
+                     <VirtualizedList
+                        data={data}
+                        getItemCount={() => data.length}
+                        getItem={getItem}
+                        renderItem={({ item, index }: { item: Props, index: number }) => {
+                           return (
+                              <BorderBottomItem
+                                 key={index}
+                                 onPress={() => {
+                                    entityUser.role != "user" &&
+                                       handleChooseData(item.id, item.name, item.isActive, item.idGroup)
+                                 }}
+                                 borderType="all"
+                                 icon={
+                                    <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
+                                       <MaterialCommunityIcons name="account-tie" size={25} color={'#384288'} />
+                                    </View>
+                                 }
+                                 title={item.name}
+                                 subtitle={item.group}
+                              />
+                           )
+                        }}
+                        keyExtractor={(item, index) => String(index)}
+                        showsVerticalScrollIndicator={false}
+                        refreshControl={
+                           <RefreshControl
+                              refreshing={refreshing}
+                              onRefresh={handleRefresh}
+                           />
+                        }
+                     />
+                     :
+                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
+            }
+         </View>
+         <DrawerBottom animation="slide" isVisible={isModal} setVisible={() => setModal(false)} title={chooseData.name}>
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
                   icon={<MaterialCommunityIcons name="toggle-switch-off-outline" color="black" size={25} />}
@@ -211,14 +236,16 @@ export default function Index() {
                   title="Edit"
                   onPress={() => {
                      setModal(false)
-                     setVisibleEdit(true)
+                     setTimeout(() => {
+                        setVisibleEdit(true)
+                     }, 600)
                   }}
                />
             </View>
          </DrawerBottom>
 
 
-         <DrawerBottom animation="none" height={30} backdropPressable={false} isVisible={isVisibleEdit} setVisible={setVisibleEdit} title="Edit Jabatan">
+         <DrawerBottom animation="none" keyboard height={30} backdropPressable={false} isVisible={isVisibleEdit} setVisible={() => setVisibleEdit(false)} title="Edit Jabatan">
             <View style={{ justifyContent: 'space-between', flex: 1 }}>
                <View>
                   <InputForm
@@ -233,11 +260,10 @@ export default function Index() {
                   />
                </View>
                <View style={Styles.mb30}>
-                  <ButtonForm text="SIMPAN" onPress={() => { checkForm() }} />
+                  <ButtonForm text="SIMPAN" onPress={() => { handleEdit() }} disabled={Object.values(error).some((v) => v == true) || chooseData.name == "" || loadingSubmit} />
                </View>
             </View>
          </DrawerBottom>
-
-      </SafeAreaView>
+      </View>
    )
 }

app/(application)/profile.tsx

@@ -2,12 +2,14 @@ import AlertKonfirmasi from "@/components/alertKonfirmasi";
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import { ButtonHeader } from "@/components/buttonHeader";
 import ItemDetailMember from "@/components/itemDetailMember";
+import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign } from "@expo/vector-icons";
 import { router, Stack } from "expo-router";
 import { useState } from "react";
-import { Image, SafeAreaView, ScrollView, Text, View } from "react-native";
+import { Image, SafeAreaView, ScrollView, View } from "react-native";
 import { useSelector } from 'react-redux';
 
 export default function Profile() {
@@ -36,11 +38,11 @@ export default function Profile() {
                />
             }}
          />
-         <ScrollView>
+         <ScrollView style={[Styles.h100]}>
             <View style={{ flexDirection: 'column' }}>
                <View style={[Styles.wrapHeadViewMember]}>
                   <Image
-                     source={error ? require("../../assets/images/user.jpg") : { uri: `https://wibu-storage.wibudev.com/api/files/${entities.img}` }}
+                     source={error ? require("../../assets/images/user.jpg") : { uri: `${ConstEnv.url_storage}/files/${entities.img}` }}
                      onError={() => { setError(true) }}
                      style={[Styles.userProfileBig]}
                   />

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

@@ -12,7 +12,8 @@ import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons"
 import * as DocumentPicker from "expo-document-picker"
 import { router, Stack, useLocalSearchParams } from "expo-router"
 import { useState } from "react"
-import { ActivityIndicator, SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native"
+import { ActivityIndicator, SafeAreaView, ScrollView, Text, View } from "react-native"
+import Toast from "react-native-toast-message"
 import { useDispatch, useSelector } from "react-redux"
 
 export default function ProjectAddFile() {
@@ -25,20 +26,24 @@ export default function ProjectAddFile() {
    const [loadingCheck, setLoadingCheck] = useState(false)
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.projectUpdate)
+   const [loading, setLoading] = useState(false)
 
    const pickDocumentAsync = async () => {
       let result = await DocumentPicker.getDocumentAsync({
          type: ["*/*"],
-         multiple: false
+         multiple: true
       });
+
       if (!result.canceled) {
-         if (result.assets?.[0].uri) {
-            const check = await handleCheckFile(result.assets?.[0])
-            if (check) {
-               setFileForm([...fileForm, result.assets?.[0]])
-               setListFile([...listFile, result.assets?.[0].name])
-            } else {
-               ToastAndroid.show('File sudah ada', ToastAndroid.SHORT)
+         for (let i = 0; i < result.assets?.length; i++) {
+            if (result.assets?.[i].uri) {
+               const check = await handleCheckFile(result.assets?.[i])
+               if (check) {
+                  setFileForm((prev) => [...prev, result.assets?.[i]])
+                  setListFile((prev) => [...prev, result.assets?.[i].name])
+               } else {
+                  Toast.show({ type: 'small', text1: 'File yg telah terupload tidak bisa diupload ulang', })
+               }
             }
          }
       }
@@ -82,6 +87,7 @@ export default function ProjectAddFile() {
 
    async function handleAddFile() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const fd = new FormData();
 
@@ -103,15 +109,17 @@ export default function ProjectAddFile() {
 
          const response = await apiAddFileProject({ data: fd, id: id })
          if (response.success) {
-            ToastAndroid.show('Berhasil menambahkan file', ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: 'Berhasil menambahkan file', })
             dispatch(setUpdateProject({ ...update, file: !update.file }))
             router.back()
          } else {
-            ToastAndroid.show(response.message, ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error);
-         ToastAndroid.show('Terjadi kesalahan', ToastAndroid.SHORT)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -126,7 +134,7 @@ export default function ProjectAddFile() {
                headerTitle: 'Tambah File',
                headerTitleAlign: 'center',
                headerRight: () => <ButtonSaveHeader
-                  disable={fileForm.length == 0 ? true : false}
+                  disable={fileForm.length == 0 || loading ? true : false}
                   category="create"
                   onPress={() => { handleAddFile() }} />
             }}
@@ -158,6 +166,9 @@ export default function ProjectAddFile() {
                {
                   loadingCheck && <ActivityIndicator size="small" />
                }
+               {
+                  loading && <ActivityIndicator size="large" />
+               }
             </View>
          </ScrollView>
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title="Menu">

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

@@ -3,6 +3,8 @@ import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import ImageUser from "@/components/imageNew";
 import ImageWithLabel from "@/components/imageWithLabel";
 import InputSearch from "@/components/inputSearch";
+import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiAddMemberProject, apiGetProjectOne, apiGetUser } from "@/lib/api";
 import { setUpdateProject } from "@/lib/projectUpdate";
@@ -10,7 +12,8 @@ import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign } from "@expo/vector-icons";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { Pressable, SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native";
+import { Pressable, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 type Props = {
@@ -29,6 +32,7 @@ export default function AddMemberProject() {
    const [idGroup, setIdGroup] = useState('')
    const [selectMember, setSelectMember] = useState<any[]>([])
    const [search, setSearch] = useState('')
+   const [loading, setLoading] = useState(false)
 
    async function handleLoad() {
       try {
@@ -41,6 +45,7 @@ export default function AddMemberProject() {
          setData(responsemember.data.filter((i: any) => i.idUserRole != 'supadmin'))
       } catch (error) {
          console.error(error)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
       }
    }
 
@@ -71,21 +76,25 @@ export default function AddMemberProject() {
 
    async function handleAddMember() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiAddMemberProject({ id: id, data: { user: hasil, member: selectMember } })
          if (response.success) {
-            ToastAndroid.show('Berhasil menambahkan anggota', ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: 'Berhasil menambahkan anggota', })
             dispatch(setUpdateProject({ ...update, member: !update.member }))
             router.back()
          }
       } catch (error) {
          console.error(error)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
 
    return (
-      <SafeAreaView>
+      <>
          <Stack.Screen
             options={{
                headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -94,7 +103,7 @@ export default function AddMemberProject() {
                headerRight: () => (
                   <ButtonSaveHeader
                      category="update"
-                     disable={selectMember.length > 0 ? false : true}
+                     disable={selectMember.length == 0 || loading ? true : false}
                      onPress={() => {
                         handleAddMember()
                      }}
@@ -102,19 +111,19 @@ export default function AddMemberProject() {
                )
             }}
          />
-         <View style={[Styles.p15, Styles.mb100]}>
+         <View style={[Styles.p15, { flex: 1 }]}>
             <InputSearch onChange={(val) => handleSearch(val)} value={search} />
             {
                selectMember.length > 0
                   ?
                   <View>
-                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]}>
+                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]} showsHorizontalScrollIndicator={false}>
                         {
                            selectMember.map((item: any, index: any) => (
                               <ImageWithLabel
                                  key={index}
                                  label={item.name}
-                                 src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                 src={`${ConstEnv.url_storage}/files/${item.img}`}
                                  onClick={() => onChoose(item.idUser, item.name, item.img)}
                               />
                            ))
@@ -125,40 +134,48 @@ export default function AddMemberProject() {
                   :
                   <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
             }
-            <ScrollView>
+            <ScrollView
+               showsVerticalScrollIndicator={false}
+               style={[Styles.h100]}
+            >
                {
                   data.length > 0 ?
-                     data.map((item: any, index: any) => {
-                        const found = dataOld.some((i: any) => i.idUser == item.id)
-                        return (
-                           <Pressable
-                              key={index}
-                              style={[Styles.itemSelectModal]}
-                              onPress={() => {
-                                 !found && onChoose(item.id, item.name, item.img)
-                              }}
-                           >
-                              <View style={[Styles.rowItemsCenter, Styles.w80]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
-                                 <View style={[Styles.ml10]}>
-                                    <Text style={[Styles.textDefault]} numberOfLines={1}>{item.name}</Text>
+                     <View style={[Styles.mb100]}>
+                        {
+                           data.map((item: any, index: any) => {
+                              const found = dataOld.some((i: any) => i.idUser == item.id)
+                              return (
+                                 <Pressable
+                                    key={index}
+                                    style={[Styles.itemSelectModal]}
+                                    onPress={() => {
+                                       !found && onChoose(item.id, item.name, item.img)
+                                    }}
+                                 >
+                                    <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>
+                                          }
+                                       </View>
+                                    </View>
                                     {
-                                       found && <Text style={[Styles.textInformation, Styles.cGray]}>sudah menjadi anggota</Text>
+                                       selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'} />
                                     }
-                                 </View>
-                              </View>
-                              {
-                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} />
-                              }
-                           </Pressable>
-                        )
-                     }
-                     )
+                                 </Pressable>
+                              )
+                           }
+                           )
+                        }
+                     </View>
+
                      :
                      <Text style={[Styles.textDefault, { textAlign: 'center' }]}>Tidak ada data</Text>
                }
             </ScrollView>
          </View>
-      </SafeAreaView>
+      </>
    )
 }

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

@@ -1,29 +1,41 @@
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
+import ModalAddDetailTugasProject from "@/components/project/modalAddDetailTugasProject";
+import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
 import { apiCreateProjectTask } from "@/lib/api";
+import { formatDateOnly } from "@/lib/fun_formatDateOnly";
+import { getDatesInRange } from "@/lib/fun_getDatesInRange";
 import { setUpdateProject } from "@/lib/projectUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import dayjs from "dayjs";
+import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack, useLocalSearchParams } from "expo-router";
+import 'intl';
+import 'intl/locale-data/jsonp/id';
+import moment from "moment";
 import { useEffect, useState } from "react";
 import {
+   KeyboardAvoidingView,
+   Platform,
+   Pressable,
    SafeAreaView,
    ScrollView,
-   Text,
-   ToastAndroid,
-   View,
+   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";
 
 export default function ProjectAddTask() {
+   const headerHeight = useHeaderHeight();
    const { token, decryptToken } = useAuthSession()
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.projectUpdate)
+   const [dataDetail, setDataDetail] = useState<any>([])
+   const [modalDetail, setModalDetail] = useState(false)
    const { id } = useLocalSearchParams<{ id: string }>();
    const [disable, setDisable] = useState(true);
    const [range, setRange] = useState<{
@@ -36,11 +48,11 @@ export default function ProjectAddTask() {
       title: false,
    })
    const [title, setTitle] = useState('');
+   const [loading, setLoading] = useState(false)
+   const [dsbButton, setDsbButton] = useState(true)
 
-   const from = range.startDate
-      ? dayjs(range.startDate).format("DD-MM-YYYY")
-      : "";
-   const to = range.endDate ? dayjs(range.endDate).format("DD-MM-YYYY") : "";
+   const from = formatDateOnly(range.startDate);
+   const to = formatDateOnly(range.endDate);
 
    function checkAll() {
       if (from == "" || to == "" || title == "" || title == "null" || error.startDate || error.endDate || error.title) {
@@ -61,21 +73,62 @@ export default function ProjectAddTask() {
       }
    }
 
+   function checkButton() {
+      if (range.startDate == null || range.endDate == null || range.startDate == undefined || range.endDate == undefined) {
+         setDsbButton(true)
+         setDataDetail([])
+      } else {
+         setDsbButton(false)
+         const awal = formatDateOnly(range.startDate, "YYYY-MM-DD")
+         const akhir = formatDateOnly(range.endDate, "YYYY-MM-DD")
+         const datanya = getDatesInRange(awal, akhir)
+         setDataDetail(datanya.map((item: any) => ({
+            date: item,
+            timeStart: null,
+            timeEnd: null,
+         })))
+      }
+   }
+
    useEffect(() => {
       checkAll()
    }, [from, to, title, error])
 
+   useEffect(() => {
+      checkButton()
+   }, [range])
+
+
    async function handleCreate() {
       try {
+         setLoading(true)
+         const dataDetailFix = dataDetail.map((item: any) => ({
+            date: moment(item.date, "DD-MM-YYYY").format("YYYY-MM-DD"),
+            timeStart: item.timeStart,
+            timeEnd: item.timeEnd,
+         }))
          const hasil = await decryptToken(String(token?.current));
-         const response = await apiCreateProjectTask({ data: { name: title, dateStart: dayjs(range.startDate).format("YYYY-MM-DD"), dateEnd: dayjs(range.endDate).format("YYYY-MM-DD"), user: hasil }, id });
+         const response = await apiCreateProjectTask({
+            data: {
+               name: title,
+               dateStart: formatDateOnly(range.startDate, "YYYY-MM-DD"),
+               dateEnd: formatDateOnly(range.endDate, "YYYY-MM-DD"),
+               user: hasil,
+               dataDetail: dataDetailFix
+            }, id
+         });
          if (response.success) {
             dispatch(setUpdateProject({ ...update, task: !update.task, progress: !update.progress }))
-            ToastAndroid.show("Berhasil menambah data", ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: 'Berhasil menambah data', })
             router.back();
+         } else {
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -94,66 +147,93 @@ export default function ProjectAddTask() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disable}
+                     disable={disable || loading}
                      category="create"
                      onPress={() => { handleCreate() }}
                   />
                ),
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
-               <View style={[Styles.wrapPaper, Styles.p10]}>
-                  <DateTimePicker
-                     mode="range"
-                     startDate={range.startDate}
-                     endDate={range.endDate}
-                     onChange={(param) => setRange(param)}
-                     styles={{
-                        selected: Styles.selectedDate,
-                        selected_label: Styles.cWhite,
-                        range_fill: Styles.selectRangeDate,
+         <KeyboardAvoidingView
+            behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+            keyboardVerticalOffset={headerHeight}
+         >
+            <ScrollView>
+               <View style={[Styles.p15, Styles.mb100]}>
+                  <View style={[Styles.wrapPaper, Styles.p10]}>
+                     <DateTimePicker
+                        mode="range"
+                        startDate={range.startDate}
+                        endDate={range.endDate}
+                        onChange={(param) => { setRange(param) }}
+                        styles={{
+                           selected: Styles.selectedDate,
+                           selected_label: Styles.cWhite,
+                           range_fill: Styles.selectRangeDate,
+                           month_label: Styles.cBlack,
+                           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,
+                        }}
+                     />
+                  </View>
+                  <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]}>
+                              <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]}>
+                              <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>
+                     }
+                     <Pressable
+                        style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
+                        disabled={dsbButton}
+                        onPress={() => { setModalDetail(true) }}
+                     >
+                        <Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
+                     </Pressable>
+                  </View>
+                  <InputForm
+                     label="Judul Tugas"
+                     type="default"
+                     placeholder="Judul Tugas"
+                     required
+                     bg="white"
+                     value={title}
+                     error={error.title}
+                     errorText="Judul tidak boleh kosong"
+                     onChange={(e) => {
+                        onValidation("title", e)
                      }}
                   />
                </View>
-               <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]}>
-                           <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]}>
-                           <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>
-                  }
-               </View>
-               <InputForm
-                  label="Judul Tugas"
-                  type="default"
-                  placeholder="Judul Tugas"
-                  required
-                  bg="white"
-                  value={title}
-                  error={error.title}
-                  errorText="Judul tidak boleh kosong"
-                  onChange={(e) => {
-                     onValidation("title", e)
-                  }}
-               />
-            </View>
-         </ScrollView>
+            </ScrollView>
+         </KeyboardAvoidingView>
+         <ModalAddDetailTugasProject
+            isVisible={modalDetail}
+            setVisible={setModalDetail}
+            dataTanggal={dataDetail}
+            onSubmit={(data) => {
+               setDataDetail(data)
+            }}
+         />
       </SafeAreaView>
    );
 }

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

@@ -7,7 +7,8 @@ import { setUpdateProject } from "@/lib/projectUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native";
+import { SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function ProjectCancel() {
@@ -18,13 +19,14 @@ export default function ProjectCancel() {
    const [reason, setReason] = useState("");
    const [error, setError] = useState(false);
    const [disable, setDisable] = useState(false);
+   const [loading, setLoading] = useState(false)
 
 
    function onValidation(val: string) {
       setReason(val)
       if (val == "" || val == "null") {
          setError(true)
-      }else{
+      } else {
          setError(false)
       }
    }
@@ -43,6 +45,7 @@ export default function ProjectCancel() {
 
    async function handleCancel() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current));
          const response = await apiCancelProject({
             reason: reason,
@@ -50,11 +53,14 @@ export default function ProjectCancel() {
          }, id);
          if (response.success) {
             dispatch(setUpdateProject({ ...update, data: !update.data }))
-            ToastAndroid.show("Berhasil membatalkan kegiatan", ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: 'Berhasil membatalkan kegiatan', })
             router.back();
          }
       } catch (error) {
          console.error(error);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -73,7 +79,7 @@ export default function ProjectCancel() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disable}
+                     disable={disable || loading}
                      category="cancel"
                      onPress={() => {
                         handleCancel();
@@ -82,8 +88,11 @@ export default function ProjectCancel() {
                ),
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
+         <ScrollView
+            showsVerticalScrollIndicator={false}
+            style={[Styles.h100]}
+         >
+            <View style={[Styles.p15]}>
                <InputForm
                   label="Alasan Pembatalan"
                   type="default"
@@ -93,6 +102,7 @@ export default function ProjectCancel() {
                   error={error}
                   errorText="Alasan pembatalan harus diisi"
                   onChange={(val) => onValidation(val)}
+                  multiline
                />
             </View>
          </ScrollView>

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

@@ -7,7 +7,8 @@ import { setUpdateProject } from "@/lib/projectUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native";
+import { SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function EditProject() {
@@ -18,6 +19,7 @@ export default function EditProject() {
    const [judul, setJudul] = useState("");
    const [error, setError] = useState(false);
    const [disable, setDisable] = useState(false);
+   const [loading, setLoading] = useState(false)
 
    async function handleLoad() {
       try {
@@ -41,6 +43,8 @@ export default function EditProject() {
       setJudul(val)
       if (val == "" || val == "null") {
          setError(true)
+      }else{
+         setError(false)
       }
    }
 
@@ -58,6 +62,7 @@ export default function EditProject() {
 
    async function handleUpdate() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current));
          const response = await apiEditProject({
             name: judul,
@@ -65,11 +70,16 @@ export default function EditProject() {
          }, id);
          if (response.success) {
             dispatch(setUpdateProject({ ...update, data: !update.data }))
-            ToastAndroid.show("Berhasil mengubah data", ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
             router.back();
+         } else {
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -90,7 +100,7 @@ export default function EditProject() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disable}
+                     disable={disable || loading}
                      category="update"
                      onPress={() => { handleUpdate() }}
                   />

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

@@ -1,7 +1,9 @@
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import HeaderRightProjectDetail from "@/components/project/headerProjectDetail";
 import SectionFile from "@/components/project/sectionFile";
+import SectionLink from "@/components/project/sectionLink";
 import SectionMember from "@/components/project/sectionMember";
+import SectionReportProject from "@/components/project/sectionReportProject";
 import SectionTanggalTugasProject from "@/components/project/sectionTanggalTugas";
 import SectionCancel from "@/components/sectionCancel";
 import SectionProgress from "@/components/sectionProgress";
@@ -10,7 +12,7 @@ import { apiGetProjectOne } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { SafeAreaView, ScrollView, View } from "react-native";
+import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
 import { useSelector } from "react-redux";
 
 
@@ -37,6 +39,7 @@ export default function DetailProject() {
    const update = useSelector((state: any) => state.projectUpdate)
    const [isMember, setIsMember] = useState(false)
    const entityUser = useSelector((state: any) => state.user)
+   const [refreshing, setRefreshing] = useState(false)
 
    async function handleLoad(cat: 'data' | 'progress') {
       try {
@@ -79,6 +82,14 @@ export default function DetailProject() {
    }, [])
 
 
+   const handleRefresh = async () => {
+      setRefreshing(true)
+      await handleLoad('data')
+      await handleLoad('progress')
+      await new Promise(resolve => setTimeout(resolve, 2000));
+      setRefreshing(false)
+   };
+
    return (
       <SafeAreaView>
          <Stack.Screen
@@ -89,15 +100,24 @@ export default function DetailProject() {
                headerRight: () => (entityUser.role == "user" || entityUser.role == "coadmin") && !isMember ? null : <HeaderRightProjectDetail id={id} status={data?.status} />,
             }}
          />
-         <ScrollView>
+         <ScrollView
+            refreshControl={
+               <RefreshControl
+                  refreshing={refreshing}
+                  onRefresh={handleRefresh}
+               />
+            }
+         >
             <View style={[Styles.p15, Styles.mb100]}>
                {
                   data?.reason != null && data?.reason != "" && <SectionCancel text={data?.reason} />
                }
                <SectionProgress text={`Kemajuan Kegiatan ${progress}%`} progress={progress} />
-               <SectionTanggalTugasProject status={data?.status} member={isMember} />
-               <SectionFile status={data?.status} member={isMember} />
-               <SectionMember status={data?.status} />
+               <SectionReportProject refreshing={refreshing} />
+               <SectionTanggalTugasProject status={data?.status} member={isMember} refreshing={refreshing} />
+               <SectionFile status={data?.status} member={isMember} refreshing={refreshing} />
+               <SectionLink status={data?.status} member={isMember} refreshing={refreshing} />
+               <SectionMember status={data?.status} refreshing={refreshing} />
             </View>
          </ScrollView>
       </SafeAreaView>

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

@@ -0,0 +1,131 @@
+import ButtonBackHeader from "@/components/buttonBackHeader";
+import ButtonSaveHeader from "@/components/buttonSaveHeader";
+import { InputForm } from "@/components/inputForm";
+import Styles from "@/constants/Styles";
+import { apiGetProjectOne, apiReportProject } from "@/lib/api";
+import { setUpdateProject } from "@/lib/projectUpdate";
+import { useAuthSession } from "@/providers/AuthProvider";
+import { router, Stack, useLocalSearchParams } from "expo-router";
+import { useEffect, useState } from "react";
+import { SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
+import { useDispatch, useSelector } from "react-redux";
+
+export default function ReportProject() {
+   const { token, decryptToken } = useAuthSession();
+   const { id } = useLocalSearchParams<{ id: string }>();
+   const dispatch = useDispatch()
+   const update = useSelector((state: any) => state.projectUpdate)
+   const [laporan, setLaporan] = useState("");
+   const [error, setError] = useState(false);
+   const [disable, setDisable] = useState(false);
+   const [loading, setLoading] = useState(false)
+
+   async function handleLoad() {
+      try {
+         const hasil = await decryptToken(String(token?.current));
+         const response = await apiGetProjectOne({
+            user: hasil,
+            cat: "data",
+            id: id,
+         });
+         setLaporan(response.data.report);
+      } catch (error) {
+         console.error(error);
+      }
+   }
+
+   useEffect(() => {
+      handleLoad();
+   }, []);
+
+   function onValidation(val: string) {
+      setLaporan(val)
+      if (val == "" || val == "null") {
+         setError(true)
+      } else {
+         setError(false)
+      }
+   }
+
+   function checkAll() {
+      if (laporan == "" || laporan == "null" || laporan == null || laporan == undefined || error) {
+         setDisable(true)
+      } else {
+         setDisable(false)
+      }
+   }
+
+   useEffect(() => {
+      checkAll()
+   }, [laporan, error]);
+
+   async function handleUpdate() {
+      try {
+         setLoading(true)
+         const hasil = await decryptToken(String(token?.current));
+         const response = await apiReportProject({
+            report: laporan,
+            user: hasil,
+         }, id);
+         if (response.success) {
+            dispatch(setUpdateProject({ ...update, report: !update.report }))
+            Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
+            router.back();
+         } else {
+            Toast.show({ type: 'small', text1: response.message, })
+         }
+      } catch (error) {
+         console.error(error);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
+      }
+   }
+
+
+
+   return (
+      <SafeAreaView>
+         <Stack.Screen
+            options={{
+               headerLeft: () => (
+                  <ButtonBackHeader
+                     onPress={() => {
+                        router.back();
+                     }}
+                  />
+               ),
+               headerTitle: "Laporan Kegiatan",
+               headerTitleAlign: "center",
+               headerRight: () => (
+                  <ButtonSaveHeader
+                     disable={disable || loading}
+                     category="update"
+                     onPress={() => { handleUpdate() }}
+                  />
+               ),
+            }}
+         />
+         <ScrollView
+            showsVerticalScrollIndicator={false}
+            style={[Styles.h100]}
+         >
+            <View style={[Styles.p15]}>
+               <InputForm
+                  label="Laporan Kegiatan"
+                  type="default"
+                  placeholder="Laporan Kegiatan"
+                  required
+                  bg="white"
+                  value={laporan}
+                  onChange={(val) => { onValidation(val) }}
+                  error={error}
+                  errorText="Judul Kegiatan harus diisi"
+                  multiline
+               />
+            </View>
+         </ScrollView>
+      </SafeAreaView>
+   );
+}

app/(application)/project/create.tsx

@@ -9,8 +9,11 @@ import MenuItemRow from "@/components/menuItemRow";
 import ModalSelect from "@/components/modalSelect";
 import SectionListAddTask from "@/components/project/sectionListAddTask";
 import SelectForm from "@/components/selectForm";
+import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiCreateProject } from "@/lib/api";
+import { setGroupChoose } from "@/lib/groupChoose";
 import { setMemberChoose } from "@/lib/memberChoose";
 import { setUpdateProject } from "@/lib/projectUpdate";
 import { setTaskCreate } from "@/lib/taskCreate";
@@ -22,13 +25,13 @@ import { useEffect, useState } from "react";
 import {
    SafeAreaView,
    ScrollView,
-   Text,
-   ToastAndroid,
-   View,
+   View
 } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function CreateProject() {
+   const [loading, setLoading] = useState(false)
    const { token, decryptToken } = useAuthSession();
    const [chooseGroup, setChooseGroup] = useState({ val: "", label: "" });
    const dispatch = useDispatch();
@@ -55,10 +58,21 @@ export default function CreateProject() {
       member: false,
    });
    const [hitung, setHitung] = useState(0)
+   let hitungRefresh = 0;
+
+   useEffect(() => {
+      if (hitungRefresh == 0) {
+         dispatch(setGroupChoose(''));
+         dispatch(setTaskCreate([]));
+         dispatch(setMemberChoose([]));
+      }
+      hitungRefresh++;
+   }, []);
 
    function validationForm(cat: string, val: any, label?: string) {
       if (cat == "group") {
          setChooseGroup({ val, label: String(label) });
+         dispatch(setGroupChoose(val));
          dispatch(setMemberChoose([]));
          setDataForm({ ...dataForm, idGroup: val });
          if (val == "" || val == "null") {
@@ -73,7 +87,7 @@ export default function CreateProject() {
          } else {
             setError(error => ({ ...error, title: false }))
          }
-      } else if (cat == "task" && hitung > 1) {
+      } else if (cat == "task" && hitung > 2) {
          if (taskCreate.length == 0) {
             setError(error => ({ ...error, task: true }))
          } else {
@@ -91,6 +105,7 @@ export default function CreateProject() {
    }
 
    function handleBack() {
+      dispatch(setGroupChoose(''));
       dispatch(setTaskCreate([]));
       dispatch(setMemberChoose([]));
       router.back();
@@ -100,8 +115,16 @@ export default function CreateProject() {
       validationForm('task', '');
    }, [taskCreate]);
 
+
+   useEffect(() => {
+      if (entityUser.role != "supadmin" && entityUser.role != "developer") {
+         validationForm('group', userLogin.idGroup, userLogin.group);
+      }
+   }, []);
+
    async function handleCreate() {
       try {
+         setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const fd = new FormData()
 
@@ -120,13 +143,16 @@ export default function CreateProject() {
          const response = await apiCreateProject(fd)
          if (response.success) {
             dispatch(setUpdateProject({ ...update, data: !update.data }))
-            ToastAndroid.show('Berhasil menambahkan data', ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
             handleBack()
          } else {
-            ToastAndroid.show(response.message, ToastAndroid.SHORT)
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -146,11 +172,13 @@ export default function CreateProject() {
    const pickDocumentAsync = async () => {
       let result = await DocumentPicker.getDocumentAsync({
          type: ["*/*"],
-         multiple: false
+         multiple: true
       });
       if (!result.canceled) {
-         if (result.assets[0].uri) {
-            setFileForm([...fileForm, result.assets[0]])
+         for (let i = 0; i < result.assets?.length; i++) {
+            if (result.assets[i].uri) {
+               setFileForm((prev) => [...prev, result.assets[i]])
+            }
          }
       }
    };
@@ -176,7 +204,7 @@ export default function CreateProject() {
                headerTitleAlign: "center",
                headerRight: () => (
                   <ButtonSaveHeader
-                     disable={disableBtn}
+                     disable={disableBtn || loading}
                      category="create"
                      onPress={() => {
                         handleCreate()
@@ -185,8 +213,11 @@ export default function CreateProject() {
                ),
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
+         <ScrollView
+            showsVerticalScrollIndicator={false}
+            style={[Styles.h100]}
+         >
+            <View style={[Styles.p15]}>
                {
                   (entityUser.role == "supadmin" || entityUser.role == "developer")
                   &&
@@ -232,19 +263,12 @@ export default function CreateProject() {
                   onPress={() => {
                      if (entityUser.role == "supadmin" || entityUser.role == "developer") {
                         if (chooseGroup.val != "") {
-                           setSelect(true);
-                           setValSelect("member");
+                           router.push(`/project/create/member`);
                         } else {
-                           ToastAndroid.show(
-                              "Pilih Lembaga Desa terlebih dahulu",
-                              ToastAndroid.SHORT
-                           );
+                           Toast.show({ type: 'small', text1: "Pilih Lembaga Desa terlebih dahulu", })
                         }
                      } else {
-                        validationForm('group', userLogin.idGroup, userLogin.group);
-                        setValChoose(userLogin.idGroup)
-                        setSelect(true);
-                        setValSelect("member");
+                        router.push(`/project/create/member`);
                      }
                   }}
                   error={error.member}
@@ -288,7 +312,7 @@ export default function CreateProject() {
                                     borderType="bottom"
                                     icon={
                                        <ImageUser
-                                          src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                          src={`${ConstEnv.url_storage}/files/${item.img}`}
                                           size="sm"
                                        />
                                     }

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

@@ -0,0 +1,150 @@
+import ButtonBackHeader from "@/components/buttonBackHeader";
+import ButtonSaveHeader from "@/components/buttonSaveHeader";
+import ImageUser from "@/components/imageNew";
+import ImageWithLabel from "@/components/imageWithLabel";
+import InputSearch from "@/components/inputSearch";
+import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
+import Styles from "@/constants/Styles";
+import { apiGetUser } from "@/lib/api";
+import { setMemberChoose } from "@/lib/memberChoose";
+import { useAuthSession } from "@/providers/AuthProvider";
+import { AntDesign } from "@expo/vector-icons";
+import { router, Stack } from "expo-router";
+import { useEffect, useState } from "react";
+import { Pressable, SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
+import { useDispatch, useSelector } from "react-redux";
+
+type Props = {
+   idUser: string,
+   name: string,
+   img: string
+}
+
+export default function AddMemberCreateProject() {
+   const dispatch = useDispatch()
+   const { token, decryptToken } = useAuthSession()
+   const [data, setData] = useState<Props[]>([])
+   const [selectMember, setSelectMember] = useState<any[]>([])
+   const [search, setSearch] = useState('')
+   const entitiesMember = useSelector((state: any) => state.memberChoose)
+   const entitiesGroup = useSelector((state: any) => state.groupChoose)
+   const entityUser = useSelector((state: any) => state.user)
+   const userLogin = useSelector((state: any) => state.entities)
+
+   async function handleLoadMember() {
+      const hasil = await decryptToken(String(token?.current))
+      let groupFix = userLogin.idGroup
+      if (entityUser.role == 'supadmin' || entityUser.role == 'developer') {
+         groupFix = entitiesGroup
+      }
+
+      const responMemberDivision = await apiGetUser({ user: hasil, active: "true", search: search, group: groupFix })
+      setData(responMemberDivision.data.filter((i: any) => i.idUserRole != 'supadmin'))
+      if (entitiesMember.length > 0) {
+         setSelectMember(entitiesMember)
+      }
+   }
+
+   useEffect(() => {
+      handleLoadMember()
+   }, [search]);
+
+   function onChoose(val: string, label: string, img?: string) {
+      if (selectMember.some((i: any) => i.idUser == val)) {
+         setSelectMember(selectMember.filter((i: any) => i.idUser != val))
+      } else {
+         setSelectMember([...selectMember, { idUser: val, name: label, img }])
+      }
+   }
+
+   async function handleAddMember() {
+      try {
+         dispatch(setMemberChoose(selectMember))
+         router.back()
+      } catch (error) {
+         console.error(error)
+         Toast.show({ type: 'small', text1: 'Gagal menambahkan anggota', })
+      }
+   }
+
+
+   return (
+      <>
+         <Stack.Screen
+            options={{
+               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               headerTitle: 'Pilih Anggota',
+               headerTitleAlign: 'center',
+               headerRight: () => (
+                  <ButtonSaveHeader
+                     category="create"
+                     disable={selectMember.length > 0 ? false : true}
+                     onPress={() => {
+                        handleAddMember()
+                     }}
+                  />
+               )
+            }}
+         />
+         <View style={[Styles.p15, { flex: 1 }]}>
+            <InputSearch onChange={(val) => setSearch(val)} value={search} />
+
+            {
+               selectMember.length > 0
+                  ?
+                  <View>
+                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]} showsHorizontalScrollIndicator={false}>
+                        {
+                           selectMember.map((item: any, index: any) => (
+                              <ImageWithLabel
+                                 key={index}
+                                 label={item.name}
+                                 src={`${ConstEnv.url_storage}/files/${item.img}`}
+                                 onClick={() => onChoose(item.idUser, item.name, item.img)}
+                              />
+                           ))
+                        }
+                     </ScrollView>
+                  </View>
+
+                  :
+                  <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
+            }
+            <ScrollView
+               showsVerticalScrollIndicator={false}
+            >
+
+               {
+                  data.length > 0 ?
+                     data.map((item: any, index: any) => {
+                        return (
+                           <Pressable
+                              key={index}
+                              style={[Styles.itemSelectModal]}
+                              onPress={() => {
+                                 onChoose(item.id, item.name, item.img)
+                              }}
+                           >
+                              <View style={[Styles.rowItemsCenter]}>
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
+                                 <View style={[Styles.ml10]}>
+                                    <Text style={[Styles.textDefault]}>{item.name}</Text>
+                                 </View>
+                              </View>
+                              {
+                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'} />
+                              }
+                           </Pressable>
+                        )
+                     }
+                     )
+                     :
+                     <Text style={[Styles.textDefault, { textAlign: 'center' }]}>Tidak ada data</Text>
+               }
+            </ScrollView>
+         </View>
+      </>
+   )
+}

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

@@ -1,15 +1,24 @@
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
+import ModalAddDetailTugasProject from "@/components/project/modalAddDetailTugasProject";
+import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
+import { formatDateOnly } from "@/lib/fun_formatDateOnly";
+import { getDatesInRange } from "@/lib/fun_getDatesInRange";
 import { setTaskCreate } from "@/lib/taskCreate";
-import dayjs from "dayjs";
+import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack } from "expo-router";
+import 'intl';
+import 'intl/locale-data/jsonp/id';
+import moment from "moment";
 import { useEffect, useState } from "react";
 import {
+   KeyboardAvoidingView,
+   Platform,
+   Pressable,
    SafeAreaView,
    ScrollView,
-   Text,
    View
 } from "react-native";
 import DateTimePicker, {
@@ -18,6 +27,7 @@ import DateTimePicker, {
 import { useDispatch, useSelector } from "react-redux";
 
 export default function CreateProjectAddTask() {
+   const headerHeight = useHeaderHeight();
    const dispatch = useDispatch()
    const [disable, setDisable] = useState(true);
    const [range, setRange] = useState<{
@@ -31,11 +41,12 @@ export default function CreateProjectAddTask() {
    })
    const [title, setTitle] = useState('');
    const taskCreate = useSelector((state: any) => state.taskCreate)
+   const [dsbButton, setDsbButton] = useState(true)
+   const [dataDetail, setDataDetail] = useState<any>([])
+   const [modalDetail, setModalDetail] = useState(false)
 
-   const from = range.startDate
-      ? dayjs(range.startDate).format("DD-MM-YYYY")
-      : "";
-   const to = range.endDate ? dayjs(range.endDate).format("DD-MM-YYYY") : "";
+   const from = formatDateOnly(range.startDate, "DD-MM-YYYY");
+   const to = formatDateOnly(range.endDate, "DD-MM-YYYY");
 
    function checkAll() {
       if (from == "" || to == "" || title == "" || title == "null" || error.startDate || error.endDate || error.title) {
@@ -56,19 +67,51 @@ export default function CreateProjectAddTask() {
       }
    }
 
+   function checkButton() {
+      if (range.startDate == null || range.endDate == null || range.startDate == undefined || range.endDate == undefined) {
+         setDsbButton(true)
+         setDataDetail([])
+      } else {
+         setDsbButton(false)
+         const awal = formatDateOnly(range.startDate, "YYYY-MM-DD")
+         const akhir = formatDateOnly(range.endDate, "YYYY-MM-DD")
+         const datanya = getDatesInRange(awal, akhir)
+         setDataDetail(datanya.map((item: any) => ({
+            date: item,
+            timeStart: null,
+            timeEnd: null,
+         })))
+      }
+   }
+
    useEffect(() => {
       checkAll()
    }, [from, to, title, error])
 
+   useEffect(() => {
+      checkButton()
+   }, [range])
+
    async function handleCreate() {
       try {
-         dispatch(setTaskCreate([...taskCreate, {
+         const dataDetailFix = dataDetail.map((item: any) => ({
+            date: moment(item.date, "DD-MM-YYYY").format("YYYY-MM-DD"),
+            timeStart: item.timeStart,
+            timeEnd: item.timeEnd,
+         }))
+
+         const hasilOrder = [...taskCreate, {
             title: title,
             dateStart: from,
             dateEnd: to,
-            dateStartFix: dayjs(range.startDate).format("YYYY-MM-DD"),
-            dateEndFix: dayjs(range.endDate).format("YYYY-MM-DD"),
-         }]))
+            dateStartFix: formatDateOnly(range.startDate, "YYYY-MM-DD"),
+            dateEndFix: formatDateOnly(range.endDate, "YYYY-MM-DD"),
+            dataDetail: dataDetailFix
+         }].sort((a, b) => {
+            return new Date(a.dateStartFix).getTime() - new Date(b.dateStartFix).getTime();
+         });
+
+         dispatch(setTaskCreate(hasilOrder))
          router.back();
       } catch (error) {
          console.error(error);
@@ -97,59 +140,86 @@ export default function CreateProjectAddTask() {
                ),
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
-               <View style={[Styles.wrapPaper, Styles.p10]}>
-                  <DateTimePicker
-                     mode="range"
-                     startDate={range.startDate}
-                     endDate={range.endDate}
-                     onChange={(param) => setRange(param)}
-                     styles={{
-                        selected: Styles.selectedDate,
-                        selected_label: Styles.cWhite,
-                        range_fill: Styles.selectRangeDate,
+         <KeyboardAvoidingView
+            behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+            keyboardVerticalOffset={headerHeight}
+         >
+            <ScrollView>
+               <View style={[Styles.p15, Styles.mb100]}>
+                  <View style={[Styles.wrapPaper, Styles.p10]}>
+                     <DateTimePicker
+                        mode="range"
+                        startDate={range.startDate}
+                        endDate={range.endDate}
+                        onChange={(param) => setRange(param)}
+                        styles={{
+                           selected: Styles.selectedDate,
+                           selected_label: Styles.cWhite,
+                           range_fill: Styles.selectRangeDate,
+                           month_label: Styles.cBlack,
+                           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,
+                        }}
+                     />
+                  </View>
+                  <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]}>
+                              <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]}>
+                              <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>
+                     }
+                     <Pressable
+                        style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
+                        disabled={dsbButton}
+                        onPress={() => { setModalDetail(true) }}
+                     >
+                        <Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
+                     </Pressable>
+                  </View>
+                  <InputForm
+                     label="Judul Tugas"
+                     type="default"
+                     placeholder="Judul Tugas"
+                     required
+                     bg="white"
+                     value={title}
+                     error={error.title}
+                     errorText="Judul tidak boleh kosong"
+                     onChange={(e) => {
+                        onValidation("title", e)
                      }}
                   />
                </View>
-               <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]}>
-                           <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]}>
-                           <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>
-                  }
-               </View>
-               <InputForm
-                  label="Judul Tugas"
-                  type="default"
-                  placeholder="Judul Tugas"
-                  required
-                  bg="white"
-                  value={title}
-                  error={error.title}
-                  errorText="Judul tidak boleh kosong"
-                  onChange={(e) => {
-                     onValidation("title", e)
-                  }}
-               />
-            </View>
-         </ScrollView>
+            </ScrollView>
+         </KeyboardAvoidingView>
+         <ModalAddDetailTugasProject
+            isVisible={modalDetail}
+            setVisible={setModalDetail}
+            dataTanggal={dataDetail}
+            onSubmit={(data) => {
+               setDataDetail(data)
+            }}
+         />
       </SafeAreaView>
    );
 }

app/(application)/project/index.tsx

@@ -6,6 +6,7 @@ import PaperGridContent from "@/components/paperGridContent";
 import ProgressBar from "@/components/progressBar";
 import Skeleton from "@/components/skeleton";
 import SkeletonTwoItem from "@/components/skeletonTwoItem";
+import Text from "@/components/Text";
 import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
 import { apiGetProject } from "@/lib/api";
@@ -17,7 +18,7 @@ import {
 } from "@expo/vector-icons";
 import { router, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { Pressable, RefreshControl, ScrollView, Text, View, VirtualizedList } from "react-native";
+import { Pressable, RefreshControl, ScrollView, View, VirtualizedList } from "react-native";
 import { useSelector } from "react-redux";
 
 type Props = {
@@ -119,7 +120,7 @@ export default function ListProject() {
    return (
       <View style={[Styles.p15, { flex: 1 }]}>
          <View>
-            <ScrollView horizontal style={[Styles.mb10]}>
+            <ScrollView horizontal style={[Styles.mb10]} showsHorizontalScrollIndicator={false}>
                <ButtonTab
                   active={statusFix}
                   value="0"
@@ -177,7 +178,7 @@ export default function ListProject() {
                   n={4}
                />
             </ScrollView>
-            <View style={[Styles.rowSpaceBetween]}>
+            <View style={[Styles.rowSpaceBetween, { alignItems: 'center' }]}>
                <InputSearch width={68} onChange={setSearch} />
                <Pressable
                   onPress={() => {
@@ -192,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 }]}>
@@ -219,7 +223,7 @@ export default function ListProject() {
                   data.length > 0
                      ?
                      isList ? (
-                        <View>
+                        <View style={[Styles.h100]}>
                            <VirtualizedList
                               data={data}
                               getItemCount={() => data.length}
@@ -279,7 +283,7 @@ export default function ListProject() {
                            } */}
                         </View>
                      ) : (
-                        <View>
+                        <View style={[Styles.h100]}>
                            <VirtualizedList
                               data={data}
                               getItemCount={() => data.length}

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

@@ -1,18 +1,27 @@
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
+import ModalAddDetailTugasProject from "@/components/project/modalAddDetailTugasProject";
+import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
 import { apiEditProjectTask, apiGetProjectTask } from "@/lib/api";
+import { formatDateOnly } from "@/lib/fun_formatDateOnly";
+import { getDatesInRange } from "@/lib/fun_getDatesInRange";
 import { setUpdateProject } from "@/lib/projectUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import dayjs from "dayjs";
+import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack, useLocalSearchParams } from "expo-router";
+import 'intl';
+import 'intl/locale-data/jsonp/id';
+import moment from "moment";
 import { useEffect, useState } from "react";
-import { SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native";
+import { KeyboardAvoidingView, Platform, Pressable, 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";
 
 export default function UpdateProjectTask() {
+   const headerHeight = useHeaderHeight();
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.projectUpdate)
    const { token, decryptToken } = useAuthSession();
@@ -22,6 +31,10 @@ export default function UpdateProjectTask() {
    const [year, setYear] = useState<any>()
    const [loading, setLoading] = useState(true)
    const [disableBtn, setDisableBtn] = useState(false)
+   const [loadingSubmit, setLoadingSubmit] = useState(false)
+   const [dataDetail, setDataDetail] = useState<any>([])
+   const [modalDetail, setModalDetail] = useState(false)
+   const [dsbButton, setDsbButton] = useState(true)
 
    const [title, setTitle] = useState('')
    const [error, setError] = useState({
@@ -30,10 +43,8 @@ export default function UpdateProjectTask() {
       title: false,
    })
 
-   const from = range.startDate
-      ? dayjs(range.startDate).format("DD-MM-YYYY")
-      : '';
-   const to = range.endDate ? dayjs(range.endDate).format("DD-MM-YYYY") : '';
+   const from = formatDateOnly(range.startDate);
+   const to = formatDateOnly(range.endDate);
 
    async function handleLoad() {
       try {
@@ -50,6 +61,23 @@ export default function UpdateProjectTask() {
          })
          setMonth(new Date(response.data.dateStart).getMonth())
          setYear(new Date(response.data.dateStart).getFullYear())
+
+         const response2 = await apiGetProjectTask({
+            user: hasil,
+            id: detail,
+            cat: "detailTask"
+         });
+         if (response2.data.length == 0) {
+            const datanya = getDatesInRange(response.data.dateStart, response.data.dateEnd)
+            setDataDetail(datanya.map((item: any) => ({
+               date: item,
+               timeStart: null,
+               timeEnd: null,
+            })))
+         } else {
+            setDataDetail(response2.data)
+         }
+
       } catch (error) {
          console.error(error);
       } finally {
@@ -63,15 +91,35 @@ export default function UpdateProjectTask() {
 
    async function handleEdit() {
       try {
+         setLoadingSubmit(true)
+         const dataDetailFix = dataDetail.map((item: any) => ({
+            date: moment(item.date, "DD-MM-YYYY").format("YYYY-MM-DD"),
+            timeStart: item.timeStart,
+            timeEnd: item.timeEnd,
+         }))
          const hasil = await decryptToken(String(token?.current));
-         const response = await apiEditProjectTask({ data: { title, dateStart: dayjs(range.startDate).format("YYYY-MM-DD"), dateEnd: dayjs(range.endDate).format("YYYY-MM-DD"), user: hasil }, id: detail });
+         const response = await apiEditProjectTask({
+            data: {
+               title,
+               dateStart: formatDateOnly(range.startDate, "YYYY-MM-DD"),
+               dateEnd: formatDateOnly(range.endDate, "YYYY-MM-DD"),
+               user: hasil,
+               dataDetail: dataDetailFix
+            },
+            id: detail
+         });
          if (response.success) {
             dispatch(setUpdateProject({ ...update, task: !update.task, progress: !update.progress }))
-            ToastAndroid.show("Berhasil mengubah data", ToastAndroid.SHORT);
+            Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
             router.back();
+         } else {
+            Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
          console.error(error);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoadingSubmit(false)
       }
    }
 
@@ -94,10 +142,32 @@ export default function UpdateProjectTask() {
       }
    }
 
+
+   function checkButton() {
+      if (range.startDate == null || range.endDate == null || range.startDate == undefined || range.endDate == undefined) {
+         setDsbButton(true)
+         setDataDetail([])
+      } else {
+         setDsbButton(false)
+         const awal = formatDateOnly(range.startDate, "YYYY-MM-DD")
+         const akhir = formatDateOnly(range.endDate, "YYYY-MM-DD")
+         const datanya = getDatesInRange(awal, akhir)
+         setDataDetail(datanya.map((item: any) => ({
+            date: item,
+            timeStart: null,
+            timeEnd: null,
+         })))
+      }
+   }
+
    useEffect(() => {
       checkAll()
    }, [from, to, title, error])
 
+   useEffect(() => {
+      checkButton()
+   }, [range])
+
    return (
       <SafeAreaView>
          <Stack.Screen
@@ -106,69 +176,96 @@ export default function UpdateProjectTask() {
                headerTitle: 'Edit Tanggal dan Tugas',
                headerTitleAlign: 'center',
                headerRight: () => <ButtonSaveHeader
-                  disable={disableBtn}
+                  disable={disableBtn || loadingSubmit}
                   category="update"
-                  onPress={() => {handleEdit()}}
+                  onPress={() => { handleEdit() }}
                />
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
-               <View style={[Styles.wrapPaper, Styles.p10]}>
-                  {
-                     !loading
-                     &&
-                     <DateTimePicker
-                        mode="range"
-                        startDate={range.startDate}
-                        endDate={range.endDate}
-                        onChange={(param) => setRange(param)}
-                        // styles={defaultStyles}
-                        month={month}
-                        year={year}
-                        styles={{
-                           selected: Styles.selectedDate,
-                           selected_label: Styles.cWhite,
-                           range_fill: Styles.selectRangeDate,
-                        }}
-                     />
-                  }
+         <KeyboardAvoidingView
+            behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+            keyboardVerticalOffset={headerHeight}
+         >
+            <ScrollView>
+               <View style={[Styles.p15, Styles.mb100]}>
+                  <View style={[Styles.wrapPaper, Styles.p10]}>
+                     {
+                        !loading
+                        &&
+                        <DateTimePicker
+                           mode="range"
+                           startDate={range.startDate}
+                           endDate={range.endDate}
+                           onChange={(param) => setRange(param)}
+                           month={month}
+                           year={year}
+                           styles={{
+                              selected: Styles.selectedDate,
+                              selected_label: Styles.cWhite,
+                              range_fill: Styles.selectRangeDate,
+                              month_label: Styles.cBlack,
+                              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,
+                           }}
+                        />
+                     }
 
-               </View>
-               <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]}>
-                           <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]}>
-                           <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>
-                  }
+                  <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]}>
+                              <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]}>
+                              <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>
+                     }
+                     <Pressable
+                        style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
+                        disabled={dsbButton}
+                        onPress={() => { setModalDetail(true) }}
+                     >
+                        <Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
+                     </Pressable>
+                  </View>
+                  <InputForm
+                     label="Judul Tugas"
+                     type="default"
+                     placeholder="Judul Tugas"
+                     required
+                     bg="white"
+                     value={title}
+                     error={error.title}
+                     errorText="Judul tidak boleh kosong"
+                     onChange={(e) => {
+                        onValidation("title", e)
+                     }}
+                  />
                </View>
-               <InputForm
-                  label="Judul Tugas"
-                  type="default"
-                  placeholder="Judul Tugas"
-                  required
-                  bg="white"
-                  value={title}
-                  error={error.title}
-                  errorText="Judul tidak boleh kosong"
-                  onChange={(e) => {
-                     onValidation("title", e)
-                  }}
-               />
-            </View>
-         </ScrollView>
+            </ScrollView>
+         </KeyboardAvoidingView>
+
+         <ModalAddDetailTugasProject
+            isVisible={modalDetail}
+            setVisible={setModalDetail}
+            dataTanggal={dataDetail}
+            onSubmit={(data) => {
+               setDataDetail(data)
+            }}
+         />
       </SafeAreaView>
    )
 }

app/(application)/search.tsx

@@ -1,15 +1,18 @@
 import BorderBottomItem from "@/components/borderBottomItem";
 import ButtonBackHeader from "@/components/buttonBackHeader";
+import ImageUser from "@/components/imageNew";
 import InputSearch from "@/components/inputSearch";
+import Text from '@/components/Text';
 import { ColorsStatus } from "@/constants/ColorsStatus";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiGetSearch } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign, MaterialIcons } from "@expo/vector-icons";
 import { router, Stack } from "expo-router";
-import { useState } from "react";
-import { FlatList, Image, SafeAreaView, ToastAndroid, View } from "react-native";
-import Text from '@/components/Text';
+import React, { useState } from "react";
+import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 
 type PropsUser = {
    id: string
@@ -38,10 +41,13 @@ export default function Search() {
    const [dataUser, setDataUser] = useState<PropsUser[]>([])
    const [dataDivisi, setDataDivisi] = useState<PropDivisi[]>([])
    const [dataProject, setDataProject] = useState<PropProject[]>([])
+   const [refreshing, setRefreshing] = useState(false)
+   const [search, setSearch] = useState('')
 
    async function handleSearch(cari: string) {
       try {
-         if (cari.length > 3) {
+         setSearch(cari)
+         if (cari.length >= 3) {
             const user = await decryptToken(String(token?.current))
             const hasil = await apiGetSearch({ text: cari, user: user })
             if (hasil.success) {
@@ -49,7 +55,7 @@ export default function Search() {
                setDataDivisi(hasil.data.division)
                setDataProject(hasil.data.project)
             } else {
-               return ToastAndroid.show(hasil.message, ToastAndroid.SHORT)
+               return Toast.show({ type: 'small', text1: hasil.message, })
             }
          } else {
             setDataUser([])
@@ -58,11 +64,19 @@ export default function Search() {
          }
       } catch (error) {
          console.error(error)
-         return ToastAndroid.show('Gagal melakukan pencarian', ToastAndroid.SHORT)
+         return Toast.show({ type: 'small', text1: 'Gagal melakukan pencarian', })
       }
    }
 
 
+   const handleRefresh = async () => {
+      setRefreshing(true)
+      handleSearch(search)
+      await new Promise(resolve => setTimeout(resolve, 2000));
+      setRefreshing(false)
+   };
+
+
    return (
       <>
          <SafeAreaView>
@@ -73,47 +87,49 @@ export default function Search() {
                   headerTitleAlign: 'center'
                }}
             />
-            {/* <ScrollView> */}
             <View style={[Styles.p15]}>
                <InputSearch onChange={handleSearch} />
                {
                   dataProject.length + dataDivisi.length + dataUser.length > 0
                      ?
-                     <View style={[Styles.wrapPaper, Styles.mb100]}>
+                     <ScrollView
+                        style={[Styles.h100]}
+                        refreshControl={
+                           <RefreshControl
+                              refreshing={refreshing}
+                              onRefresh={handleRefresh}
+                           />
+                        }
+                     >
                         {
                            dataUser.length > 0 &&
-                           <View style={[Styles.mb05]}>
+                           <View style={[Styles.mv05, Styles.p10]}>
                               <Text>ANGGOTA</Text>
-                              <FlatList
-                                 data={dataUser}
-                                 keyExtractor={(item) => String(item.id)}
-                                 renderItem={({ item }) => (
+                              {
+                                 dataUser.map((item, index) => (
                                     <BorderBottomItem
+                                       key={index}
                                        borderType="bottom"
-                                       icon={<Image
-                                          source={{ uri: `https://wibu-storage.wibudev.com/api/files/${item.img}` }}
-                                          style={[Styles.userProfileSmall]}
-                                       />}
+                                       icon={<ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} />}
                                        title={item.name}
                                        subtitle={`${item.group}-${item.position}`}
                                        onPress={() => {
                                           router.push(`/member/${item.id}`)
                                        }}
                                     />
-                                 )}
-                              />
+                                 ))
+                              }
                            </View>
                         }
 
                         {
                            dataDivisi.length > 0 &&
-                           <View style={[Styles.mb05]}>
+                           <View style={[Styles.mv05, Styles.p10]}>
                               <Text>DIVISI</Text>
-                              <FlatList
-                                 data={dataDivisi}
-                                 keyExtractor={(item) => String(item.id)}
-                                 renderItem={({ item }) => (
+                              {
+                                 dataDivisi.map((item, index) => (
                                     <BorderBottomItem
+                                       key={index}
                                        borderType="bottom"
                                        icon={
                                           <View style={[Styles.iconContent, ColorsStatus.primary]}>
@@ -126,21 +142,20 @@ export default function Search() {
                                           router.push(`/division/${item.id}`)
                                        }}
                                     />
-                                 )}
-                              />
+                                 ))
+                              }
                            </View>
                         }
 
 
                         {
                            dataProject.length > 0 &&
-                           <View style={[Styles.mb10]}>
+                           <View style={[Styles.mv05, Styles.p10]}>
                               <Text>KEGIATAN</Text>
-                              <FlatList
-                                 data={dataProject}
-                                 keyExtractor={(item) => String(item.id)}
-                                 renderItem={({ item }) => (
+                              {
+                                 dataProject.map((item, index) => (
                                     <BorderBottomItem
+                                       key={index}
                                        borderType="bottom"
                                        icon={
                                           <View style={[Styles.iconContent, ColorsStatus.primary]}>
@@ -153,21 +168,18 @@ export default function Search() {
                                           router.push(`/project/${item.id}`)
                                        }}
                                     />
-                                 )}
-                              />
+                                 ))
+                              }
                            </View>
                         }
-
-
-                     </View>
+                     </ScrollView>
                      :
-                     <View style={Styles.contentItemCenter}>
+                     <View style={[Styles.contentItemCenter, Styles.mt10]}>
                         <Text style={[Styles.textInformation, Styles.cGray]}>Tidak ada data</Text>
                      </View>
                }
 
             </View>
-            {/* </ScrollView> */}
          </SafeAreaView>
       </>
    )