update

Deskripsi:
- list diskusi pda dashboard dan detail divisi home
- ukuran banner dan stretch
- detail anggota > nama
- detail diskusi umum > judul kepotong
- detail pengumuman > deskripsi tidak keliatan warna putih

No Issues

app.config.js

@@ -4,7 +4,7 @@ export default {
    expo: {
       name: "Desa+",
       slug: "mobile-darmasaba",
-      version: "2.0.2", // Versi aplikasi (App Store)
+      version: "2.0.4", // Versi aplikasi (App Store)
       jsEngine: "jsc",
       orientation: "portrait",
       icon: "./assets/images/logo-icon-small.png",
@@ -14,7 +14,7 @@ export default {
       ios: {
          supportsTablet: true,
          bundleIdentifier: "mobiledarmasaba.app",
-         buildNumber: "4",
+         buildNumber: "6",
          infoPlist: {
             ITSAppUsesNonExemptEncryption: false,
             CFBundleDisplayName: "Desa+"
@@ -23,7 +23,7 @@ export default {
       },
       android: {
          package: "mobiledarmasaba.app",
-         versionCode: 11,
+         versionCode: 14,
          adaptiveIcon: {
             foregroundImage: "./assets/images/logo-icon-small.png",
             backgroundColor: "#ffffff"

app/(application)/_layout.tsx

@@ -19,7 +19,6 @@ 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 { Platform } from "react-native";
 import { Easing, Notifier } from 'react-native-notifier';
 import { Provider } from "react-redux";
 

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

@@ -10,6 +10,7 @@ import { router, Stack, useLocalSearchParams } from "expo-router";
 import React, { useEffect, useState } from "react";
 import { Dimensions, RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
 import RenderHTML from 'react-native-render-html';
+import Toast from "react-native-toast-message";
 import { useSelector } from "react-redux";
 
 type Props = {
@@ -35,10 +36,15 @@ export default function DetailAnnouncement() {
          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)
       }
@@ -111,6 +117,7 @@ export default function DetailAnnouncement() {
                                     <RenderHTML
                                        contentWidth={contentWidth}
                                        source={{ html: data?.desc }}
+                                       baseStyle={{ color: 'black' }}
                                     />
                                     :
                                     <Text>{data?.desc}</Text>

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

@@ -154,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

@@ -137,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

@@ -43,7 +43,7 @@ export default function BannerList() {
       try {
          const hasil = await decryptToken(String(token?.current));
          const deletedEntity = await apiDeleteBanner({ user: hasil }, dataId);
-         if (deletedEntity.success) {
+         if (deletedEntity.success ) {
             Toast.show({ type: 'small', text1: 'Berhasil menghapus data', })
             apiGetBanner({ user: hasil }).then((data) =>
                dispatch(setEntities(data.data))

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

@@ -1,9 +1,12 @@
+import AlertKonfirmasi from "@/components/alertKonfirmasi";
 import BorderBottomItem from "@/components/borderBottomItem";
 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';
@@ -11,10 +14,10 @@ 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 { 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";
@@ -39,11 +42,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[]>([])
@@ -57,6 +63,13 @@ export default function DetailDiscussionGeneral() {
    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(() => {
@@ -128,7 +141,7 @@ export default function DetailDiscussionGeneral() {
                setKomentar('')
                updateTrigger()
             } else {
-               Toast.show({ type: 'small', text1: 'Gagal menambahkan komentar' })
+               Toast.show({ type: 'small', text1: response.message })
             }
          }
       } catch (error) {
@@ -138,6 +151,52 @@ export default function DetailDiscussionGeneral() {
       }
    }
 
+   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
@@ -163,7 +222,8 @@ export default function DetailDiscussionGeneral() {
                                  <MaterialIcons name="chat" size={25} color={'#384288'} />
                               </View>
                            }
-                           title={data?.title + " " + data?.createdAt}
+                           title={data?.title}
+                           titleShowAll={true}
                            subtitle={
                               !data?.isActive ?
                                  <LabelStatus category='warning' text='ARSIP' size="small" />
@@ -198,12 +258,14 @@ export default function DetailDiscussionGeneral() {
                                  <BorderBottomItem
                                     key={i}
                                     borderType="bottom"
+                                    colorPress
                                     icon={
                                        <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) => {
@@ -214,6 +276,9 @@ export default function DetailDiscussionGeneral() {
                                           }
                                        })
                                     }}
+                                    onLongPress={() => {
+                                       item.idUser == entities.id && data?.status != 2 && data?.isActive && handleMenuKomentar(item.id, item.comment)
+                                    }}
                                  />
                               )
                            })
@@ -229,45 +294,106 @@ export default function DetailDiscussionGeneral() {
                   Styles.contentItemCenter,
                   Styles.w100,
                   { backgroundColor: "#f4f4f4" },
+                  viewEdit && Styles.borderTop
                ]}>
                   {
-                     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
-                           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} />
+                     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 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"
+                           </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>
                               }
-                           </Text>
-                        </View>
+                           />
+                        </>
+                        :
+                        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>
+         </DrawerBottom>
       </>
    )
 }

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

@@ -1,9 +1,12 @@
+import AlertKonfirmasi from "@/components/alertKonfirmasi";
 import BorderBottomItem from "@/components/borderBottomItem";
 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";
@@ -11,18 +14,21 @@ 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 { 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 { KeyboardAvoidingView, Platform, Pressable, RefreshControl, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useSelector } from "react-redux";
 
 type Props = {
@@ -44,6 +50,9 @@ type PropsComment = {
    createdAt: string;
    username: string;
    img: string;
+   idUser: string;
+   isEdited: boolean;
+   updatedAt: string;
 };
 
 export default function DiscussionDetail() {
@@ -65,6 +74,14 @@ export default function DiscussionDetail() {
    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(() => {
@@ -172,6 +189,59 @@ 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)
@@ -268,6 +338,7 @@ export default function DiscussionDetail() {
                               <BorderBottomItem
                                  key={index}
                                  borderType="bottom"
+                                 colorPress
                                  icon={
                                     <ImageUser
                                        src={`${ConstEnv.url_storage}/files/${item.img}`}
@@ -277,6 +348,7 @@ export default function DiscussionDetail() {
                                  title={item.username}
                                  rightTopInfo={item.createdAt}
                                  desc={item.comment}
+                                 rightBottomInfo={item.isEdited ? "Edited" : ""}
                                  descEllipsize={detailMore.includes(item.id) ? false : true}
                                  onPress={() => {
                                     setDetailMore((prev: any) => {
@@ -287,6 +359,9 @@ export default function DiscussionDetail() {
                                        }
                                     })
                                  }}
+                                 onLongPress={() => {
+                                    item.idUser == entities.id && data?.status != 2 && data?.isActive && handleMenuKomentar(item.id, item.comment)
+                                 }}
                               />
                            ))
                      }
@@ -303,73 +378,145 @@ export default function DiscussionDetail() {
                      Styles.contentItemCenter,
                      Styles.w100,
                      { backgroundColor: "#f4f4f4" },
+                     viewEdit && Styles.borderTop
                   ]}
                >
                   {
-                     data?.status != 2 && data?.isActive && ((entityUser.role != "user" && entityUser.role != "coadmin") ||
-                        isMemberDivision)
-                        ?
-                        <InputForm
-                           // disable={
-                           //    data?.status == 2 ||
-                           //    data?.isActive == false ||
-                           //    ((entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision)
-                           // }
-                           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,
-                                       ]
-                                    }
-                                 />
+                     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 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"
+                           </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>
                               }
-                           </Text>
-                        </View>
+                           />
+                        </>
+                        :
+                        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>
+         </DrawerBottom>
       </>
    );
 }

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

@@ -12,6 +12,7 @@ import { apiGetProfile } from "@/lib/api";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
 import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useSelector } from "react-redux";
 
 type Props = {
@@ -42,10 +43,15 @@ export default function MemberDetail() {
       try {
          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)
       }
@@ -84,7 +90,7 @@ export default function MemberDetail() {
                />
             }
          >
-            <View style={[Styles.wrapHeadViewMember,]}>
+            <View style={[Styles.wrapHeadViewMember]}>
                {
                   loading ?
                      <>

components/borderBottomItem.tsx

@@ -1,6 +1,6 @@
 import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
-import React from "react";
+import React, { useState } from "react";
 import { Dimensions, Pressable, View } from "react-native";
 import Text from "./Text";
 
@@ -11,6 +11,7 @@ type Props = {
    desc?: string
    rightTopInfo?: string
    onPress?: () => void
+   onLongPress?: () => void
    borderType: 'all' | 'bottom' | 'none'
    leftBottomInfo?: React.ReactNode | string
    rightBottomInfo?: React.ReactNode | string
@@ -18,21 +19,38 @@ type Props = {
    bgColor?: 'white' | 'transparent'
    width?: number
    descEllipsize?: boolean
-   textColor?: string
+   textColor?: string,
+   colorPress?: boolean
+   titleShowAll?: boolean
 }
 
-export default function BorderBottomItem({ title, subtitle, icon, desc, onPress, rightTopInfo, borderType, leftBottomInfo, rightBottomInfo, titleWeight, bgColor, width, descEllipsize, textColor }: Props) {
+export default function BorderBottomItem({ title, subtitle, icon, desc, onPress, onLongPress, rightTopInfo, borderType, leftBottomInfo, rightBottomInfo, titleWeight, bgColor, width, descEllipsize, textColor, colorPress, titleShowAll }: Props) {
    const lebarDim = Dimensions.get("window").width;
    const lebar = width ? lebarDim * width / 100 : 'auto';
    const textColorFix = textColor ? textColor : 'black';
+   const [isTap, setIsTap] = useState(false);
+
 
    return (
-      <Pressable style={[borderType == 'bottom' ? Styles.wrapItemBorderBottom : borderType == 'all' ? Styles.wrapItemBorderAll : Styles.wrapItemBorderNone, bgColor && bgColor == 'white' && ColorsStatus.white]} onPress={onPress}>
+      <Pressable onLongPress={onLongPress} onPress={onPress}
+         onPressIn={() => setIsTap(true)}
+         onPressOut={() => setIsTap(false)}
+         style={({ pressed }) => [
+            borderType == 'bottom'
+               ? Styles.wrapItemBorderBottom
+               : borderType == 'all'
+                  ? Styles.wrapItemBorderAll
+                  : Styles.wrapItemBorderNone,
+            bgColor && bgColor == 'white' && ColorsStatus.white,
+            // efek warna saat ditekan (sementara)
+            isTap && colorPress && ColorsStatus.pressedGray,
+         ]}
+      >
          <View style={[Styles.rowItemsCenter]}>
             {icon}
             <View style={[Styles.rowSpaceBetween, width ? { width: lebar } : { width: '88%' }]}>
                <View style={[Styles.ml10, rightTopInfo ? { width: '70%' } : { width: '90%' }]}>
-                  <Text style={[titleWeight == 'normal' ? Styles.textDefault : Styles.textDefaultSemiBold, { color: textColorFix }]} numberOfLines={1} ellipsizeMode='tail'>{title}</Text>
+                  <Text style={[titleWeight == 'normal' ? Styles.textDefault : Styles.textDefaultSemiBold, { color: textColorFix }]} numberOfLines={titleShowAll ? 0 : 1} ellipsizeMode='tail'>{title}</Text>
                   {
                      subtitle &&
                         typeof subtitle == "string"
@@ -52,16 +70,16 @@ export default function BorderBottomItem({ title, subtitle, icon, desc, onPress,
          {
             (leftBottomInfo || rightBottomInfo) &&
             (
-               <View style={[Styles.rowSpaceBetween, Styles.mt10]}>
+               <View style={[rightBottomInfo && !leftBottomInfo ? Styles.rowSpaceBetweenReverse : Styles.rowSpaceBetween, Styles.mt05]}>
                   {
                      typeof leftBottomInfo == 'string' ?
-                        <Text style={[Styles.textInformation, Styles.cGray, { textAlign: 'left' }]}>{leftBottomInfo}</Text>
+                        <Text style={[Styles.textInformation, Styles.cGray]}>{leftBottomInfo}</Text>
                         :
                         leftBottomInfo
                   }
                   {
                      typeof rightBottomInfo == 'string' ?
-                        <Text style={[Styles.textInformation, Styles.mt05, Styles.cGray, { textAlign: 'right' }]}>{rightBottomInfo}</Text>
+                        <Text style={[Styles.textInformation, Styles.cGray]}>{rightBottomInfo}</Text>
                         :
                         rightBottomInfo
                   }

components/discussionItem.tsx

@@ -15,16 +15,16 @@ export default function DiscussionItem({ title, user, date, onPress }: Props) {
       <Pressable style={[Styles.wrapItemDiscussion]} onPress={onPress}>
          <View style={[Styles.rowItemsCenter, Styles.mb10]}>
             <Ionicons name="chatbox-ellipses-outline" size={22} color="black" style={Styles.mr10} />
-            <View style={[{flex:1}]}>
+            <View style={[{ flex: 1 }]}>
                <Text style={{ fontWeight: 'bold' }} numberOfLines={1} ellipsizeMode="tail">{title}</Text>
             </View>
          </View>
-         <View style={Styles.rowSpaceBetween}>
-            <View style={Styles.rowItemsCenter}>
+         <View style={[Styles.rowSpaceBetween]}>
+            <View style={[Styles.rowItemsCenter, { flex: 1 }]}>
                <Feather name="user" size={18} color="grey" style={Styles.mr05} />
-               <Text style={[Styles.textInformation]}>{user}</Text>
+               <Text style={[Styles.textInformation]} numberOfLines={1} ellipsizeMode="tail">{user}</Text>
             </View>
-            <View style={Styles.rowItemsCenter}>
+            <View style={[Styles.rowItemsCenter, { flex: 1, justifyContent: 'flex-end' }]}>
                <Feather name="clock" size={18} color="grey" style={Styles.mr05} />
                <Text style={[Styles.textInformation]}>{date}</Text>
             </View>

components/inputForm.tsx

@@ -20,10 +20,11 @@ type Props = {
    disable?: boolean
    multiline?: boolean
    mb?: boolean
+   focus?: boolean
 };
 
 
-export function InputForm({ label, value, placeholder, onChange, info, disable, error, errorText, required, itemLeft, itemRight, type, round, width, bg, multiline, mb = true }: Props) {
+export function InputForm({ label, value, placeholder, onChange, info, disable, error, errorText, required, itemLeft, itemRight, type, round, width, bg, multiline, mb = true, focus }: Props) {
    const lebar = Dimensions.get("window").width;
 
    if (itemLeft != undefined || itemRight != undefined) {

components/project/headerProjectDetail.tsx

@@ -67,7 +67,7 @@ export default function HeaderRightProjectDetail({ id, status }: Props) {
    return (
       <>
          <ButtonMenuHeader onPress={() => { setVisible(true) }} />
-         <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu" height={30}>
+         <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu" height={35}>
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
                   icon={<AntDesign name="pluscircle" color="black" size={25} />}

components/task/headerTaskDetail.tsx

@@ -69,7 +69,7 @@ export default function HeaderRightTaskDetail({ id, division, status, isAdminDiv
    return (
       <>
          <ButtonMenuHeader onPress={() => { setVisible(true) }} />
-         <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu" height={30}>
+         <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu" height={35}>
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
                   icon={<AntDesign name="pluscircle" color="black" size={25} />}

constants/ColorsStatus.ts

@@ -31,5 +31,8 @@ export const ColorsStatus = {
    },
    lightRed: {
       backgroundColor: '#ffcdcd'
+   },
+   pressedGray: {
+      backgroundColor: '#e4e4e4'
    }
 }

constants/Styles.ts

@@ -250,6 +250,10 @@ const Styles = StyleSheet.create({
       justifyContent: 'space-between',
       flexDirection: 'row'
    },
+   rowSpaceBetweenReverse: {
+      justifyContent: 'space-between',
+      flexDirection: 'row-reverse'
+   },
    rowItemsCenter: {
       flexDirection: 'row',
       alignItems: 'center'
@@ -339,7 +343,9 @@ const Styles = StyleSheet.create({
       borderRadius: 15,
       backgroundColor: '#19345E',
       display: 'flex',
-      width: '92%'
+      width: '92%',
+      resizeMode: 'stretch',
+      overflow: 'hidden',
    },
    wrapGridContent: {
       shadowColor: '#171717',
@@ -469,6 +475,7 @@ const Styles = StyleSheet.create({
    wrapHeadViewMember: {
       backgroundColor: '#19345E',
       paddingVertical: 30,
+      paddingHorizontal: 15,
       alignItems: 'center',
       borderBottomLeftRadius: 25,
       borderBottomRightRadius: 25

ios/Desa/Info.plist

@@ -19,7 +19,7 @@
     <key>CFBundlePackageType</key>
     <string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
     <key>CFBundleShortVersionString</key>
-    <string>2.0.2</string>
+    <string>2.0.4</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleURLTypes</key>
@@ -39,7 +39,7 @@
       </dict>
     </array>
     <key>CFBundleVersion</key>
-    <string>4</string>
+    <string>6</string>
     <key>ITSAppUsesNonExemptEncryption</key>
     <false/>
     <key>LSMinimumSystemVersion</key>

lib/api.ts

@@ -182,6 +182,16 @@ export const apiSendDiscussionGeneralCommentar = async ({ id, data }: { id: stri
    return response.data;
 };
 
+export const apiDeleteDiscussionGeneralCommentar = async ({ id, data }: { id: string, data: { user: string } }) => {
+   const response = await api.delete(`/mobile/discussion-general/${id}/comment`, { data })
+   return response.data;
+};
+
+export const apiUpdateDiscussionGeneralCommentar = async ({ id, data }: { id: string, data: { desc: string, user: string } }) => {
+   const response = await api.put(`/mobile/discussion-general/${id}/comment`, data)
+   return response.data;
+};
+
 
 export const apiDeleteMemberDiscussionGeneral = async (data: { user: string, idUser: string }, id: string) => {
    await api.delete(`mobile/discussion-general/${id}/member`, { data }).then(response => {
@@ -445,6 +455,16 @@ export const apiSendDiscussionCommentar = async ({ data, id }: { data: { user: s
    return response.data;
 };
 
+export const apiEditDiscussionCommentar = async ({ data, id }: { data: { user: string, comment: string }, id: string }) => {
+   const response = await api.put(`/mobile/discussion/${id}/comment`, data)
+   return response.data;
+};
+
+export const apiDeleteDiscussionCommentar = async ({ data, id }: { data: { user: string }, id: string }) => {
+   const response = await api.delete(`/mobile/discussion/${id}/comment`, { data })
+   return response.data;
+};
+
 export const apiEditDiscussion = async ({ data, id }: { data: { user: string, desc: string }, id: string }) => {
    const response = await api.post(`/mobile/discussion/${id}`, data)
    return response.data;