Merge pull request 'amalia/02-jun-26' (#53) from amalia/02-jun-26 into join

Reviewed-on: #53

android/app/build.gradle

@@ -92,8 +92,8 @@ android {
         applicationId 'mobiledarmasaba.app'
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 16
+        versionCode 17
-        versionName "2.1.0"
+        versionName "2.2.0"
     }
     signingConfigs {
         debug {

android/app/src/main/AndroidManifest.xml

@@ -1,9 +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.READ_MEDIA_IMAGES" tools:node="remove"/>
+  <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" tools:node="remove"/>
   <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"/>

app.config.js

@@ -4,7 +4,7 @@ export default {
    expo: {
       name: "Desa+",
       slug: "mobile-darmasaba",
-      version: "2.1.0", // Versi aplikasi (App Store)
+      version: "2.2.0", // 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: "9",
+         buildNumber: "10",
          infoPlist: {
             ITSAppUsesNonExemptEncryption: false,
             CFBundleDisplayName: "Desa+"
@@ -23,7 +23,7 @@ export default {
       },
       android: {
          package: "mobiledarmasaba.app",
-         versionCode: 16,
+         versionCode: 19,
          adaptiveIcon: {
             foregroundImage: "./assets/images/logo-icon-small.png",
             backgroundColor: "#ffffff"
@@ -32,9 +32,7 @@ export default {
          permissions: [
             "READ_EXTERNAL_STORAGE",
             "WRITE_EXTERNAL_STORAGE",
-            "READ_MEDIA_IMAGES",   // Android 13+
+            "READ_MEDIA_AUDIO"
-            "READ_MEDIA_VIDEO",    // Android 13+
-            "READ_MEDIA_AUDIO"     // Android 13+
          ]
       },
       web: {

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

@@ -1,6 +1,5 @@
 import HeaderRightAnnouncementDetail from "@/components/announcement/headerAnnouncementDetail";
 import AppHeader from "@/components/AppHeader";
-import BorderBottomItem from "@/components/borderBottomItem";
 import Skeleton from "@/components/skeleton";
 import Text from '@/components/Text';
 import ErrorView from "@/components/ErrorView";
@@ -10,7 +9,7 @@ import Styles from "@/constants/Styles";
 import { apiGetAnnouncementOne } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { useTheme } from "@/providers/ThemeProvider";
-import { Entypo, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons";
+import { 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";
@@ -23,7 +22,6 @@ import RenderHTML from 'react-native-render-html';
 import Toast from "react-native-toast-message";
 import { useSelector } from "react-redux";
 
-// Define TypeScript interfaces for better type safety
 interface AnnouncementData {
    id: string;
    title: string;
@@ -59,26 +57,31 @@ export default function DetailAnnouncement() {
    const [dataFile, setDataFile] = useState<FileData[]>([])
    const update = useSelector((state: any) => state.announcementUpdate)
    const entityUser = useSelector((state: any) => state.user)
-   const contentWidth = Dimensions.get('window').width
+   const contentWidth = Dimensions.get('window').width - 62
    const [loading, setLoading] = useState(true)
-   const arrSkeleton = Array.from({ length: 2 }, (_, index) => index)
    const [refreshing, setRefreshing] = useState(false)
    const [loadingOpen, setLoadingOpen] = useState(false)
    const [preview, setPreview] = useState(false)
    const [chooseFile, setChooseFile] = useState<FileData>()
    const [isError, setIsError] = useState(false)
 
-   /**
+   const themed = {
-    * Opens the image preview modal for the selected image file
+      background:      { backgroundColor: colors.background },
-    * @param item The file data object containing image information
+      card:            { backgroundColor: colors.card, borderColor: colors.icon + '18' },
-    */
+      iconBox:         { backgroundColor: colors.icon + '18' },
+      sectionLabel:    { color: colors.dimmed },
+      titleText:       { color: colors.text },
+      fileChipBorder:  { borderColor: colors.icon + '30' },
+      fileChipPressed: { backgroundColor: colors.icon + '10' },
+      groupSeparator:  { borderTopColor: colors.icon + '18' },
+      divisionIconBg:  { backgroundColor: colors.icon + '15' },
+   }
 
    function handleChooseFile(item: FileData) {
       setChooseFile(item)
       setPreview(true)
    }
 
-
    async function handleLoad(loading: boolean) {
       try {
          setIsError(false)
@@ -97,39 +100,22 @@ export default function DetailAnnouncement() {
          console.error(error);
          setIsError(true)
          const message = error?.response?.data?.message || "Gagal mengambil data"
-
          Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
    }
 
-   useEffect(() => {
+   useEffect(() => { handleLoad(false) }, [update])
-      handleLoad(false)
+   useEffect(() => { handleLoad(true) }, [])
-   }, [update])
 
-   useEffect(() => {
-      handleLoad(true)
-   }, [])
-
-   /**
-    * Checks if a string contains HTML tags
-    * @param text The text to check for HTML tags
-    * @returns True if the text contains HTML tags, false otherwise
-    */
    function hasHtmlTags(text: string) {
-      const htmlRegex = /<[a-z][\s\S]*>/i;
+      return /<[a-z][\s\S]*>/i.test(text);
-      return htmlRegex.test(text);
    }
 
-   /**
-    * Handles pull-to-refresh functionality
-    * Reloads the announcement data without showing loading indicators
-    */
    const handleRefresh = async () => {
       setRefreshing(true)
       handleLoad(false)
-      // Simulate network request delay for better UX
       await new Promise(resolve => setTimeout(resolve, 2000));
       setRefreshing(false)
    };
@@ -141,178 +127,171 @@ export default function DetailAnnouncement() {
          const fileName = item.name + '.' + item.extension;
          const localPath = `${FileSystem.documentDirectory}/${fileName}`;
          const mimeType = mime.lookup(fileName);
-
-         // Download the file
          const downloadResult = await FileSystem.downloadAsync(remoteUrl, localPath);
-
          if (downloadResult.status !== 200) {
             throw new Error(`Download failed with status ${downloadResult.status}`);
          }
-
          const contentURL = await FileSystem.getContentUriAsync(downloadResult.uri);
-
          try {
             if (Platform.OS === 'android') {
-               await startActivityAsync(
+               await startActivityAsync('android.intent.action.VIEW', {
-                  'android.intent.action.VIEW',
+                  data: contentURL,
-                  {
+                  flags: 1,
-                     data: contentURL,
+                  type: mimeType as string,
-                     flags: 1,
+               });
-                     type: mimeType as string,
-                  }
-               );
             } else if (Platform.OS === 'ios') {
                await Sharing.shareAsync(localPath);
             }
-         } catch (openError) {
+         } catch {
-            console.error('Error opening file:', openError);
+            Toast.show({ type: 'error', text1: 'Tidak ada aplikasi yang dapat membuka file ini' });
-            Toast.show({
-               type: 'error',
-               text1: 'Tidak ada aplikasi yang dapat membuka file ini'
-            });
          }
-      } catch (error) {
+      } catch {
-         console.error('Error downloading or opening file:', error);
+         Toast.show({ type: 'error', text1: 'Gagal membuka file', text2: 'Silakan coba lagi nanti' });
-         Toast.show({
-            type: 'error',
-            text1: 'Gagal membuka file',
-            text2: 'Silakan coba lagi nanti'
-         });
       } finally {
          setLoadingOpen(false);
       }
    };
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView style={[Styles.flex1, themed.background]}>
          <Stack.Screen
             options={{
-               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
-               headerTitle: 'Pengumuman',
-               headerTitleAlign: 'center',
-               // headerRight: () => entityUser.role != 'user' && entityUser.role != 'coadmin' ? <HeaderRightAnnouncementDetail id={id} /> : <></>,
                header: () => (
-                  <AppHeader title="Pengumuman"
+                  <AppHeader
+                     title="Pengumuman"
                      showBack={true}
                      onPressLeft={() => router.back()}
-                     right={entityUser.role != 'user' && entityUser.role != 'coadmin' ? <HeaderRightAnnouncementDetail id={id} /> : <></>}
+                     right={entityUser.role != 'user' && entityUser.role != 'coadmin'
+                        ? <HeaderRightAnnouncementDetail id={id} />
+                        : <></>
+                     }
                   />
                )
             }}
          />
          <ScrollView
             showsVerticalScrollIndicator={false}
-            style={[Styles.h100, { backgroundColor: colors.background }]}
+            style={[Styles.flex1, themed.background]}
             refreshControl={
-               <RefreshControl
+               <RefreshControl refreshing={refreshing} onRefresh={handleRefresh} tintColor={colors.icon} />
-                  refreshing={refreshing}
-                  onRefresh={() => handleRefresh()}
-                  tintColor={colors.icon}
-               />
             }
          >
             {isError && !loading ? (
-               <View style={[Styles.mv50]}>
+               <View style={Styles.mv50}>
                   <ErrorView />
                </View>
             ) : (
-               <View style={[Styles.p15, Styles.mb50]}>
+               <View style={Styles.announcementDetailContainer}>
-                  <View style={[Styles.wrapPaper, Styles.borderAll, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
-                     {
-                        loading ?
-                           <View>
-                              <View style={[Styles.rowOnly]}>
-                                 <Skeleton width={30} height={30} borderRadius={10} />
-                                 <View style={[Styles.flex1, Styles.ph05]}>
-                                    <Skeleton width={100} widthType="percent" height={30} borderRadius={10} />
-                                 </View>
-                              </View>
-                              <Skeleton width={100} widthType="percent" height={10} borderRadius={10} />
-                              <Skeleton width={100} widthType="percent" height={10} borderRadius={10} />
-                              <Skeleton width={100} widthType="percent" height={10} borderRadius={10} />
-                           </View>
-                           :
-                           <>
-                              <View style={[Styles.rowOnly, Styles.alignStart]}>
-                                 <MaterialIcons name="campaign" size={25} color={colors.text} style={[Styles.mr05]} />
-                                 <Text style={[Styles.textDefaultSemiBold, Styles.w90, Styles.mt02]}>{data?.title}</Text>
-                              </View>
-                              <View style={[Styles.mt10]}>
-                                 {
-                                    hasHtmlTags(data?.desc) ?
-                                       <RenderHTML
-                                          contentWidth={contentWidth}
-                                          source={{ html: data?.desc }}
-                                          baseStyle={{ color: colors.text }}
-                                       />
-                                       :
-                                       <Text>{data?.desc}</Text>
-                                 }
-                              </View>
-                           </>
-                     }
 
-                  </View>
+                  {/* Title + Description */}
-                  {
+                  <View style={[Styles.wrapPaper, Styles.noShadow, Styles.sectionCard, Styles.announcementDetailCard, themed.card]}>
-                     dataFile.length > 0 && (
+                     {loading ? (
-                        <View style={[Styles.wrapPaper, Styles.borderAll, Styles.mt10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+                        <View style={Styles.announcementDetailSkeletonGap}>
-                           <View style={[Styles.mb05]}>
+                           <View style={[Styles.rowItemsCenter, Styles.announcementDetailSkeletonIconRow]}>
-                              <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                              <Skeleton width={38} height={38} borderRadius={10} />
+                              <Skeleton width={60} widthType="percent" height={16} borderRadius={6} />
                            </View>
-                           {dataFile.map((item, index) => (
+                           <Skeleton width={100} widthType="percent" height={10} borderRadius={6} />
-                              <BorderBottomItem
+                           <Skeleton width={100} widthType="percent" height={10} borderRadius={6} />
-                                 key={`${item.id}-${index}`}
+                           <Skeleton width={80} widthType="percent" height={10} borderRadius={6} />
-                                 borderType={index === dataFile.length - 1 ? 'none' : 'bottom'}
-                                 icon={<MaterialCommunityIcons
-                                    name={isImageFile(item.extension) ? "file-image-outline" : "file-document-outline"}
-                                    size={25}
-                                    color={colors.text}
-                                 />}
-                                 title={item.name + '.' + item.extension}
-                                 titleWeight="normal"
-                                 onPress={() => {
-                                    isImageFile(item.extension) ?
-                                       handleChooseFile(item)
-                                       : openFile(item)
-                                 }}
-                              />
-                           ))}
                         </View>
-                     )
+                     ) : (
-                  }
+                        <>
-                  <View style={[Styles.wrapPaper, Styles.borderAll, Styles.mt10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+                           <View style={[Styles.rowItemsCenter, Styles.announcementDetailTitleRow]}>
-                     {
+                              <View style={[Styles.sectionIconBox, Styles.announcementDetailIconBox, themed.iconBox]}>
-                        loading ?
+                                 <MaterialIcons name="campaign" size={22} color={colors.icon} />
-                           arrSkeleton.map((item, index) => {
+                              </View>
-                              return (
+                              <Text style={[Styles.textDefaultSemiBold, Styles.announcementDetailTitleText, themed.titleText]} numberOfLines={2}>
-                                 <View key={index}>
+                                 {data.title}
-                                    <Skeleton width={30} widthType="percent" height={10} borderRadius={10} />
+                              </Text>
-                                    <Skeleton width={100} widthType="percent" height={10} borderRadius={10} />
+                           </View>
-                                    <Skeleton width={100} widthType="percent" height={10} borderRadius={10} />
+                           {hasHtmlTags(data.desc)
-                                 </View>
+                              ? <RenderHTML
-                              )
+                                 contentWidth={contentWidth}
-                           })
+                                 source={{ html: data.desc }}
-                           :
+                                 baseStyle={{ color: colors.text }}
-                           Object.keys(dataMember).map((v: any, i: any) => {
+                              />
-                              return (
+                              : <Text style={Styles.textDefault}>{data.desc}</Text>
-                                 <View key={i} style={[Styles.mb05]}>
+                           }
-                                    <Text style={[Styles.textDefaultSemiBold]}>{dataMember[v]?.[0].group}</Text>
+                        </>
-                                    {
+                     )}
-                                       dataMember[v].map((item: any, x: any) => {
-                                          return (
-                                             <View key={x} style={[Styles.rowItemsCenter, Styles.w90]}>
-                                                <Entypo name="dot-single" size={24} color={colors.text} />
-                                                <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode='tail'>{item.division}</Text>
-                                             </View>
-                                          )
-                                       })
-                                    }
-
-                                 </View>
-                              )
-                           })
-                     }
                   </View>
+
+                  {/* Files */}
+                  {dataFile.length > 0 && (
+                     <View>
+                        <View style={[Styles.rowItemsCenter, Styles.announcementDetailSectionLabelRow]}>
+                           <MaterialCommunityIcons name="paperclip" size={14} color={colors.dimmed} />
+                           <Text style={[Styles.textInformation, themed.sectionLabel]}>
+                              Lampiran ({dataFile.length})
+                           </Text>
+                        </View>
+                        <View style={[Styles.wrapPaper, Styles.noShadow, Styles.sectionCard, Styles.announcementDetailCard, Styles.announcementDetailFileCardPadding, themed.card]}>
+                           <ScrollView horizontal showsHorizontalScrollIndicator={false}>
+                              <View style={[Styles.rowItemsCenter, Styles.announcementDetailFileChipList]}>
+                                 {dataFile.map((item, index) => (
+                                    <Pressable
+                                       key={`${item.id}-${index}`}
+                                       onPress={() => isImageFile(item.extension) ? handleChooseFile(item) : openFile(item)}
+                                       style={({ pressed }) => [Styles.announcementDetailFileChip, themed.fileChipBorder,
+                                          pressed ? themed.fileChipPressed : themed.background]}
+                                    >
+                                       <MaterialCommunityIcons
+                                          name={isImageFile(item.extension) ? "file-image-outline" : "file-document-outline"}
+                                          size={16}
+                                          color={colors.icon}
+                                       />
+                                       <Text style={[Styles.textInformation, Styles.announcementDetailFileChipText, themed.titleText]} numberOfLines={1}>
+                                          {item.name}.{item.extension}
+                                       </Text>
+                                    </Pressable>
+                                 ))}
+                              </View>
+                           </ScrollView>
+                        </View>
+                     </View>
+                  )}
+
+                  {/* Recipients */}
+                  <View>
+                     <View style={[Styles.rowItemsCenter, Styles.announcementDetailSectionLabelRow]}>
+                        <MaterialIcons name="groups" size={14} color={colors.dimmed} />
+                        <Text style={[Styles.textInformation, themed.sectionLabel]}>
+                           Ditujukan Kepada
+                        </Text>
+                     </View>
+                     <View style={[Styles.wrapPaper, Styles.noShadow, Styles.sectionCard, Styles.announcementDetailCard, themed.card]}>
+                        {loading ? (
+                           <View style={Styles.announcementDetailRecipientGap}>
+                              <Skeleton width={40} widthType="percent" height={10} borderRadius={6} />
+                              <Skeleton width={100} widthType="percent" height={10} borderRadius={6} />
+                              <Skeleton width={60} widthType="percent" height={10} borderRadius={6} />
+                              <Skeleton width={100} widthType="percent" height={10} borderRadius={6} />
+                           </View>
+                        ) : (
+                           Object.keys(dataMember).map((v, i) => (
+                              <View key={i} style={i > 0 ? [Styles.announcementDetailGroupSeparator, themed.groupSeparator] : undefined}>
+                                 <Text style={[Styles.textInformation, Styles.announcementDetailGroupLabel, themed.sectionLabel]}>
+                                    {dataMember[v]?.[0].group}
+                                 </Text>
+                                 <View>
+                                    {dataMember[v].map((item, x) => (
+                                       <View key={x} style={[Styles.rowItemsCenter, Styles.announcementDetailDivisionRow]}>
+                                          <View style={[Styles.announcementDetailDivisionIconCircle, themed.divisionIconBg]}>
+                                             <MaterialIcons name="group" size={14} color={colors.icon} />
+                                          </View>
+                                          <Text style={[Styles.textDefault, Styles.flex1, themed.titleText]}>
+                                             {item.division}
+                                          </Text>
+                                       </View>
+                                    ))}
+                                 </View>
+                              </View>
+                           ))
+                        )}
+                     </View>
+                  </View>
+
                </View>
             )}
          </ScrollView>
@@ -323,38 +302,26 @@ export default function DetailAnnouncement() {
             visible={preview}
             onRequestClose={() => setPreview(false)}
             doubleTapToZoomEnabled
-            HeaderComponent={({ imageIndex }) => (
+            HeaderComponent={() => (
-               <View style={[Styles.headerModalViewImg]}>
+               <View style={Styles.headerModalViewImg}>
-                  {/* CLOSE */}
+                  <Pressable onPress={() => setPreview(false)} accessibilityRole="button">
-                  <Pressable
-                     onPress={() => setPreview(false)}
-                     accessibilityRole="button"
-                     accessibilityLabel="Close image viewer"
-                  >
                      <Text style={[Styles.textWhite, Styles.font26]}>✕</Text>
                   </Pressable>
-
-                  {/* MENU */}
                   <Pressable
                      onPress={() => chooseFile && openFile(chooseFile)}
                      accessibilityRole="button"
-                     accessibilityLabel="Download or share image"
                      disabled={loadingOpen}
                   >
-                     <Text style={[{ color: loadingOpen ? 'gray' : 'white' }, Styles.font26]}>⋯</Text>
+                     <Text style={[Styles.font26, { color: loadingOpen ? 'gray' : 'white' }]}>⋯</Text>
                   </Pressable>
                </View>
             )}
-            FooterComponent={({ imageIndex }) => (
+            FooterComponent={() => (
-               <View style={[
+               <View style={[Styles.pb20, Styles.ph16, Styles.alignCenter]}>
-                  Styles.pb20,
-                  Styles.ph16,
-                  Styles.alignCenter,
-               ]}>
                   <Text style={[Styles.textWhite, Styles.font16]}>{chooseFile?.name}.{chooseFile?.extension}</Text>
                </View>
             )}
          />
       </SafeAreaView>
    )
-}
+}

app/(application)/announcement/create.tsx

@@ -1,7 +1,5 @@
 import AppHeader from "@/components/AppHeader";
-import BorderBottomItem from "@/components/borderBottomItem";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
-import ButtonSelect from "@/components/buttonSelect";
 import DrawerBottom from "@/components/drawerBottom";
 import { InputForm } from "@/components/inputForm";
 import LoadingCenter from "@/components/loadingCenter";
@@ -13,14 +11,34 @@ import { setUpdateAnnouncement } from "@/lib/announcementUpdate";
 import { apiCreateAnnouncement } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { useTheme } from "@/providers/ThemeProvider";
-import { Entypo, Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
+import { Ionicons, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons";
 import * as DocumentPicker from "expo-document-picker";
 import { router, Stack } from "expo-router";
 import React, { useEffect, useState } from "react";
-import { SafeAreaView, ScrollView, 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";
 
+function getFileIcon(ext: string): keyof typeof MaterialCommunityIcons.glyphMap {
+   if (['jpg', 'jpeg', 'png', 'gif', 'webp', 'heic', 'heif'].includes(ext)) return 'image-outline'
+   if (ext === 'pdf') return 'file-pdf-box'
+   if (['mp4', 'mov', 'avi', 'mkv'].includes(ext)) return 'video-outline'
+   if (['doc', 'docx'].includes(ext)) return 'file-word-outline'
+   if (['xls', 'xlsx'].includes(ext)) return 'file-excel-outline'
+   if (['zip', 'rar', '7z'].includes(ext)) return 'zip-box-outline'
+   return 'file-outline'
+}
+
+function getFileColor(ext: string): string {
+   if (['jpg', 'jpeg', 'png', 'gif', 'webp', 'heic', 'heif'].includes(ext)) return '#339AF0'
+   if (ext === 'pdf') return '#F03E3E'
+   if (['mp4', 'mov', 'avi', 'mkv'].includes(ext)) return '#AE3EC9'
+   if (['doc', 'docx'].includes(ext)) return '#1C7ED6'
+   if (['xls', 'xlsx'].includes(ext)) return '#2F9E44'
+   if (['zip', 'rar', '7z'].includes(ext)) return '#E8590C'
+   return '#868E96'
+}
+
 export default function CreateAnnouncement() {
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.announcementUpdate)
@@ -28,109 +46,77 @@ export default function CreateAnnouncement() {
    const { colors } = useTheme();
    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({
+   const [dataForm, setDataForm] = useState({ title: "", desc: "" });
-      title: "",
+   const [error, setError] = useState({ title: false, desc: false });
-      desc: "",
+
-   });
+   const totalDivisi = divisionMember.reduce((acc: number, g: any) => acc + g.Division.length, 0)
-   const [error, setError] = useState({
-      title: false,
-      desc: false,
-   });
 
    function validationForm(cat: string, val: any) {
-      if (cat == "title") {
+      if (cat === "title") {
          setDataForm({ ...dataForm, title: val });
-         if (val == "" || val == "null") {
+         setError({ ...error, title: val === "" || val === "null" });
-            setError({ ...error, title: true });
+      } else if (cat === "desc") {
-         } else {
-            setError({ ...error, title: false });
-         }
-      } else if (cat == "desc") {
          setDataForm({ ...dataForm, desc: val });
-         if (val == "" || val == "null") {
+         setError({ ...error, desc: val === "" || val === "null" });
-            setError({ ...error, desc: true });
-         } else {
-            setError({ ...error, desc: false });
-         }
       }
    }
 
    function checkForm() {
-      if (
+      const hasError = Object.values(error).some(v => v)
-         Object.values(error).some((v) => v == true) ||
+      const hasEmpty = Object.values(dataForm).some(v => v === "")
-         Object.values(dataForm).some((v) => v == "")
+      setDisableBtn(hasError || hasEmpty);
-      ) {
-         setDisableBtn(true);
-      } else {
-         setDisableBtn(false);
-      }
    }
 
-   useEffect(() => {
+   useEffect(() => { checkForm() }, [error, dataForm]);
-      checkForm();
-   }, [error, dataForm]);
 
    async function handleCreate() {
       try {
          setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const fd = new FormData()
-
          for (let i = 0; i < fileForm.length; i++) {
-            fd.append(`file${i}`, {
+            fd.append(`file${i}`, { uri: fileForm[i].uri, type: 'application/octet-stream', name: fileForm[i].name } as any);
-               uri: fileForm[i].uri,
-               type: 'application/octet-stream',
-               name: fileForm[i].name,
-            } as any);
          }
-
+         fd.append("data", JSON.stringify({ user: hasil, groups: divisionMember, ...dataForm }))
-         fd.append("data", JSON.stringify(
-            { user: hasil, groups: divisionMember, ...dataForm }
-         ))
-
          const response = await apiCreateAnnouncement(fd)
-
          if (response.success) {
             dispatch(setUpdateAnnouncement(!update))
-            Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
+            Toast.show({ type: 'small', text1: 'Berhasil menambahkan data' })
             router.back();
          } else {
-            Toast.show({ type: 'small', text1: response.message, })
+            Toast.show({ type: 'small', text1: response.message })
          }
       } catch (error: any) {
          console.error(error);
-         const message = error?.response?.data?.message || "Tidak dapat terhubung ke server"
+         Toast.show({ type: 'small', text1: error?.response?.data?.message || "Tidak dapat terhubung ke server" })
-
-         Toast.show({
-            type: 'small',
-            text1: message
-         })
       } finally {
          setLoading(false)
       }
    }
 
    const pickDocumentAsync = async () => {
-      let result = await DocumentPicker.getDocumentAsync({
+      const result = await DocumentPicker.getDocumentAsync({ type: ["*/*"], multiple: true });
-         type: ["*/*"],
-         multiple: true
-      });
       if (!result.canceled) {
-         for (let i = 0; i < result.assets?.length; i++) {
+         let skipped = 0
-            if (result.assets[i].uri) {
+         for (const asset of result.assets) {
-               setFileForm((prev) => [...prev, result.assets[i]])
+            if (!asset.uri) continue
+            if (fileForm.some(f => f.name === asset.name)) {
+               skipped++
+            } else {
+               setFileForm(prev => [...prev, asset])
             }
          }
+         if (skipped > 0) Toast.show({ type: 'small', text1: 'Beberapa file sudah ditambahkan' })
       }
    };
 
    function deleteFile(index: number) {
-      setFileForm([...fileForm.filter((val, i) => i !== index)])
+      setFileForm(fileForm.filter((_, i) => i !== index))
       setModalFile(false)
    }
 
@@ -138,26 +124,6 @@ export default function CreateAnnouncement() {
       <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
          <Stack.Screen
             options={{
-               // headerLeft: () => (
-               //    <ButtonBackHeader
-               //       onPress={() => {
-               //          router.back();
-               //       }}
-               //    />
-               // ),
-               headerTitle: "Tambah Pengumuman",
-               headerTitleAlign: "center",
-               // headerRight: () => (
-               //    <ButtonSaveHeader
-               //       disable={disableBtn || divisionMember.length == 0 || loading ? true : false}
-               //       category="create"
-               //       onPress={() => {
-               //          divisionMember.length == 0
-               //             ? Toast.show({ type: 'small', text1: "Anda belum memilih divisi", })
-               //             : handleCreate();
-               //       }}
-               //    />
-               // ),
                header: () => (
                   <AppHeader
                      title="Tambah Pengumuman"
@@ -165,12 +131,12 @@ export default function CreateAnnouncement() {
                      onPressLeft={() => router.back()}
                      right={
                         <ButtonSaveHeader
-                           disable={disableBtn || divisionMember.length == 0 || loading ? true : false}
+                           disable={disableBtn || divisionMember.length === 0 || loading}
                            category="create"
                            onPress={() => {
-                              divisionMember.length == 0
+                              divisionMember.length === 0
-                                 ? Toast.show({ type: 'small', text1: "Anda belum memilih divisi", })
+                                 ? Toast.show({ type: 'small', text1: "Anda belum memilih divisi" })
-                                 : handleCreate();
+                                 : handleCreate()
                            }}
                         />
                      }
@@ -179,11 +145,9 @@ export default function CreateAnnouncement() {
             }}
          />
          {loading && <LoadingCenter />}
-         <ScrollView
+         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100, { backgroundColor: colors.background }]}>
-            showsVerticalScrollIndicator={false}
+            <View style={Styles.p15}>
-            style={[Styles.h100, { backgroundColor: colors.background }]}
+
-         >
-            <View style={[Styles.p15]}>
                <InputForm
                   label="Judul"
                   type="default"
@@ -194,6 +158,7 @@ export default function CreateAnnouncement() {
                   errorText="Judul harus diisi"
                   onChange={(val) => validationForm("title", val)}
                />
+
                <InputForm
                   label="Pengumuman"
                   type="default"
@@ -205,68 +170,105 @@ export default function CreateAnnouncement() {
                   onChange={(val) => validationForm("desc", val)}
                   multiline
                />
-               <ButtonSelect value="Upload File" onPress={pickDocumentAsync} />
+
-               {
+               {/* File */}
-                  fileForm.length > 0
+               <View style={[Styles.wrapPaper, Styles.mb15, Styles.sectionCard,
-                  &&
+                  { backgroundColor: colors.card, borderColor: colors.icon + '18' }]}>
-                  <>
+                  <Pressable
-                     <View style={[Styles.rowSpaceBetween, Styles.mv05]}>
+                     onPress={pickDocumentAsync}
-                        <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                     style={[Styles.sectionActionRow, { marginBottom: fileForm.length > 0 ? 12 : 0 }]}
-                        <Text style={[Styles.textDefault]}>{fileForm.length} file</Text>
+                  >
+                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.icon + '15' }]}>
+                        <MaterialCommunityIcons name="paperclip" size={18} color={colors.dimmed} />
                      </View>
-                     <View style={[Styles.borderAll, Styles.round05, Styles.p10, Styles.mb10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+                     <View style={Styles.flex1}>
-                        {
+                        <Text style={[Styles.textDefaultSemiBold, { color: colors.text }]}>File</Text>
-                           fileForm.map((item, index) => (
+                        {fileForm.length === 0 && (
-                              <BorderBottomItem
+                           <Text style={[Styles.textMediumNormal, { color: colors.dimmed }]}>Opsional — ketuk untuk upload</Text>
+                        )}
+                     </View>
+                     {fileForm.length > 0 && (
+                        <View style={[Styles.sectionBadge, { backgroundColor: colors.dimmed + '18' }]}>
+                           <Text style={[Styles.textSmallSemiBold, { color: colors.dimmed }]}>{fileForm.length} file</Text>
+                        </View>
+                     )}
+                     <MaterialCommunityIcons name="chevron-right" size={18} color={colors.dimmed} />
+                  </Pressable>
+                  {fileForm.length > 0 && (
+                     <View style={Styles.fileGrid}>
+                        {fileForm.map((item, index) => {
+                           const ext = item.name.split('.').pop()?.toLowerCase() ?? ''
+                           const baseName = item.name.includes('.') ? item.name.split('.').slice(0, -1).join('.') : item.name
+                           const iconName = getFileIcon(ext)
+                           const iconColor = getFileColor(ext)
+                           return (
+                              <Pressable
                                  key={index}
-                                 borderType={fileForm.length - 1 == index ? "none" : "bottom"}
-                                 icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
-                                 title={item.name}
-                                 bgColor="transparent"
-                                 titleWeight="normal"
                                  onPress={() => { setIndexDelFile(index); setModalFile(true) }}
-                              />
+                                 style={[Styles.fileCard, { backgroundColor: 'transparent', borderColor: colors.icon + '18' }]}
-                           ))
+                              >
-                        }
+                                 <View style={[Styles.sectionIconBox, { backgroundColor: iconColor + '20' }]}>
-                     </View>
+                                    <MaterialCommunityIcons name={iconName} size={18} color={iconColor} />
-                  </>
-               }
-
-               <ButtonSelect
-                  value="Pilih divisi penerima pengumuman"
-                  onPress={() => {
-                     setModalDivisi(true)
-                  }}
-               />
-
-               {
-                  divisionMember.length > 0
-                  &&
-                  <>
-                     <View style={[Styles.rowSpaceBetween, Styles.mv05]}>
-                        <Text style={[Styles.textDefaultSemiBold]}>Divisi</Text>
-                     </View>
-                     <View style={[Styles.borderAll, Styles.round05, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
-                        {
-                           divisionMember.map((item: { name: any; Division: any }, index: any) => {
-                              return (
-                                 <View key={index}>
-                                    <Text style={[Styles.textDefaultSemiBold]}>{item.name}</Text>
-                                    {
-                                       item.Division.map((division: any, i: any) => (
-                                          <View key={i} style={[Styles.rowItemsCenter, Styles.w90]}>
-                                             <Entypo name="dot-single" size={24} color={colors.text} />
-                                             <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode='tail'>{division.name}</Text>
-                                          </View>
-                                       ))
-                                    }
                                  </View>
-                              )
+                                 <View style={Styles.flex1}>
-                           })
+                                    <Text style={Styles.textDefault} numberOfLines={1}>{baseName}</Text>
-                        }
+                                    <Text style={[Styles.textSmallSemiBold, { color: colors.dimmed }]}>{ext.toUpperCase()}</Text>
+                                 </View>
+                              </Pressable>
+                           )
+                        })}
                      </View>
-                  </>
+                  )}
-               }
+               </View>
+
+               {/* Divisi Penerima */}
+               <View style={[Styles.wrapPaper, Styles.mb15, Styles.sectionCard,
+                  { backgroundColor: colors.card, borderColor: colors.icon + '18' }]}>
+                  <Pressable
+                     onPress={() => setModalDivisi(true)}
+                     style={[Styles.sectionActionRow, { marginBottom: divisionMember.length > 0 ? 12 : 0 }]}
+                  >
+                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.tabActive + '18' }]}>
+                        <MaterialIcons name="groups" size={18} color={colors.tabActive} />
+                     </View>
+                     <View style={Styles.flex1}>
+                        <Text style={[Styles.textDefaultSemiBold, { color: colors.text }]}>Divisi Penerima</Text>
+                        {divisionMember.length === 0 && (
+                           <Text style={[Styles.textMediumNormal, { color: colors.dimmed }]}>Belum ada divisi dipilih</Text>
+                        )}
+                     </View>
+                     {divisionMember.length > 0 && (
+                        <View style={[Styles.sectionBadge, { backgroundColor: colors.tabActive + '18' }]}>
+                           <Text style={[Styles.textSmallSemiBold, { color: colors.tabActive }]}>{totalDivisi} divisi</Text>
+                        </View>
+                     )}
+                     <MaterialCommunityIcons name="chevron-right" size={18} color={colors.dimmed} />
+                  </Pressable>
+                  {divisionMember.length > 0 && (
+                     <View style={{ gap: 10 }}>
+                        {divisionMember.map((item: any, index: number) => (
+                           <View key={index}>
+                              <Text style={[Styles.textMediumNormal, { color: colors.dimmed, marginBottom: 4 }]}>
+                                 {item.name}
+                              </Text>
+                              <View style={{ gap: 6 }}>
+                                 {item.Division.map((division: any, i: number) => (
+                                    <View key={i} style={[Styles.listItemCard, { borderColor: colors.icon + '18' }]}>
+                                       <View style={[Styles.sectionIconBox, { backgroundColor: colors.tabActive + '18', width: 28, height: 28, borderRadius: 8 }]}>
+                                          <MaterialIcons name="group" size={14} color={colors.tabActive} />
+                                       </View>
+                                       <Text style={[Styles.textDefault, Styles.flex1, { color: colors.text }]} numberOfLines={1}>
+                                          {division.name}
+                                       </Text>
+                                    </View>
+                                 ))}
+                              </View>
+                           </View>
+                        ))}
+                     </View>
+                  )}
+               </View>
+
             </View>
          </ScrollView>
 
@@ -287,12 +289,10 @@ export default function CreateAnnouncement() {
                <MenuItemRow
                   icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
                   title="Hapus"
-                  onPress={() => { deleteFile(indexDelFile) }}
+                  onPress={() => deleteFile(indexDelFile)}
                />
             </View>
          </DrawerBottom>
       </SafeAreaView>
    );
 }
-
-

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

@@ -1,7 +1,5 @@
 import AppHeader from "@/components/AppHeader";
-import BorderBottomItem from "@/components/borderBottomItem";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
-import ButtonSelect from "@/components/buttonSelect";
 import DrawerBottom from "@/components/drawerBottom";
 import { InputForm } from "@/components/inputForm";
 import LoadingCenter from "@/components/loadingCenter";
@@ -13,22 +11,38 @@ import { setUpdateAnnouncement } from "@/lib/announcementUpdate";
 import { apiEditAnnouncement, apiGetAnnouncementOne } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { useTheme } from "@/providers/ThemeProvider";
-import { Entypo, Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
+import { Ionicons, MaterialCommunityIcons, MaterialIcons } 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, 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";
 
+function getFileIcon(ext: string): keyof typeof MaterialCommunityIcons.glyphMap {
+   if (['jpg', 'jpeg', 'png', 'gif', 'webp', 'heic', 'heif'].includes(ext)) return 'image-outline'
+   if (ext === 'pdf') return 'file-pdf-box'
+   if (['mp4', 'mov', 'avi', 'mkv'].includes(ext)) return 'video-outline'
+   if (['doc', 'docx'].includes(ext)) return 'file-word-outline'
+   if (['xls', 'xlsx'].includes(ext)) return 'file-excel-outline'
+   if (['zip', 'rar', '7z'].includes(ext)) return 'zip-box-outline'
+   return 'file-outline'
+}
+
+function getFileColor(ext: string): string {
+   if (['jpg', 'jpeg', 'png', 'gif', 'webp', 'heic', 'heif'].includes(ext)) return '#339AF0'
+   if (ext === 'pdf') return '#F03E3E'
+   if (['mp4', 'mov', 'avi', 'mkv'].includes(ext)) return '#AE3EC9'
+   if (['doc', 'docx'].includes(ext)) return '#1C7ED6'
+   if (['xls', 'xlsx'].includes(ext)) return '#2F9E44'
+   if (['zip', 'rar', '7z'].includes(ext)) return '#E8590C'
+   return '#868E96'
+}
 
 type GroupDivision = {
    id: string;
    name: string;
-   Division: {
+   Division: { id: string; name: string }[];
-      id: string;
-      name: string;
-   }[];
 }
 
 export default function EditAnnouncement() {
@@ -39,43 +53,29 @@ export default function EditAnnouncement() {
    const { colors } = useTheme();
    const [modalDivisi, setModalDivisi] = useState(false);
    const [disableBtn, setDisableBtn] = useState(true);
-   const [dataMember, setDataMember] = useState<any>([]);
+   const [dataMember, setDataMember] = useState<GroupDivision[]>([]);
    const [fileForm, setFileForm] = useState<any[]>([])
    const [dataFile, setDataFile] = useState<{ id: string; idStorage: string; name: string; extension: string; delete?: boolean }[]>([])
    const [indexDelFile, setIndexDelFile] = useState<{ id: string | number; cat: "newFile" | "oldFile" }>({ id: "", cat: "newFile" })
    const [isModalFile, setModalFile] = useState(false)
    const [loading, setLoading] = useState(false)
-   const [dataForm, setDataForm] = useState({
+   const [dataForm, setDataForm] = useState({ title: "", desc: "" });
-      title: "",
+   const [error, setError] = useState({ title: false, desc: false });
-      desc: "",
+
-   });
+   const visibleOldFiles = dataFile.filter(v => !v.delete)
-   const [error, setError] = useState({
+   const totalFiles = fileForm.length + visibleOldFiles.length
-      title: false,
+   const totalDivisi = dataMember.reduce((acc: number, g: any) => acc + g.Division.length, 0)
-      desc: false,
-   });
 
    async function handleLoad() {
       try {
          const hasil = await decryptToken(String(token?.current));
          const response = await apiGetAnnouncementOne({ id: id, user: hasil });
          setDataForm(response.data);
-
+         const arrNew: GroupDivision[] = Object.keys(response.member).map((v) => ({
-         const arrNew: GroupDivision[] = []
+            id: response.member[v][0].idGroup,
-         const coba = Object.keys(response.member).map((v: any, i: any) => {
+            name: v,
-            const newObject = {
+            Division: response.member[v].map((m: any) => ({ id: m.idDivision, name: m.division }))
-               "id": response.member[v][0].idGroup,
+         }))
-               "name": v,
-               "Division": response.member[v]
-            }
-
-            response.member[v].map((v: any, i: any) => {
-               newObject["Division"][i] = {
-                  "id": v.idDivision,
-                  "name": v.division
-               }
-            })
-            arrNew.push(newObject)
-         })
          setDataMember(arrNew);
          setDataFile(response.file);
       } catch (error) {
@@ -83,42 +83,25 @@ export default function EditAnnouncement() {
       }
    }
 
-   useEffect(() => {
+   useEffect(() => { handleLoad() }, []);
-      handleLoad();
-   }, []);
 
    function validationForm(cat: string, val: any) {
-      if (cat == "title") {
+      if (cat === "title") {
          setDataForm({ ...dataForm, title: val });
-         if (val == "" || val == "null") {
+         setError({ ...error, title: val === "" || val === "null" });
-            setError({ ...error, title: true });
+      } else if (cat === "desc") {
-         } else {
-            setError({ ...error, title: false });
-         }
-      } else if (cat == "desc") {
          setDataForm({ ...dataForm, desc: val });
-         if (val == "" || val == "null") {
+         setError({ ...error, desc: val === "" || val === "null" });
-            setError({ ...error, desc: true });
-         } else {
-            setError({ ...error, desc: false });
-         }
       }
    }
 
    function checkForm() {
-      if (
+      const hasError = Object.values(error).some(v => v)
-         Object.values(error).some((v) => v == true) ||
+      const hasEmpty = Object.values(dataForm).some(v => v === "")
-         Object.values(dataForm).some((v) => v == "")
+      setDisableBtn(hasError || hasEmpty);
-      ) {
-         setDisableBtn(true);
-      } else {
-         setDisableBtn(false);
-      }
    }
 
-   useEffect(() => {
+   useEffect(() => { checkForm() }, [error, dataForm]);
-      checkForm();
-   }, [error, dataForm]);
 
    async function handleEdit() {
       try {
@@ -126,90 +109,56 @@ export default function EditAnnouncement() {
          const hasil = await decryptToken(String(token?.current))
          const fd = new FormData()
          for (let i = 0; i < fileForm.length; i++) {
-            fd.append(`file${i}`, {
+            fd.append(`file${i}`, { uri: fileForm[i].uri, type: 'application/octet-stream', name: fileForm[i].name } as any);
-               uri: fileForm[i].uri,
-               type: 'application/octet-stream',
-               name: fileForm[i].name,
-            } as any);
          }
-
+         fd.append("data", JSON.stringify({ ...dataForm, user: hasil, groups: dataMember, oldFile: dataFile }))
-         fd.append("data", JSON.stringify(
-            {
-               ...dataForm, user: hasil, groups: dataMember, oldFile: dataFile
-            }
-         ))
-
          const response = await apiEditAnnouncement(fd, id);
          if (response.success) {
             dispatch(setUpdateAnnouncement(!update))
-            Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
+            Toast.show({ type: 'small', text1: 'Berhasil mengubah data' })
             router.back();
          } else {
-            Toast.show({ type: 'small', text1: 'Gagal mengubah data', })
+            Toast.show({ type: 'small', text1: 'Gagal mengubah data' })
          }
       } catch (error: any) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal mengubah data"
+         Toast.show({ type: 'small', text1: error?.response?.data?.message || "Gagal mengubah data" })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
    }
 
    const pickDocumentAsync = async () => {
-      let result = await DocumentPicker.getDocumentAsync({
+      const result = await DocumentPicker.getDocumentAsync({ type: ["*/*"], multiple: true });
-         type: ["*/*"],
-         multiple: true
-      });
       if (!result.canceled) {
-         for (let i = 0; i < result.assets?.length; i++) {
+         let skipped = 0
-            if (result.assets[i].uri) {
+         for (const asset of result.assets) {
-               setFileForm((prev) => [...prev, result.assets[i]])
+            if (!asset.uri) continue
+            const isDup = fileForm.some(f => f.name === asset.name) ||
+               visibleOldFiles.some(f => `${f.name}.${f.extension}` === asset.name)
+            if (isDup) {
+               skipped++
+            } else {
+               setFileForm(prev => [...prev, asset])
             }
          }
+         if (skipped > 0) Toast.show({ type: 'small', text1: 'Beberapa file sudah ditambahkan' })
       }
    };
 
    function deleteFile(index: number | string, cat: "newFile" | "oldFile" | null) {
-      if (cat == "newFile") {
+      if (cat === "newFile") {
-         setFileForm([...fileForm.filter((val, i) => i !== index)])
+         setFileForm(fileForm.filter((_, i) => i !== index))
       } else {
-         setDataFile(prev =>
+         setDataFile(prev => prev.map(item => item.id === index ? { ...item, delete: true } : item))
-            prev.map(item =>
-               item.id === index
-                  ? { ...item, delete: true }
-                  : item
-            )
-         );
       }
       setModalFile(false)
    }
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
          <Stack.Screen
             options={{
-               // headerLeft: () => (
-               //    <ButtonBackHeader
-               //       onPress={() => {
-               //          router.back();
-               //       }}
-               //    />
-               // ),
-               headerTitle: "Edit Pengumuman",
-               headerTitleAlign: "center",
-               // headerRight: () => (
-               //    <ButtonSaveHeader
-               //       disable={disableBtn || loading ? true : false}
-               //       category="update"
-               //       onPress={() => {
-               //          dataMember.length == 0
-               //             ? Toast.show({ type: 'small', text1: "Anda belum memilih divisi", })
-               //             : handleEdit();
-               //       }}
-               //    />
-               // ),
                header: () => (
                   <AppHeader
                      title="Edit Pengumuman"
@@ -217,12 +166,12 @@ export default function EditAnnouncement() {
                      onPressLeft={() => router.back()}
                      right={
                         <ButtonSaveHeader
-                           disable={disableBtn || loading ? true : false}
+                           disable={disableBtn || dataMember.length === 0 || loading}
                            category="update"
                            onPress={() => {
-                              dataMember.length == 0
+                              dataMember.length === 0
-                                 ? Toast.show({ type: 'small', text1: "Anda belum memilih divisi", })
+                                 ? Toast.show({ type: 'small', text1: "Anda belum memilih divisi" })
-                                 : handleEdit();
+                                 : handleEdit()
                            }}
                         />
                      }
@@ -231,11 +180,9 @@ export default function EditAnnouncement() {
             }}
          />
          {loading && <LoadingCenter />}
-         <ScrollView
+         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100, { backgroundColor: colors.background }]}>
-            showsVerticalScrollIndicator={false}
+            <View style={Styles.p15}>
-            style={[Styles.h100, { backgroundColor: colors.background }]}
+
-         >
-            <View style={[Styles.p15]}>
                <InputForm
                   label="Judul"
                   type="default"
@@ -247,6 +194,7 @@ export default function EditAnnouncement() {
                   onChange={(val) => validationForm("title", val)}
                   value={dataForm.title}
                />
+
                <InputForm
                   label="Pengumuman"
                   type="default"
@@ -259,79 +207,125 @@ export default function EditAnnouncement() {
                   value={dataForm.desc}
                   multiline
                />
-               <ButtonSelect value="Upload File" onPress={pickDocumentAsync} />
+
-               {
+               {/* File */}
-                  (fileForm.length > 0 || dataFile.filter((val) => !val.delete).length > 0)
+               <View style={[Styles.wrapPaper, Styles.mb15, Styles.sectionCard,
-                  &&
+                  { backgroundColor: colors.card, borderColor: colors.icon + '18' }]}>
-                  <>
+                  <Pressable
-                     <View style={[Styles.rowSpaceBetween, Styles.mv05]}>
+                     onPress={pickDocumentAsync}
-                        <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                     style={[Styles.sectionActionRow, { marginBottom: totalFiles > 0 ? 12 : 0 }]}
-                        <Text style={[Styles.textDefault]}>{fileForm.length + dataFile.filter((val) => !val.delete).length} file</Text>
+                  >
+                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.icon + '15' }]}>
+                        <MaterialCommunityIcons name="paperclip" size={18} color={colors.dimmed} />
                      </View>
-                     <View style={[Styles.borderAll, Styles.round05, Styles.p10, Styles.mb10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+                     <View style={Styles.flex1}>
-                        {
+                        <Text style={[Styles.textDefaultSemiBold, { color: colors.text }]}>File</Text>
-                           dataFile.filter((val) => !val.delete).map((item, index) => (
+                        {totalFiles === 0 && (
-                              <BorderBottomItem
+                           <Text style={[Styles.textMediumNormal, { color: colors.dimmed }]}>Opsional — ketuk untuk upload</Text>
-                                 key={index}
+                        )}
-                                 borderType={dataFile.filter((val) => !val.delete).length - 1 == index && fileForm.length == 0 ? "none" : "bottom"}
+                     </View>
-                                 icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
+                     {totalFiles > 0 && (
-                                 title={item.name + '.' + item.extension}
+                        <View style={[Styles.sectionBadge, { backgroundColor: colors.dimmed + '18' }]}>
-                                 titleWeight="normal"
+                           <Text style={[Styles.textSmallSemiBold, { color: colors.dimmed }]}>{totalFiles} file</Text>
-                                 bgColor="transparent"
+                        </View>
+                     )}
+                     <MaterialCommunityIcons name="chevron-right" size={18} color={colors.dimmed} />
+                  </Pressable>
+                  {totalFiles > 0 && (
+                     <View style={Styles.fileGrid}>
+                        {visibleOldFiles.map((item, index) => {
+                           const ext = item.extension.toLowerCase()
+                           const iconName = getFileIcon(ext)
+                           const iconColor = getFileColor(ext)
+                           return (
+                              <Pressable
+                                 key={`old-${index}`}
                                  onPress={() => { setIndexDelFile({ id: item.id, cat: "oldFile" }); setModalFile(true) }}
-                              />
+                                 style={[Styles.fileCard, { backgroundColor: 'transparent', borderColor: colors.icon + '18' }]}
-                           ))
+                              >
-                        }
+                                 <View style={[Styles.sectionIconBox, { backgroundColor: iconColor + '20' }]}>
-                        {
+                                    <MaterialCommunityIcons name={iconName} size={18} color={iconColor} />
-                           fileForm.map((item, index) => (
-                              <BorderBottomItem
-                                 key={index}
-                                 borderType={fileForm.length - 1 == index ? "none" : "bottom"}
-                                 icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
-                                 title={item.name}
-                                 titleWeight="normal"
-                                 bgColor="transparent"
-                                 onPress={() => { setIndexDelFile({ id: index, cat: "newFile" }); setModalFile(true) }}
-                              />
-                           ))
-                        }
-                     </View>
-                  </>
-               }
-               <ButtonSelect
-                  value="Pilih divisi penerima pengumuman"
-                  onPress={() => {
-                     setModalDivisi(true)
-                  }}
-               />
-               {
-                  dataMember.length > 0
-                  &&
-                  <>
-                     <View style={[Styles.rowSpaceBetween, Styles.mv05]}>
-                        <Text style={[Styles.textDefaultSemiBold]}>Divisi</Text>
-                     </View>
-                     <View style={[Styles.borderAll, Styles.round05, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
-                        {
-                           dataMember.map((item: { name: any; Division: any }, index: any) => {
-                              return (
-                                 <View key={index}>
-                                    <Text style={[Styles.textDefaultSemiBold]}>{item.name}</Text>
-                                    {
-                                       item.Division.map((division: any, i: any) => (
-                                          <View key={i} style={[Styles.rowItemsCenter, Styles.w90]}>
-                                             <Entypo name="dot-single" size={24} color={colors.text} />
-                                             <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode='tail'>{division.name}</Text>
-                                          </View>
-                                       ))
-                                    }
                                  </View>
-                              )
+                                 <View style={Styles.flex1}>
-                           })
+                                    <Text style={Styles.textDefault} numberOfLines={1}>{item.name}</Text>
-                        }
+                                    <Text style={[Styles.textSmallSemiBold, { color: colors.dimmed }]}>{ext.toUpperCase()}</Text>
+                                 </View>
+                              </Pressable>
+                           )
+                        })}
+                        {fileForm.map((item, index) => {
+                           const ext = item.name.split('.').pop()?.toLowerCase() ?? ''
+                           const baseName = item.name.includes('.') ? item.name.split('.').slice(0, -1).join('.') : item.name
+                           const iconName = getFileIcon(ext)
+                           const iconColor = getFileColor(ext)
+                           return (
+                              <Pressable
+                                 key={`new-${index}`}
+                                 onPress={() => { setIndexDelFile({ id: index, cat: "newFile" }); setModalFile(true) }}
+                                 style={[Styles.fileCard, { backgroundColor: 'transparent', borderColor: colors.icon + '18' }]}
+                              >
+                                 <View style={[Styles.sectionIconBox, { backgroundColor: iconColor + '20' }]}>
+                                    <MaterialCommunityIcons name={iconName} size={18} color={iconColor} />
+                                 </View>
+                                 <View style={Styles.flex1}>
+                                    <Text style={Styles.textDefault} numberOfLines={1}>{baseName}</Text>
+                                    <Text style={[Styles.textSmallSemiBold, { color: colors.dimmed }]}>{ext.toUpperCase()}</Text>
+                                 </View>
+                              </Pressable>
+                           )
+                        })}
                      </View>
-                  </>
+                  )}
-               }
+               </View>
+
+               {/* Divisi Penerima */}
+               <View style={[Styles.wrapPaper, Styles.mb15, Styles.sectionCard,
+                  { backgroundColor: colors.card, borderColor: colors.icon + '18' }]}>
+                  <Pressable
+                     onPress={() => setModalDivisi(true)}
+                     style={[Styles.sectionActionRow, { marginBottom: dataMember.length > 0 ? 12 : 0 }]}
+                  >
+                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.tabActive + '18' }]}>
+                        <MaterialIcons name="groups" size={18} color={colors.tabActive} />
+                     </View>
+                     <View style={Styles.flex1}>
+                        <Text style={[Styles.textDefaultSemiBold, { color: colors.text }]}>Divisi Penerima</Text>
+                        {dataMember.length === 0 && (
+                           <Text style={[Styles.textMediumNormal, { color: colors.dimmed }]}>Belum ada divisi dipilih</Text>
+                        )}
+                     </View>
+                     {dataMember.length > 0 && (
+                        <View style={[Styles.sectionBadge, { backgroundColor: colors.tabActive + '18' }]}>
+                           <Text style={[Styles.textSmallSemiBold, { color: colors.tabActive }]}>{totalDivisi} divisi</Text>
+                        </View>
+                     )}
+                     <MaterialCommunityIcons name="chevron-right" size={18} color={colors.dimmed} />
+                  </Pressable>
+                  {dataMember.length > 0 && (
+                     <View style={{ gap: 10 }}>
+                        {dataMember.map((item, index) => (
+                           <View key={index}>
+                              <Text style={[Styles.textMediumNormal, { color: colors.dimmed, marginBottom: 4 }]}>
+                                 {item.name}
+                              </Text>
+                              <View style={{ gap: 6 }}>
+                                 {item.Division.map((division, i) => (
+                                    <View key={i} style={[Styles.listItemCard, { borderColor: colors.icon + '18' }]}>
+                                       <View style={[Styles.sectionIconBox, { backgroundColor: colors.tabActive + '18', width: 28, height: 28, borderRadius: 8 }]}>
+                                          <MaterialIcons name="group" size={14} color={colors.tabActive} />
+                                       </View>
+                                       <Text style={[Styles.textDefault, Styles.flex1, { color: colors.text }]} numberOfLines={1}>
+                                          {division.name}
+                                       </Text>
+                                    </View>
+                                 ))}
+                              </View>
+                           </View>
+                        ))}
+                     </View>
+                  )}
+               </View>
+
             </View>
          </ScrollView>
 
@@ -353,7 +347,7 @@ export default function EditAnnouncement() {
                <MenuItemRow
                   icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
                   title="Hapus"
-                  onPress={() => { deleteFile(indexDelFile.id, indexDelFile.cat) }}
+                  onPress={() => deleteFile(indexDelFile.id, indexDelFile.cat)}
                />
             </View>
          </DrawerBottom>

app/(application)/announcement/index.tsx

@@ -1,7 +1,6 @@
 import GuideOverlay from "@/components/GuideOverlay";
-import BorderBottomItem from "@/components/borderBottomItem";
 import InputSearch from "@/components/inputSearch";
-import SkeletonContent from "@/components/skeletonContent";
+import Skeleton from "@/components/skeleton";
 import Text from '@/components/Text';
 import Styles from "@/constants/Styles";
 import { apiGetAnnouncement } from "@/lib/api";
@@ -12,14 +11,14 @@ import { useTheme } from "@/providers/ThemeProvider";
 import { MaterialIcons } from "@expo/vector-icons";
 import { useInfiniteQuery } from "@tanstack/react-query";
 import { router } from "expo-router";
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
-import { RefreshControl, View, VirtualizedList } from "react-native";
+import { Pressable, RefreshControl, View, VirtualizedList } from "react-native";
 import { useSelector } from "react-redux";
 
 type Props = {
-   id: string,
+   id: string
-   title: string,
+   title: string
-   desc: string,
+   desc: string
    createdAt: string
 }
 
@@ -28,10 +27,20 @@ export default function Announcement() {
    const { colors } = useTheme();
    const [search, setSearch] = useState('')
    const update = useSelector((state: any) => state.announcementUpdate)
+   const isFirstRender = useRef(true)
    const { visible: guideVisible, dismiss: dismissGuide } = useGuide('announcement')
-   const arrSkeleton = Array.from({ length: 5 }, (_, index) => index)
+   const arrSkeleton = Array.from({ length: 5 }, (_, i) => i)
+
+   const themed = {
+      background:  { backgroundColor: colors.background },
+      card:        { backgroundColor: colors.card, borderColor: colors.icon + '18' },
+      iconBox:     { backgroundColor: colors.icon + '18' },
+      title:       { color: colors.text },
+      desc:        { color: colors.dimmed },
+      date:        { color: colors.dimmed },
+      cardPressed: { backgroundColor: colors.icon + '08' },
+   }
 
-   // TanStack Query Infinite Query
    const {
       data,
       fetchNextPage,
@@ -44,11 +53,7 @@ export default function Announcement() {
       queryKey: ['announcements', search],
       queryFn: async ({ pageParam = 1 }) => {
          const hasil = await decryptToken(String(token?.current))
-         const response = await apiGetAnnouncement({
+         const response = await apiGetAnnouncement({ user: hasil, search, page: pageParam })
-            user: hasil,
-            search: search,
-            page: pageParam
-         })
          return response.data
       },
       initialPageParam: 1,
@@ -57,21 +62,12 @@ export default function Announcement() {
       },
    })
 
-   // Trigger refetch when Redux state 'update' changes
    useEffect(() => {
+      if (isFirstRender.current) { isFirstRender.current = false; return }
       refetch()
-   }, [update, refetch])
+   }, [update])
 
-   // Flatten data from pages
+   const flattenedData = useMemo(() => data?.pages.flat() || [], [data])
-   const flattenedData = useMemo(() => {
-      return data?.pages.flat() || []
-   }, [data])
-
-   const loadMoreData = () => {
-      if (hasNextPage && !isFetchingNextPage) {
-         fetchNextPage()
-      }
-   };
 
    const getItem = (_data: unknown, index: number): Props => ({
       id: flattenedData[index].id,
@@ -80,59 +76,80 @@ export default function Announcement() {
       createdAt: flattenedData[index].createdAt,
    })
 
-   return (
+   const renderSkeleton = () => (
-      <View style={[Styles.p15, Styles.flex1, { backgroundColor: colors.background }]}>
+      <View style={Styles.announcementListSkeletonCard}>
-         <GuideOverlay visible={guideVisible} steps={GUIDE_ANNOUNCEMENT} onDismiss={dismissGuide} />
+         <View style={[Styles.rowSpaceBetween, Styles.rowItemsCenter, Styles.announcementListSkeletonHeader]}>
-         <View>
+            <View style={[Styles.rowItemsCenter, Styles.announcementListSkeletonTitleRow]}>
-            <InputSearch onChange={setSearch} />
+               <Skeleton width={28} height={28} borderRadius={8} />
+               <Skeleton width={50} widthType="percent" height={12} borderRadius={6} />
+            </View>
+            <Skeleton width={15} widthType="percent" height={10} borderRadius={6} />
          </View>
-         <View style={[Styles.flex2, Styles.mt05]}>
+         <Skeleton width={100} widthType="percent" height={10} borderRadius={6} />
-            {
+         <Skeleton width={80} widthType="percent" height={10} borderRadius={6} />
-               isLoading && !flattenedData.length ?
+      </View>
-                  arrSkeleton.map((item, index) => {
+   )
-                     return (
+
-                        <SkeletonContent key={index} />
+   const renderItem = ({ item }: { item: Props }) => (
-                     )
+      <Pressable
-                  })
+         onPress={() => router.push(`/announcement/${item.id}`)}
-                  :
+         style={({ pressed }) => [Styles.announcementListCard, themed.card, pressed && themed.cardPressed]}
-                  flattenedData.length > 0
+      >
-                     ?
+         <View style={[Styles.rowSpaceBetween, Styles.rowItemsCenter, Styles.announcementListCardHeader]}>
-                     <VirtualizedList
+            <View style={[Styles.rowItemsCenter, Styles.announcementListTitleRow]}>
-                        data={flattenedData}
+               <View style={[Styles.announcementListIconBox, themed.iconBox]}>
-                        getItemCount={() => flattenedData.length}
+                  <MaterialIcons name="campaign" size={16} color={colors.icon} />
-                        getItem={getItem}
+               </View>
-                        renderItem={({ item, index }: { item: Props, index: number }) => {
+               <Text style={[Styles.textDefaultSemiBold, Styles.announcementListTitleText, themed.title]} numberOfLines={1}>
-                           return (
+                  {item.title}
-                              <BorderBottomItem
+               </Text>
-                                 key={index}
+            </View>
-                                 onPress={() => { router.push(`/announcement/${item.id}`) }}
+            <Text style={[Styles.textInformation, Styles.announcementListDateText, themed.date]}>
-                                 borderType="bottom"
+               {item.createdAt}
-                                 bgColor="transparent"
+            </Text>
-                                 icon={
+         </View>
-                                    <MaterialIcons name="campaign" size={25} color={colors.text} />
+         <Text style={[Styles.textMediumNormal, Styles.announcementListDescText, themed.title]} numberOfLines={2}>
-                                 }
+            {item.desc.replace(/<[^>]*>?/gm, '').replace(/\r?\n|\r/g, ' ')}
-                                 title={item.title}
+         </Text>
-                                 desc={item.desc.replace(/<[^>]*>?/gm, '').replace(/\r?\n|\r/g, ' ')}
+      </Pressable>
-                                 rightTopInfo={item.createdAt}
+   )
-                              />
+
-                           )
+   return (
-                        }}
+      <View style={[Styles.flex1, Styles.announcementListContainer, themed.background]}>
-                        keyExtractor={(item, index) => String(item.id || index)}
+         <GuideOverlay visible={guideVisible} steps={GUIDE_ANNOUNCEMENT} onDismiss={dismissGuide} />
-                        onEndReached={loadMoreData}
+         <InputSearch onChange={setSearch} />
-                        onEndReachedThreshold={0.5}
+         <View style={[Styles.flex1, Styles.announcementListInner]}>
-                        showsVerticalScrollIndicator={false}
+            {isLoading && !flattenedData.length ? (
-                        refreshControl={
+               arrSkeleton.map((_, i) => (
-                           <RefreshControl
+                  <View key={i} style={[Styles.announcementListCard, themed.card]}>
-                              refreshing={isRefetching && !isFetchingNextPage}
+                     {renderSkeleton()}
-                              onRefresh={refetch}
+                  </View>
-                              tintColor={colors.icon}
+               ))
-                           />
+            ) : flattenedData.length > 0 ? (
-                        }
+               <VirtualizedList
+                  data={flattenedData}
+                  getItemCount={() => flattenedData.length}
+                  getItem={getItem}
+                  renderItem={renderItem}
+                  keyExtractor={(item, index) => String(item.id || index)}
+                  onEndReached={() => { if (hasNextPage && !isFetchingNextPage) fetchNextPage() }}
+                  onEndReachedThreshold={0.5}
+                  showsVerticalScrollIndicator={false}
+                  ItemSeparatorComponent={() => <View style={Styles.announcementListSeparator} />}
+                  refreshControl={
+                     <RefreshControl
+                        refreshing={isRefetching && !isFetchingNextPage}
+                        onRefresh={refetch}
+                        tintColor={colors.icon}
                      />
-                     :
+                  }
-                     <Text style={[Styles.textDefault, Styles.textCenter, { color: colors.dimmed }]}>Tidak ada pengumuman</Text>
+               />
-            }
+            ) : (
+               <Text style={[Styles.textDefault, Styles.textCenter, Styles.mt30, themed.desc]}>
+                  Tidak ada pengumuman
+               </Text>
+            )}
          </View>
       </View>
    )
-}
+}

app/(application)/discussion/create.tsx

@@ -1,7 +1,5 @@
 import AppHeader from "@/components/AppHeader";
-import BorderBottomItem from "@/components/borderBottomItem";
 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";
@@ -17,14 +15,33 @@ import { setUpdateDiscussionGeneralDetail } from "@/lib/discussionGeneralDetail"
 import { setMemberChoose } from "@/lib/memberChoose";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { useTheme } from "@/providers/ThemeProvider";
-import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
+import { Ionicons, MaterialCommunityIcons, MaterialIcons } 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, 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";
 
+function getFileIcon(ext: string): keyof typeof MaterialCommunityIcons.glyphMap {
+   if (['jpg', 'jpeg', 'png', 'gif', 'webp', 'heic', 'heif'].includes(ext)) return 'image-outline'
+   if (ext === 'pdf') return 'file-pdf-box'
+   if (['mp4', 'mov', 'avi', 'mkv'].includes(ext)) return 'video-outline'
+   if (['doc', 'docx'].includes(ext)) return 'file-word-outline'
+   if (['xls', 'xlsx'].includes(ext)) return 'file-excel-outline'
+   if (['zip', 'rar', '7z'].includes(ext)) return 'zip-box-outline'
+   return 'file-outline'
+}
+
+function getFileColor(ext: string): string {
+   if (['jpg', 'jpeg', 'png', 'gif', 'webp', 'heic', 'heif'].includes(ext)) return '#339AF0'
+   if (ext === 'pdf') return '#F03E3E'
+   if (['mp4', 'mov', 'avi', 'mkv'].includes(ext)) return '#AE3EC9'
+   if (['doc', 'docx'].includes(ext)) return '#1C7ED6'
+   if (['xls', 'xlsx'].includes(ext)) return '#2F9E44'
+   if (['zip', 'rar', '7z'].includes(ext)) return '#E8590C'
+   return '#868E96'
+}
 
 export default function CreateDiscussionGeneral() {
    const { token, decryptToken } = useAuthSession()
@@ -43,84 +60,67 @@ export default function CreateDiscussionGeneral() {
    const [fileForm, setFileForm] = useState<any[]>([])
    const [isModalFile, setModalFile] = useState(false)
    const [indexDelFile, setIndexDelFile] = useState<number>(0)
-   const [dataForm, setDataForm] = useState({
+   const [dataForm, setDataForm] = useState({ idGroup: "", title: "", desc: "" });
-      idGroup: "",
+   const [error, setError] = useState({ group: false, title: false, desc: false });
-      title: "",
-      desc: "",
-   });
-   const [error, setError] = useState({
-      group: false,
-      title: false,
-      desc: false,
-   });
 
    function validationForm(cat: string, val: any, label?: string) {
-      if (cat == "group") {
+      if (cat === "group") {
          setChooseGroup({ val, label: String(label) });
          dispatch(setMemberChoose([]))
          setDataForm({ ...dataForm, idGroup: val });
-         if (val == "" || val == "null") {
+         setError({ ...error, group: val === "" || val === "null" });
-            setError({ ...error, group: true });
+      } else if (cat === "title") {
-         } else {
-            setError({ ...error, group: false });
-         }
-      } else if (cat == "title") {
          setDataForm({ ...dataForm, title: val });
-         if (val == "" || val == "null") {
+         setError({ ...error, title: val === "" || val === "null" });
-            setError({ ...error, title: true });
+      } else if (cat === "desc") {
-         } else {
-            setError({ ...error, title: false });
-         }
-      } else if (cat == "desc") {
          setDataForm({ ...dataForm, desc: val });
-         if (val == "" || val == "null") {
+         setError({ ...error, desc: val === "" || val === "null" });
-            setError({ ...error, desc: true });
-         } else {
-            setError({ ...error, desc: false });
-         }
       }
    }
 
    function checkForm() {
-      if (
+      const hasError = Object.values(error).some(v => v)
-         Object.values(error).some((v) => v == true) ||
+      const hasEmpty = Object.values(dataForm).some(v => v === "")
-         Object.values(dataForm).some((v) => v == "")
+      setDisableBtn(hasError || hasEmpty);
-      ) {
+   }
-         setDisableBtn(true);
+
+   useEffect(() => { checkForm() }, [error, dataForm]);
+   useEffect(() => { dispatch(setMemberChoose([])) }, [])
+
+   function handleOpenMemberPicker() {
+      if (entityUser.role === "supadmin" || entityUser.role === "developer") {
+         if (chooseGroup.val !== "") {
+            setSelect(true);
+            setValSelect("member");
+         } else {
+            Toast.show({ type: 'small', text1: 'Pilih Lembaga Desa terlebih dahulu' })
+         }
       } else {
-         setDisableBtn(false);
+         validationForm('group', userLogin.idGroup, userLogin.group);
+         setValChoose(userLogin.idGroup)
+         setSelect(true);
+         setValSelect("member");
       }
    }
 
-   useEffect(() => {
-      checkForm();
-   }, [error, dataForm]);
-
-   useEffect(() => {
-      dispatch(setMemberChoose([]))
-   }, [])
-
-   function handleBack() {
-      dispatch(setMemberChoose([]))
-      router.back()
-   }
-
    const pickDocumentAsync = async () => {
-      let result = await DocumentPicker.getDocumentAsync({
+      const result = await DocumentPicker.getDocumentAsync({ type: ["*/*"], multiple: true });
-         type: ["*/*"],
-         multiple: true
-      });
       if (!result.canceled) {
-         for (let i = 0; i < result.assets?.length; i++) {
+         let skipped = 0
-            if (result.assets[i].uri) {
+         for (const asset of result.assets) {
-               setFileForm((prev) => [...prev, result.assets[i]])
+            if (!asset.uri) continue
+            if (fileForm.some(f => f.name === asset.name)) {
+               skipped++
+            } else {
+               setFileForm(prev => [...prev, asset])
             }
          }
+         if (skipped > 0) Toast.show({ type: 'small', text1: 'Beberapa file sudah ditambahkan' })
       }
    };
 
    function deleteFile(index: number) {
-      setFileForm([...fileForm.filter((val, i) => i !== index)])
+      setFileForm(fileForm.filter((_, i) => i !== index))
       setModalFile(false)
    }
 
@@ -129,38 +129,22 @@ export default function CreateDiscussionGeneral() {
          setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const fd = new FormData()
-
          for (let i = 0; i < fileForm.length; i++) {
-            fd.append(`file${i}`, {
+            fd.append(`file${i}`, { uri: fileForm[i].uri, type: 'application/octet-stream', name: fileForm[i].name } as any);
-               uri: fileForm[i].uri,
-               type: 'application/octet-stream',
-               name: fileForm[i].name,
-            } as any);
          }
-
+         fd.append("data", JSON.stringify({ ...dataForm, user: hasil, member: entitiesMember }))
-         fd.append("data", JSON.stringify(
-            { ...dataForm, user: hasil, member: entitiesMember }
-         ))
-
          const response = await apiCreateDiscussionGeneral(fd)
-
-         // const response = await apiCreateDiscussionGeneral({
-         //    data: { ...dataForm, user: hasil, member: entitiesMember },
-         // })
-
          if (response.success) {
             dispatch(setMemberChoose([]))
             dispatch(setUpdateDiscussionGeneralDetail(!update))
-            Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
+            Toast.show({ type: 'small', text1: 'Berhasil menambahkan data' })
             router.back()
          } else {
-            Toast.show({ type: 'small', text1: response.message, })
+            Toast.show({ type: 'small', text1: response.message })
          }
       } catch (error: any) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal menambahkan data"
+         Toast.show({ type: 'small', text1: error?.response?.data?.message || "Gagal menambahkan data" })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
@@ -170,36 +154,18 @@ export default function CreateDiscussionGeneral() {
       <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
          <Stack.Screen
             options={{
-               // headerLeft: () => (
-               //    <ButtonBackHeader
-               //       onPress={() => { handleBack() }}
-               //    />
-               // ),
-               headerTitle: "Tambah Diskusi",
-               headerTitleAlign: "center",
-               // headerRight: () => (
-               //    <ButtonSaveHeader
-               //       category="create"
-               //       disable={disableBtn || loading ? true : false}
-               //       onPress={() => {
-               //          entitiesMember.length == 0
-               //             ? Toast.show({ type: 'small', text1: 'Anda belum memilih anggota', })
-               //             : handleCreate()
-               //       }}
-               //    />
-               // ),
                header: () => (
                   <AppHeader
                      title="Tambah Diskusi"
                      showBack={true}
-                     onPressLeft={() => router.back()}
+                     onPressLeft={() => { dispatch(setMemberChoose([])); router.back() }}
                      right={
                         <ButtonSaveHeader
                            category="create"
-                           disable={disableBtn || loading ? true : false}
+                           disable={disableBtn || entitiesMember.length === 0 || loading}
                            onPress={() => {
-                              entitiesMember.length == 0
+                              entitiesMember.length === 0
-                                 ? Toast.show({ type: 'small', text1: 'Anda belum memilih anggota', })
+                                 ? Toast.show({ type: 'small', text1: 'Anda belum memilih anggota' })
                                  : handleCreate()
                            }}
                         />
@@ -211,25 +177,20 @@ export default function CreateDiscussionGeneral() {
          {loading && <LoadingCenter />}
          <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100, Styles.flex1, { backgroundColor: colors.background }]}>
             <View style={[Styles.p15, Styles.mb100]}>
-               {
+
-                  (entityUser.role == "supadmin" ||
+               {(entityUser.role === "supadmin" || entityUser.role === "developer") && (
-                     entityUser.role == "developer") && (
+                  <SelectForm
-                     <SelectForm
+                     label="Lembaga Desa"
-                        label="Lembaga Desa"
+                     placeholder="Pilih Lembaga Desa"
-                        placeholder="Pilih Lembaga Desa"
+                     value={chooseGroup.label}
-                        value={chooseGroup.label}
+                     required
-                        required
+                     bg={colors.card}
-                        bg={colors.card}
+                     onPress={() => { setValChoose(chooseGroup.val); setValSelect("group"); setSelect(true) }}
-                        onPress={() => {
+                     error={error.group}
-                           setValChoose(chooseGroup.val);
+                     errorText="Lembaga Desa tidak boleh kosong"
-                           setValSelect("group");
+                  />
-                           setSelect(true);
+               )}
-                        }}
+
-                        error={error.group}
-                        errorText="Lembaga Desa tidak boleh kosong"
-                     />
-                  )
-               }
                <InputForm
                   label="Judul"
                   type="default"
@@ -238,8 +199,9 @@ export default function CreateDiscussionGeneral() {
                   error={error.title}
                   bg={colors.card}
                   errorText="Judul tidak boleh kosong"
-                  onChange={(val) => { validationForm("title", val) }}
+                  onChange={(val) => validationForm("title", val)}
                />
+
                <InputForm
                   label="Diskusi"
                   type="default"
@@ -248,93 +210,107 @@ export default function CreateDiscussionGeneral() {
                   error={error.desc}
                   bg={colors.card}
                   errorText="Diskusi tidak boleh kosong"
-                  onChange={(val) => { validationForm("desc", val) }}
+                  onChange={(val) => validationForm("desc", val)}
                   multiline
                />
-               <ButtonSelect value="Upload File" onPress={pickDocumentAsync} />
+
-               {
+               {/* File */}
-                  fileForm.length > 0
+               <View style={[Styles.wrapPaper, Styles.mb15, Styles.sectionCard,
-                  &&
+                  { backgroundColor: colors.card, borderColor: colors.icon + '18' }]}>
-                  <>
+                  <Pressable
-                     <View style={[Styles.rowSpaceBetween, Styles.mv05]}>
+                     onPress={pickDocumentAsync}
-                        <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                     style={[Styles.sectionActionRow, { marginBottom: fileForm.length > 0 ? 12 : 0 }]}
-                        <Text style={[Styles.textDefault]}>{fileForm.length} file</Text>
+                  >
+                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.icon + '15' }]}>
+                        <MaterialCommunityIcons name="paperclip" size={18} color={colors.dimmed} />
                      </View>
-                     <View style={[Styles.borderAll, Styles.round05, Styles.p10, Styles.mb10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+                     <View style={Styles.flex1}>
-                        {
+                        <Text style={[Styles.textDefaultSemiBold, { color: colors.text }]}>File</Text>
-                           fileForm.map((item, index) => (
+                        {fileForm.length === 0 && (
-                              <BorderBottomItem
+                           <Text style={[Styles.textMediumNormal, { color: colors.dimmed }]}>Opsional — ketuk untuk upload</Text>
+                        )}
+                     </View>
+                     {fileForm.length > 0 && (
+                        <View style={[Styles.sectionBadge, { backgroundColor: colors.dimmed + '18' }]}>
+                           <Text style={[Styles.textSmallSemiBold, { color: colors.dimmed }]}>{fileForm.length} file</Text>
+                        </View>
+                     )}
+                     <MaterialCommunityIcons name="chevron-right" size={18} color={colors.dimmed} />
+                  </Pressable>
+                  {fileForm.length > 0 && (
+                     <View style={Styles.fileGrid}>
+                        {fileForm.map((item, index) => {
+                           const ext = item.name.split('.').pop()?.toLowerCase() ?? ''
+                           const baseName = item.name.includes('.') ? item.name.split('.').slice(0, -1).join('.') : item.name
+                           const iconName = getFileIcon(ext)
+                           const iconColor = getFileColor(ext)
+                           return (
+                              <Pressable
                                  key={index}
-                                 borderType={fileForm.length - 1 == index ? "none" : "bottom"}
-                                 icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
-                                 title={item.name}
-                                 bgColor="transparent"
-                                 titleWeight="normal"
                                  onPress={() => { setIndexDelFile(index); setModalFile(true) }}
-                              />
+                                 style={[Styles.fileCard, { backgroundColor: 'transparent', borderColor: colors.icon + '18' }]}
-                           ))
+                              >
-                        }
+                                 <View style={[Styles.sectionIconBox, { backgroundColor: iconColor + '20' }]}>
+                                    <MaterialCommunityIcons name={iconName} size={18} color={iconColor} />
+                                 </View>
+                                 <View style={Styles.flex1}>
+                                    <Text style={Styles.textDefault} numberOfLines={1}>{baseName}</Text>
+                                    <Text style={[Styles.textSmallSemiBold, { color: colors.dimmed }]}>{ext.toUpperCase()}</Text>
+                                 </View>
+                              </Pressable>
+                           )
+                        })}
                      </View>
-                  </>
+                  )}
-               }
+               </View>
-               <ButtonSelect
-                  value="Pilih Anggota"
-                  onPress={() => {
-                     if (entityUser.role == "supadmin" || entityUser.role == "developer") {
-                        if (chooseGroup.val != "") {
-                           setSelect(true);
-                           setValSelect("member");
-                        } else {
-                           Toast.show({ type: 'small', text1: 'Pilih Lembaga Desa terlebih dahulu', })
-                        }
-                     } else {
-                        validationForm('group', userLogin.idGroup, userLogin.group);
-                        setValChoose(userLogin.idGroup)
-                        setSelect(true);
-                        setValSelect("member");
-                     }
 
-                  }}
+               {/* Anggota */}
-               />
+               <View style={[Styles.wrapPaper, Styles.mb15, Styles.sectionCard,
-               {
+                  { backgroundColor: colors.card, borderColor: colors.icon + '18' }]}>
-                  entitiesMember.length > 0 &&
+                  <Pressable
-                  <View>
+                     onPress={handleOpenMemberPicker}
-                     <View style={[Styles.rowSpaceBetween, Styles.mv05]}>
+                     style={[Styles.sectionActionRow, { marginBottom: entitiesMember.length > 0 ? 12 : 0 }]}
-                        <Text style={[Styles.textDefaultSemiBold]}>Anggota</Text>
+                  >
-                        <Text style={[Styles.textDefault]}>{entitiesMember.length} Anggota</Text>
+                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.tabActive + '18' }]}>
+                        <MaterialIcons name="people" size={18} color={colors.tabActive} />
                      </View>
+                     <View style={Styles.flex1}>
+                        <Text style={[Styles.textDefaultSemiBold, { color: colors.text }]}>Anggota</Text>
+                        {entitiesMember.length === 0 && (
+                           <Text style={[Styles.textMediumNormal, { color: colors.dimmed }]}>Belum ada anggota dipilih</Text>
+                        )}
+                     </View>
+                     {entitiesMember.length > 0 && (
+                        <View style={[Styles.sectionBadge, { backgroundColor: colors.tabActive + '18' }]}>
+                           <Text style={[Styles.textSmallSemiBold, { color: colors.tabActive }]}>{entitiesMember.length} anggota</Text>
+                        </View>
+                     )}
+                     <MaterialCommunityIcons name="chevron-right" size={18} color={colors.dimmed} />
+                  </Pressable>
+                  {entitiesMember.length > 0 && (
+                     <View style={{ gap: 6 }}>
+                        {entitiesMember.map((item: any, index: number) => (
+                           <View key={index} style={[Styles.listItemCard, { borderColor: colors.icon + '18' }]}>
+                              <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="xs" />
+                              <Text style={[Styles.textDefault, Styles.flex1, { color: colors.text }]} numberOfLines={1}>
+                                 {item.name}
+                              </Text>
+                           </View>
+                        ))}
+                     </View>
+                  )}
+               </View>
 
-                     <View style={[Styles.borderAll, Styles.round05, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
-                        {
-                           entitiesMember.map((item: { img: any; name: any; }, index: any) => {
-                              return (
-                                 <BorderBottomItem
-                                    key={index}
-                                    borderType={entitiesMember.length - 1 == index ? "none" : "bottom"}
-                                    icon={
-                                       <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="xs" />
-                                    }
-                                    title={item.name}
-                                    bgColor="transparent"
-                                 />
-                              )
-                           })
-                        }
-                     </View>
-                  </View>
-               }
             </View>
          </ScrollView>
 
          <ModalSelect
             category={valSelect}
             close={setSelect}
-            onSelect={(value) => {
+            onSelect={(value) => validationForm(valSelect, value.val, value.label)}
-               validationForm(valSelect, value.val, value.label);
+            title={valSelect === "group" ? "Lembaga Desa" : "Pilih Anggota"}
-            }}
-            title={valSelect == "group" ? "Lembaga Desa" : "Pilih Anggota"}
             open={isSelect}
-            idParent={valSelect == "member" ? chooseGroup.val : ""}
+            idParent={valSelect === "member" ? chooseGroup.val : ""}
             valChoose={valChoose}
          />
 
@@ -343,7 +319,7 @@ export default function CreateDiscussionGeneral() {
                <MenuItemRow
                   icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
                   title="Hapus"
-                  onPress={() => { deleteFile(indexDelFile) }}
+                  onPress={() => deleteFile(indexDelFile)}
                />
             </View>
          </DrawerBottom>

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

@@ -1,12 +1,10 @@
 import AppHeader from "@/components/AppHeader";
-import Text from "@/components/Text";
-import BorderBottomItem from "@/components/borderBottomItem";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
-import ButtonSelect from "@/components/buttonSelect";
 import DrawerBottom from "@/components/drawerBottom";
 import { InputForm } from "@/components/inputForm";
 import LoadingCenter from "@/components/loadingCenter";
 import MenuItemRow from "@/components/menuItemRow";
+import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
 import { apiEditDiscussionGeneral, apiGetDiscussionGeneralOne } from "@/lib/api";
 import { setUpdateDiscussionGeneralDetail } from "@/lib/discussionGeneralDetail";
@@ -16,10 +14,30 @@ 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, 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";
 
+function getFileIcon(ext: string): keyof typeof MaterialCommunityIcons.glyphMap {
+   if (['jpg', 'jpeg', 'png', 'gif', 'webp', 'heic', 'heif'].includes(ext)) return 'image-outline'
+   if (ext === 'pdf') return 'file-pdf-box'
+   if (['mp4', 'mov', 'avi', 'mkv'].includes(ext)) return 'video-outline'
+   if (['doc', 'docx'].includes(ext)) return 'file-word-outline'
+   if (['xls', 'xlsx'].includes(ext)) return 'file-excel-outline'
+   if (['zip', 'rar', '7z'].includes(ext)) return 'zip-box-outline'
+   return 'file-outline'
+}
+
+function getFileColor(ext: string): string {
+   if (['jpg', 'jpeg', 'png', 'gif', 'webp', 'heic', 'heif'].includes(ext)) return '#339AF0'
+   if (ext === 'pdf') return '#F03E3E'
+   if (['mp4', 'mov', 'avi', 'mkv'].includes(ext)) return '#AE3EC9'
+   if (['doc', 'docx'].includes(ext)) return '#1C7ED6'
+   if (['xls', 'xlsx'].includes(ext)) return '#2F9E44'
+   if (['zip', 'rar', '7z'].includes(ext)) return '#E8590C'
+   return '#868E96'
+}
+
 export default function EditDiscussionGeneral() {
    const { token, decryptToken } = useAuthSession();
    const { colors } = useTheme();
@@ -32,136 +50,91 @@ export default function EditDiscussionGeneral() {
    const [indexDelFile, setIndexDelFile] = useState<{ id: string | number; cat: "newFile" | "oldFile" }>({ id: "", cat: "newFile" })
    const [dataFile, setDataFile] = useState<{ id: string; idStorage: string; name: string; extension: string; delete?: boolean }[]>([])
    const update = useSelector((state: any) => state.discussionGeneralDetailUpdate)
-   const [dataForm, setDataForm] = useState({
+   const [dataForm, setDataForm] = useState({ title: "", desc: "" });
-      title: "",
+   const [error, setError] = useState({ title: false, desc: false })
-      desc: "",
+
-   });
+   const visibleOldFiles = dataFile.filter(v => !v.delete)
-   const [error, setError] = useState({
+   const totalFiles = fileForm.length + visibleOldFiles.length
-      title: false,
-      desc: false,
-   })
 
    async function handleLoad() {
       try {
          const hasil = await decryptToken(String(token?.current));
-         const response = await apiGetDiscussionGeneralOne({
+         const response = await apiGetDiscussionGeneralOne({ id, user: hasil, cat: "detail" });
-            id: id,
+         const responseFile = await apiGetDiscussionGeneralOne({ id, user: hasil, cat: "file" });
-            user: hasil,
+         if (response.success) setDataForm(response.data);
-            cat: "detail",
+         if (responseFile.success) setDataFile(responseFile.data);
-         });
-         const responseFile = await apiGetDiscussionGeneralOne({
-            id: id,
-            user: hasil,
-            cat: "file",
-         });
-         if (response.success) {
-            setDataForm(response.data);
-         }
-         if (responseFile.success) {
-            setDataFile(responseFile.data);
-         }
       } catch (error) {
          console.error(error);
       }
    }
 
-
+   useEffect(() => { handleLoad() }, []);
-   useEffect(() => {
-      handleLoad();
-   }, []);
 
    function validationForm(cat: string, val: any) {
-      if (cat == "title") {
+      if (cat === "title") {
          setDataForm({ ...dataForm, title: val });
-         if (val == "" || val == "null") {
+         setError({ ...error, title: val === "" || val === "null" });
-            setError({ ...error, title: true });
+      } else if (cat === "desc") {
-         } else {
-            setError({ ...error, title: false });
-         }
-      } else if (cat == "desc") {
          setDataForm({ ...dataForm, desc: val });
-         if (val == "" || val == "null") {
+         setError({ ...error, desc: val === "" || val === "null" });
-            setError({ ...error, desc: true });
-         } else {
-            setError({ ...error, desc: false });
-         }
       }
    }
 
    function checkForm() {
-      if (Object.values(error).some((v) => v == true) == true || Object.values(dataForm).some((v) => v == "") == true) {
+      const hasError = Object.values(error).some(v => v)
-         setDisableBtn(true)
+      const hasEmpty = Object.values(dataForm).some(v => v === "")
-      } else {
+      setDisableBtn(hasError || hasEmpty);
-         setDisableBtn(false)
-      }
    }
 
-   useEffect(() => {
+   useEffect(() => { checkForm() }, [error, dataForm])
-      checkForm()
-   }, [error, dataForm])
 
    const pickDocumentAsync = async () => {
-      let result = await DocumentPicker.getDocumentAsync({
+      const result = await DocumentPicker.getDocumentAsync({ type: ["*/*"], multiple: true });
-         type: ["*/*"],
-         multiple: true
-      });
       if (!result.canceled) {
-         for (let i = 0; i < result.assets?.length; i++) {
+         let skipped = 0
-            if (result.assets[i].uri) {
+         for (const asset of result.assets) {
-               setFileForm((prev) => [...prev, result.assets[i]])
+            if (!asset.uri) continue
+            const isDup = fileForm.some(f => f.name === asset.name) ||
+               visibleOldFiles.some(f => `${f.name}.${f.extension}` === asset.name)
+            if (isDup) {
+               skipped++
+            } else {
+               setFileForm(prev => [...prev, asset])
             }
          }
+         if (skipped > 0) Toast.show({ type: 'small', text1: 'Beberapa file sudah ditambahkan' })
       }
    };
 
    function deleteFile(index: number | string, cat: "newFile" | "oldFile" | null) {
-      if (cat == "newFile") {
+      if (cat === "newFile") {
-         setFileForm([...fileForm.filter((val, i) => i !== index)])
+         setFileForm(fileForm.filter((_, i) => i !== index))
       } else {
-         setDataFile(prev =>
+         setDataFile(prev => prev.map(item => item.id === index ? { ...item, delete: true } : item))
-            prev.map(item =>
-               item.id === index
-                  ? { ...item, delete: true }
-                  : item
-            )
-         );
       }
       setModalFile(false)
    }
 
-
    async function handleEdit() {
       try {
          setLoading(true)
          const hasil = await decryptToken(String(token?.current));
          const fd = new FormData()
          for (let i = 0; i < fileForm.length; i++) {
-            fd.append(`file${i}`, {
+            fd.append(`file${i}`, { uri: fileForm[i].uri, type: 'application/octet-stream', name: fileForm[i].name } as any);
-               uri: fileForm[i].uri,
-               type: 'application/octet-stream',
-               name: fileForm[i].name,
-            } as any);
          }
-
+         fd.append("data", JSON.stringify({ user: hasil, title: dataForm.title, desc: dataForm.desc, oldFile: dataFile }))
-         fd.append("data", JSON.stringify(
-            {
-               user: hasil, title: dataForm.title, desc: dataForm.desc, oldFile: dataFile
-            }
-         ))
-
          const response = await apiEditDiscussionGeneral(fd, id);
          if (response.success) {
             dispatch(setUpdateDiscussionGeneralDetail(!update))
-            Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
+            Toast.show({ type: 'small', text1: 'Berhasil mengubah data' })
             router.back();
          } else {
-            Toast.show({ type: 'small', text1: 'Gagal mengubah data', })
+            Toast.show({ type: 'small', text1: 'Gagal mengubah data' })
          }
       } catch (error: any) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal mengubah data"
+         Toast.show({ type: 'small', text1: error?.response?.data?.message || "Gagal mengubah data" })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
@@ -171,22 +144,6 @@ export default function EditDiscussionGeneral() {
       <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
          <Stack.Screen
             options={{
-               // headerLeft: () => (
-               //    <ButtonBackHeader
-               //       onPress={() => {
-               //          router.back();
-               //       }}
-               //    />
-               // ),
-               headerTitle: "Edit Diskusi",
-               headerTitleAlign: "center",
-               // headerRight: () => (
-               //    <ButtonSaveHeader
-               //       disable={disableBtn || loading ? true : false}
-               //       category="update"
-               //       onPress={() => { handleEdit() }}
-               //    />
-               // ),
                header: () => (
                   <AppHeader
                      title="Edit Diskusi"
@@ -194,9 +151,9 @@ export default function EditDiscussionGeneral() {
                      onPressLeft={() => router.back()}
                      right={
                         <ButtonSaveHeader
-                           disable={disableBtn || loading ? true : false}
+                           disable={disableBtn || loading}
                            category="update"
-                           onPress={() => { handleEdit() }}
+                           onPress={() => handleEdit()}
                         />
                      }
                   />
@@ -205,7 +162,8 @@ export default function EditDiscussionGeneral() {
          />
          {loading && <LoadingCenter />}
          <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100, Styles.flex1, { backgroundColor: colors.background }]}>
-            <View style={[Styles.p15]}>
+            <View style={Styles.p15}>
+
                <InputForm
                   label="Judul"
                   type="default"
@@ -217,6 +175,7 @@ export default function EditDiscussionGeneral() {
                   errorText="Judul tidak boleh kosong"
                   onChange={(val) => validationForm("title", val)}
                />
+
                <InputForm
                   label="Diskusi"
                   type="default"
@@ -229,45 +188,77 @@ export default function EditDiscussionGeneral() {
                   onChange={(val) => validationForm("desc", val)}
                   multiline
                />
-               <ButtonSelect value="Upload File" onPress={pickDocumentAsync} />
+
-               {
+               {/* File */}
-                  (fileForm.length > 0 || dataFile.filter((val) => !val.delete).length > 0)
+               <View style={[Styles.wrapPaper, Styles.mb15, Styles.sectionCard,
-                  &&
+                  { backgroundColor: colors.card, borderColor: colors.icon + '18' }]}>
-                  <>
+                  <Pressable
-                     <View style={[Styles.rowSpaceBetween, Styles.mv05]}>
+                     onPress={pickDocumentAsync}
-                        <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                     style={[Styles.sectionActionRow, { marginBottom: totalFiles > 0 ? 12 : 0 }]}
-                        <Text style={[Styles.textDefault]}>{fileForm.length + dataFile.filter((val) => !val.delete).length} file</Text>
+                  >
+                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.icon + '15' }]}>
+                        <MaterialCommunityIcons name="paperclip" size={18} color={colors.dimmed} />
                      </View>
-                     <View style={[Styles.borderAll, Styles.round05, Styles.p10, Styles.mb10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+                     <View style={Styles.flex1}>
-                        {
+                        <Text style={[Styles.textDefaultSemiBold, { color: colors.text }]}>File</Text>
-                           dataFile.filter((val) => !val.delete).map((item, index) => (
+                        {totalFiles === 0 && (
-                              <BorderBottomItem
+                           <Text style={[Styles.textMediumNormal, { color: colors.dimmed }]}>Opsional — ketuk untuk upload</Text>
-                                 key={index}
+                        )}
-                                 borderType={dataFile.filter((val) => !val.delete).length - 1 == index && fileForm.length == 0 ? "none" : "bottom"}
+                     </View>
-                                 icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
+                     {totalFiles > 0 && (
-                                 title={item.name + '.' + item.extension}
+                        <View style={[Styles.sectionBadge, { backgroundColor: colors.dimmed + '18' }]}>
-                                 titleWeight="normal"
+                           <Text style={[Styles.textSmallSemiBold, { color: colors.dimmed }]}>{totalFiles} file</Text>
-                                 bgColor="transparent"
+                        </View>
+                     )}
+                     <MaterialCommunityIcons name="chevron-right" size={18} color={colors.dimmed} />
+                  </Pressable>
+                  {totalFiles > 0 && (
+                     <View style={Styles.fileGrid}>
+                        {visibleOldFiles.map((item, index) => {
+                           const ext = item.extension.toLowerCase()
+                           const iconName = getFileIcon(ext)
+                           const iconColor = getFileColor(ext)
+                           return (
+                              <Pressable
+                                 key={`old-${index}`}
                                  onPress={() => { setIndexDelFile({ id: item.id, cat: "oldFile" }); setModalFile(true) }}
-                              />
+                                 style={[Styles.fileCard, { backgroundColor: 'transparent', borderColor: colors.icon + '18' }]}
-                           ))
+                              >
-                        }
+                                 <View style={[Styles.sectionIconBox, { backgroundColor: iconColor + '20' }]}>
-                        {
+                                    <MaterialCommunityIcons name={iconName} size={18} color={iconColor} />
-                           fileForm.map((item, index) => (
+                                 </View>
-                              <BorderBottomItem
+                                 <View style={Styles.flex1}>
-                                 key={index}
+                                    <Text style={Styles.textDefault} numberOfLines={1}>{item.name}</Text>
-                                 borderType={fileForm.length - 1 == index ? "none" : "bottom"}
+                                    <Text style={[Styles.textSmallSemiBold, { color: colors.dimmed }]}>{ext.toUpperCase()}</Text>
-                                 icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
+                                 </View>
-                                 title={item.name}
+                              </Pressable>
-                                 titleWeight="normal"
+                           )
-                                 bgColor="transparent"
+                        })}
+                        {fileForm.map((item, index) => {
+                           const ext = item.name.split('.').pop()?.toLowerCase() ?? ''
+                           const baseName = item.name.includes('.') ? item.name.split('.').slice(0, -1).join('.') : item.name
+                           const iconName = getFileIcon(ext)
+                           const iconColor = getFileColor(ext)
+                           return (
+                              <Pressable
+                                 key={`new-${index}`}
                                  onPress={() => { setIndexDelFile({ id: index, cat: "newFile" }); setModalFile(true) }}
-                              />
+                                 style={[Styles.fileCard, { backgroundColor: 'transparent', borderColor: colors.icon + '18' }]}
-                           ))
+                              >
-                        }
+                                 <View style={[Styles.sectionIconBox, { backgroundColor: iconColor + '20' }]}>
+                                    <MaterialCommunityIcons name={iconName} size={18} color={iconColor} />
+                                 </View>
+                                 <View style={Styles.flex1}>
+                                    <Text style={Styles.textDefault} numberOfLines={1}>{baseName}</Text>
+                                    <Text style={[Styles.textSmallSemiBold, { color: colors.dimmed }]}>{ext.toUpperCase()}</Text>
+                                 </View>
+                              </Pressable>
+                           )
+                        })}
                      </View>
-                  </>
+                  )}
-               }
+               </View>
+
             </View>
          </ScrollView>
 
@@ -276,7 +267,7 @@ export default function EditDiscussionGeneral() {
                <MenuItemRow
                   icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
                   title="Hapus"
-                  onPress={() => { deleteFile(indexDelFile.id, indexDelFile.cat) }}
+                  onPress={() => deleteFile(indexDelFile.id, indexDelFile.cat)}
                />
             </View>
          </DrawerBottom>

app/(application)/discussion/index.tsx

@@ -87,11 +87,24 @@ export default function Discussion() {
 
    const isOpen = (item: Props) => item.status === 1
 
+   const themed = {
+      background:       { backgroundColor: colors.background },
+      card:             { backgroundColor: colors.card, borderColor: colors.icon + '20' },
+      cardPressed:      { backgroundColor: colors.icon + '10' },
+      iconCircle:       { backgroundColor: colors.icon + '20' },
+      title:            { color: colors.text },
+      dimmed:           { color: colors.dimmed },
+      statusOpen:       { borderColor: '#10B981' as const },
+      statusClosed:     { borderColor: colors.dimmed + '80' },
+      statusTextOpen:   { color: '#10B981' as const },
+      statusTextClosed: { color: colors.dimmed },
+   }
+
    return (
-      <View style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <View style={[Styles.flex1, themed.background]}>
          <GuideOverlay visible={guideVisible} steps={GUIDE_DISCUSSION} onDismiss={dismissGuide} />
          {/* Header controls */}
-         <View style={[Styles.ph15, { paddingTop: 12 }]}>
+         <View style={[Styles.ph15, Styles.discussionHeaderPadding]}>
             {entityUser.role != "user" && entityUser.role != "coadmin" && (
                <WrapTab>
                   <ButtonTab
@@ -114,21 +127,21 @@ export default function Discussion() {
             )}
             <InputSearch onChange={setSearch} />
             {(entityUser.role == "supadmin" || entityUser.role == "developer") && (
-               <View style={[Styles.mv05, Styles.rowItemsCenter]}>
+               <View style={[Styles.mt10, Styles.rowOnly]}>
-                  <Text style={{ color: colors.dimmed, fontSize: 12 }}>Filter:</Text>
+                  <Text>Filter :</Text>
                   <LabelStatus size="small" category="secondary" text={nameGroup} style={[Styles.mh05]} />
                </View>
             )}
          </View>
 
          {/* List */}
-         <View style={[Styles.flex1, Styles.ph15, { paddingTop: 8 }]}>
+         <View style={[Styles.flex1, Styles.ph15, Styles.discussionListPadding]}>
             {isLoading ? (
                [0, 1, 2, 3, 4].map((_, i) => <SkeletonContent key={i} />)
             ) : flatData.length === 0 ? (
                <View style={[Styles.contentItemCenter, Styles.mt30]}>
                   <Feather name="message-circle" size={42} color={colors.icon + '40'} />
-                  <Text style={[Styles.mt10, { color: colors.dimmed, fontSize: 14 }]}>
+                  <Text style={[Styles.mt10, Styles.discussionEmptyText, themed.dimmed]}>
                      Tidak ada diskusi
                   </Text>
                </View>
@@ -154,27 +167,25 @@ export default function Discussion() {
                         onPress={() => router.push(`/discussion/${item.id}`)}
                         style={({ pressed }) => [
                            Styles.discussionCard,
-                           {
+                           themed.card,
-                              backgroundColor: pressed ? colors.icon + '10' : colors.card,
+                           pressed && themed.cardPressed,
-                              borderColor: colors.icon + '20',
-                           }
                         ]}
                      >
                         {/* Top row: icon + title + status badge */}
                         <View style={[Styles.rowItemsCenter, Styles.mb08]}>
                            {/* Discussion icon */}
-                           <View style={[Styles.discussionIconCircle, { backgroundColor: colors.icon + '20' }]}>
+                           <View style={[Styles.discussionIconCircle, themed.iconCircle]}>
                               <Feather name="message-circle" size={20} color={colors.icon} />
                            </View>
 
                            {/* Title + status badge */}
-                           <View style={[Styles.flex1, { marginLeft: 10 }]}>
+                           <View style={[Styles.flex1, Styles.discussionTitleCol]}>
-                              <Text style={[Styles.textDefaultSemiBold, { color: colors.text }]} numberOfLines={1}>
+                              <Text style={[Styles.textDefaultSemiBold, themed.title]} numberOfLines={1}>
                                  {item.title}
                               </Text>
                               {status !== "false" && (
-                                 <View style={[Styles.discussionStatusPill, { borderColor: isOpen(item) ? '#10B981' : colors.dimmed + '80' }]}>
+                                 <View style={[Styles.discussionStatusPill, isOpen(item) ? themed.statusOpen : themed.statusClosed]}>
-                                    <Text style={[Styles.discussionStatusText, { color: isOpen(item) ? '#10B981' : colors.dimmed }]}>
+                                    <Text style={[Styles.discussionStatusText, isOpen(item) ? themed.statusTextOpen : themed.statusTextClosed]}>
                                        {isOpen(item) ? 'Buka' : 'Tutup'}
                                     </Text>
                                  </View>
@@ -185,7 +196,7 @@ export default function Discussion() {
                         {/* Description */}
                         {item.desc ? (
                            <Text
-                              style={[Styles.textMediumNormal, Styles.discussionCardIndent, { color: colors.dimmed, marginBottom: 10 }]}
+                              style={[Styles.textMediumNormal, Styles.discussionCardIndent, Styles.discussionDescMargin, themed.title]}
                               numberOfLines={2}
                            >
                               {item.desc.replace(/<[^>]*>?/gm, ' ').replace(/\r?\n|\r/g, ' ')}
@@ -196,11 +207,11 @@ export default function Discussion() {
                         <View style={[Styles.rowItemsCenter, Styles.rowSpaceBetween, Styles.discussionCardIndent]}>
                            <View style={Styles.rowItemsCenter}>
                               <Feather name="message-square" size={14} color={colors.dimmed} />
-                              <Text style={[Styles.discussionCommentText, { color: colors.dimmed }]}>
+                              <Text style={[Styles.discussionCommentText, themed.dimmed]}>
                                  {item.total_komentar} Komentar
                               </Text>
                            </View>
-                           <Text style={[Styles.discussionDateText, { color: colors.dimmed }]}>
+                           <Text style={[Styles.discussionDateText, themed.dimmed]}>
                               {item.createdAt}
                            </Text>
                         </View>

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

@@ -1,21 +1,18 @@
 import AppHeader from "@/components/AppHeader";
-import BorderBottomItem from "@/components/borderBottomItem";
 import DrawerBottom from "@/components/drawerBottom";
 import ImageUser from "@/components/imageNew";
 import MenuItemRow from "@/components/menuItemRow";
 import ModalConfirmation from "@/components/ModalConfirmation";
-import SkeletonTwoItem from "@/components/skeletonTwoItem";
 import Text from '@/components/Text';
-import { ColorsStatus } from "@/constants/ColorsStatus";
 import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiDeleteMemberDiscussionGeneral, apiGetDiscussionGeneralOne } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { useTheme } from "@/providers/ThemeProvider";
-import { Feather, MaterialCommunityIcons } from "@expo/vector-icons";
+import { MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { SafeAreaView, ScrollView, View } from "react-native";
+import { Pressable, SafeAreaView, ScrollView, View } from "react-native";
 import Toast from "react-native-toast-message";
 import { useSelector } from "react-redux";
 
@@ -25,6 +22,8 @@ type Props = {
    img: string
 }
 
+const SKELETON_COUNT = 5
+
 export default function MemberDiscussionDetail() {
    const { token, decryptToken } = useAuthSession()
    const { colors } = useTheme();
@@ -35,13 +34,12 @@ export default function MemberDiscussionDetail() {
    const [chooseUser, setChooseUser] = useState({ idUser: '', name: '', img: '' })
    const update = useSelector((state: any) => state.discussionGeneralDetailUpdate)
    const [loading, setLoading] = useState(true)
-   const arrSkeleton = Array.from({ length: 5 }, (_, index) => index)
    const [showDeleteModal, setShowDeleteModal] = useState(false)
+   const canManage = entityUser.role !== "user" && entityUser.role !== "coadmin"
 
-
+   async function handleLoad(showLoadingIndicator: boolean) {
-   async function handleLoad(loading: boolean) {
       try {
-         setLoading(loading)
+         setLoading(showLoadingIndicator)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiGetDiscussionGeneralOne({ id: id, user: hasil, cat: 'anggota' })
          setData(response.data)
@@ -52,26 +50,18 @@ export default function MemberDiscussionDetail() {
       }
    }
 
-   useEffect(() => {
+   useEffect(() => { handleLoad(false) }, [update]);
-      handleLoad(false)
+   useEffect(() => { handleLoad(true) }, []);
-   }, [update]);
-
-
-   useEffect(() => {
-      handleLoad(true)
-   }, []);
 
    async function handleDeleteUser() {
       try {
          const hasil = await decryptToken(String(token?.current))
          await apiDeleteMemberDiscussionGeneral({ user: hasil, idUser: chooseUser.idUser }, id)
-         Toast.show({ type: 'small', text1: 'Berhasil mengeluarkan anggota dari diskusi', })
+         Toast.show({ type: 'small', text1: 'Berhasil mengeluarkan anggota dari diskusi' })
          handleLoad(false)
       } catch (error: any) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal mengeluarkan anggota"
+         Toast.show({ type: 'small', text1: error?.response?.data?.message || "Gagal mengeluarkan anggota" })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setModal(false)
       }
@@ -81,9 +71,6 @@ export default function MemberDiscussionDetail() {
       <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
          <Stack.Screen
             options={{
-               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
-               headerTitle: 'Anggota Diskusi',
-               headerTitleAlign: 'center',
                header: () => (
                   <AppHeader
                      title="Anggota Diskusi"
@@ -93,49 +80,82 @@ export default function MemberDiscussionDetail() {
                )
             }}
          />
-         <ScrollView style={[Styles.h100, Styles.flex1, { backgroundColor: colors.background }]}>
+         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100, Styles.flex1, { backgroundColor: colors.background }]}>
-            <View style={[Styles.p15]}>
+            <View style={[Styles.p15, Styles.mb100]}>
-               <Text style={[Styles.textDefault, Styles.mv05]}>{data.length} Anggota</Text>
+
-               <View style={[Styles.wrapPaper, { backgroundColor: colors.card, borderColor: colors.background }]}>
+               {/* Tombol tambah anggota */}
-                  {
+               {canManage && (
-                     entityUser.role != "user" && entityUser.role != "coadmin" &&
+                  <View style={[Styles.wrapPaper, Styles.sectionCard, Styles.mb15,
-                     <BorderBottomItem
+                     { backgroundColor: colors.card, borderColor: colors.icon + '18' }]}>
-                        onPress={() => { router.push(`/discussion/add-member/${id}`) }}
+                     <Pressable
-                        borderType="none"
+                        onPress={() => router.push(`/discussion/add-member/${id}`)}
-                        icon={
+                        style={Styles.sectionActionRow}
-                           <View style={[Styles.iconContent, ColorsStatus.gray]}>
+                     >
-                              <Feather name="user-plus" size={25} color={'#384288'} />
+                        <View style={[Styles.sectionIconBox, { backgroundColor: colors.icon + '18' }]}>
+                           <MaterialCommunityIcons name="account-plus-outline" size={18} color={colors.icon} />
+                        </View>
+                        <View style={Styles.flex1}>
+                           <Text style={[Styles.textDefaultSemiBold, { color: colors.text }]}>Tambah Anggota</Text>
+                        </View>
+                        <MaterialCommunityIcons name="chevron-right" size={18} color={colors.dimmed} />
+                     </Pressable>
+                  </View>
+               )}
+
+               {/* Full list */}
+               <View style={[Styles.wrapPaper, Styles.sectionCard,
+                  { backgroundColor: colors.card, borderColor: colors.icon + '18', padding: 0, overflow: 'hidden' }]}>
+                  <View style={[Styles.sectionActionRow, { padding: 16, borderBottomWidth: 1, borderBottomColor: colors.icon + '14' }]}>
+                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.dimmed + '18' }]}>
+                        <MaterialIcons name="people" size={18} color={colors.dimmed} />
+                     </View>
+                     <Text style={[Styles.textDefaultSemiBold, Styles.flex1, { color: colors.text }]}>Anggota</Text>
+                     {!loading && (
+                        <Text style={[Styles.textMediumNormal, { color: colors.dimmed }]}>{data.length} anggota</Text>
+                     )}
+                  </View>
+                  {loading
+                     ? Array.from({ length: SKELETON_COUNT }).map((_, i) => (
+                        <View
+                           key={i}
+                           style={[Styles.rowItemsCenter, Styles.ph15,
+                              { paddingVertical: 14, gap: 14, borderBottomWidth: i < SKELETON_COUNT - 1 ? 1 : 0, borderBottomColor: colors.icon + '14' }]}
+                        >
+                           <View style={[Styles.userProfileExtraSmall, { backgroundColor: colors.icon + '20', borderRadius: 100 }]} />
+                           <View style={{ height: 13, borderRadius: 6, flex: 1, backgroundColor: colors.icon + '20', maxWidth: 140 + (i % 3) * 30 }} />
+                        </View>
+                     ))
+                     : data.length === 0
+                        ? (
+                           <View style={[Styles.contentItemCenter, { paddingVertical: 40 }]}>
+                              <MaterialIcons name="people-outline" size={34} color={colors.icon + '50'} />
+                              <Text style={[Styles.textMediumNormal, Styles.mt10, { color: colors.dimmed }]}>Belum ada anggota</Text>
                            </View>
-                        }
+                        )
-                        title="Tambah Anggota"
+                        : data.map((item, index) => (
-                     />
+                           <Pressable
-                  }
+                              key={index}
-                  {
+                              onPress={() => { setChooseUser(item); setModal(true) }}
-                     loading ?
+                              style={({ pressed }) => [
-                        arrSkeleton.map((item, index) => {
+                                 Styles.rowItemsCenter, Styles.ph15,
-                           return (
+                                 {
-                              <SkeletonTwoItem key={index} />
+                                    paddingVertical: 13, gap: 14,
-                           )
+                                    borderBottomWidth: index < data.length - 1 ? 1 : 0,
-                        })
+                                    borderBottomColor: colors.icon + '14',
-                        :
+                                    backgroundColor: pressed ? colors.icon + '0E' : 'transparent',
-                        data.map((item, index) => {
+                                 },
-                           return (
+                              ]}
-                              <BorderBottomItem
+                           >
-                                 key={index}
+                              <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="xs" />
-                                 borderType="bottom"
+                              <Text style={[Styles.textDefault, Styles.flex1, { color: colors.text }]} numberOfLines={1}>
-                                 icon={
+                                 {item.name}
-                                    <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="sm" />
+                              </Text>
-                                 }
+                              <MaterialCommunityIcons name="chevron-right" size={18} color={colors.icon + '60'} />
-                                 title={item.name}
+                           </Pressable>
-                                 onPress={() => {
+                        ))
-                                    setChooseUser(item)
-                                    setModal(true)
-                                 }}
-                              />
-                           )
-                        })
                   }
                </View>
+
             </View>
          </ScrollView>
 
@@ -149,20 +169,16 @@ export default function MemberDiscussionDetail() {
                      router.push(`/member/${chooseUser.idUser}`)
                   }}
                />
-               {
+               {canManage && (
-                  entityUser.role != "user" && entityUser.role != "coadmin" &&
                   <MenuItemRow
                      icon={<MaterialCommunityIcons name="account-remove" color={colors.text} size={25} />}
                      title="Keluarkan"
                      onPress={() => {
                         setModal(false)
-                        setTimeout(() => {
+                        setTimeout(() => setShowDeleteModal(true), 600)
-                           setShowDeleteModal(true)
-                        }, 600)
                      }}
                   />
-               }
+               )}
-
             </View>
          </DrawerBottom>
 
@@ -170,10 +186,7 @@ export default function MemberDiscussionDetail() {
             visible={showDeleteModal}
             title="Konfirmasi"
             message="Apakah anda yakin ingin mengeluarkan anggota?"
-            onConfirm={() => {
+            onConfirm={() => { setShowDeleteModal(false); handleDeleteUser() }}
-               setShowDeleteModal(false)
-               handleDeleteUser()
-            }}
             onCancel={() => setShowDeleteModal(false)}
             confirmText="Hapus"
             cancelText="Batal"

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

@@ -1,12 +1,9 @@
-import ModalConfirmation from "@/components/ModalConfirmation"
 import AppHeader from "@/components/AppHeader"
-import BorderBottomItem from "@/components/borderBottomItem"
-import ButtonBackHeader from "@/components/buttonBackHeader"
-import HeaderRightCalendarDetail from "@/components/calendar/headerCalendarDetail"
 import DrawerBottom from "@/components/drawerBottom"
+import HeaderRightCalendarDetail from "@/components/calendar/headerCalendarDetail"
 import ImageUser from "@/components/imageNew"
 import MenuItemRow from "@/components/menuItemRow"
-import Skeleton from "@/components/skeleton"
+import ModalConfirmation from "@/components/ModalConfirmation"
 import Text from "@/components/Text"
 import { ConstEnv } from "@/constants/ConstEnv"
 import Styles from "@/constants/Styles"
@@ -14,7 +11,7 @@ import { apiDeleteCalendarMember, apiGetCalendarOne, apiGetDivisionOneFeature }
 import { setUpdateCalendar } from "@/lib/calendarUpdate"
 import { useAuthSession } from "@/providers/AuthProvider"
 import { useTheme } from "@/providers/ThemeProvider"
-import { MaterialCommunityIcons } from "@expo/vector-icons"
+import { MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons"
 import Clipboard from "@react-native-clipboard/clipboard"
 import { router, Stack, useLocalSearchParams } from "expo-router"
 import { useEffect, useState } from "react"
@@ -156,135 +153,142 @@ export default function DetailEventCalendar() {
       setRefreshing(false)
    };
 
+   const canManage = !((entityUser.role === "user" || entityUser.role === "coadmin") && !isMemberDivision)
+
+   const repeatLabel: Record<string, string> = {
+      once: 'Acara 1 Kali',
+      daily: 'Setiap Hari',
+      weekly: 'Mingguan',
+      monthly: 'Bulanan',
+      yearly: 'Tahunan',
+   }
+
+   function InfoRow({ icon, label, value, onCopy }: { icon: string, label: string, value?: string, onCopy?: () => void }) {
+      return (
+         <View style={[Styles.sectionActionRow, { paddingVertical: 10, borderBottomWidth: 1, borderBottomColor: colors.icon + '14' }]}>
+            <View style={[Styles.sectionIconBox, { backgroundColor: colors.dimmed + '18' }]}>
+               <MaterialCommunityIcons name={icon as any} size={18} color={colors.dimmed} />
+            </View>
+            <View style={Styles.flex1}>
+               <Text style={[Styles.textSmallSemiBold, { color: colors.dimmed, marginBottom: 2 }]}>{label}</Text>
+               {loading
+                  ? <View style={{ height: 13, borderRadius: 6, backgroundColor: colors.icon + '20', width: '70%' }} />
+                  : <Text style={[Styles.textDefault, { color: colors.text }]}>{value || '-'}</Text>
+               }
+            </View>
+            {onCopy && !loading && value && (
+               <Pressable onPress={onCopy} style={{ padding: 4 }}>
+                  <MaterialCommunityIcons name="content-copy" size={16} color={colors.dimmed} />
+               </Pressable>
+            )}
+         </View>
+      )
+   }
+
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
          <Stack.Screen
             options={{
-               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
-               headerTitle: 'Detail Acara',
-               headerTitleAlign: 'center',
-               // headerRight: () => (entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision ? <></> : <HeaderRightCalendarDetail id={String(data?.idCalendar)} idReminder={String(detail)} />
                header: () => (
                   <AppHeader
                      title="Detail Acara"
                      showBack={true}
                      onPressLeft={() => router.back()}
                      right={
-                        (entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision ? <></> : <HeaderRightCalendarDetail id={String(data?.idCalendar)} idReminder={String(detail)} />
+                        (entityUser.role === "user" || entityUser.role === "coadmin") && !isMemberDivision
+                           ? <></> : <HeaderRightCalendarDetail id={String(data?.idCalendar)} idReminder={String(detail)} />
                      }
                   />
                )
             }}
          />
          <ScrollView
-            style={[Styles.h100]}
+            showsVerticalScrollIndicator={false}
-            refreshControl={
+            style={Styles.h100}
-               <RefreshControl
+            refreshControl={<RefreshControl refreshing={refreshing} onRefresh={handleRefresh} tintColor={colors.icon} />}
-                  refreshing={refreshing}
-                  onRefresh={handleRefresh}
-                  tintColor={colors.icon}
-               />
-            }
          >
-            <View style={[Styles.p15]}>
+            <View style={[Styles.p15, Styles.mb100]}>
-               <View style={[Styles.wrapPaper, Styles.mb15, { backgroundColor: colors.card, borderColor: colors.background }]}>
-                  <View style={[Styles.rowItemsCenter, { alignItems: 'flex-start' }]}>
-                     <MaterialCommunityIcons name="calendar-text" size={30} color={colors.text} style={Styles.mr10} />
-                     {
-                        loading ?
-                           <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
-                           : <Text style={[Styles.textDefault, Styles.w90]}>{data?.title}</Text>
-                     }
 
+               {/* Info acara */}
+               <View style={[Styles.wrapPaper, Styles.sectionCard, Styles.noShadow, Styles.mb15,
+                  { backgroundColor: colors.card, borderColor: colors.icon + '18', padding: 0, overflow: 'hidden' }]}>
+                  <View style={{ padding: 16, borderBottomWidth: 1, borderBottomColor: colors.icon + '14' }}>
+                     <View style={Styles.sectionActionRow}>
+                        <View style={[Styles.sectionIconBox, { backgroundColor: colors.dimmed + '18' }]}>
+                           <MaterialCommunityIcons name="calendar-text" size={18} color={colors.dimmed} />
+                        </View>
+                        <Text style={[Styles.textDefaultSemiBold, Styles.flex1, { color: colors.text }]}>Detail Acara</Text>
+                     </View>
                   </View>
-                  <View style={[Styles.rowItemsCenter, Styles.mt10]}>
+                  <View style={{ paddingHorizontal: 16 }}>
-                     <MaterialCommunityIcons name="calendar-month-outline" size={30} color={colors.text} style={Styles.mr10} />
+                     <InfoRow icon="format-title" label="Judul" value={data?.title} />
-                     {
+                     <InfoRow icon="calendar-month-outline" label="Tanggal" value={data?.dateStart} />
-                        loading ?
+                     <InfoRow icon="clock-outline" label="Waktu" value={data ? `${data.timeStart} – ${data.timeEnd}` : undefined} />
-                           <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
+                     <InfoRow icon="repeat" label="Pengulangan" value={data?.repeatEventTyper ? repeatLabel[data.repeatEventTyper] : undefined} />
-                           :
+                     <InfoRow icon="link-variant" label="Link Meet" value={data?.linkMeet} onCopy={data?.linkMeet ? () => handleCopy(data.linkMeet) : undefined} />
-                           <Text style={[Styles.textDefault]}>{data?.dateStart}</Text>
+                     <View style={[Styles.sectionActionRow, { paddingVertical: 10, alignItems: 'flex-start' }]}>
-                     }
+                        <View style={[Styles.sectionIconBox, { backgroundColor: colors.dimmed + '18' }]}>
+                           <MaterialCommunityIcons name="card-text-outline" size={18} color={colors.dimmed} />
+                        </View>
+                        <View style={Styles.flex1}>
+                           <Text style={[Styles.textSmallSemiBold, { color: colors.dimmed, marginBottom: 2 }]}>Deskripsi</Text>
+                           {loading
+                              ? <View style={{ height: 13, borderRadius: 6, backgroundColor: colors.icon + '20', width: '80%' }} />
+                              : <Text style={[Styles.textDefault, { color: colors.text, lineHeight: 22 }]}>{data?.desc || '-'}</Text>
+                           }
+                        </View>
+                     </View>
                   </View>
-                  <View style={[Styles.rowItemsCenter, Styles.mt10]}>
+               </View>
-                     <MaterialCommunityIcons name="clock-outline" size={30} color={colors.text} style={Styles.mr10} />
+
-                     {
+               {/* Daftar anggota */}
-                        loading ?
+               <View style={[Styles.wrapPaper, Styles.sectionCard, Styles.noShadow,
-                           <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
+                  { backgroundColor: colors.card, borderColor: colors.icon + '18', padding: 0, overflow: 'hidden' }]}>
-                           :
+
-                           <Text style={[Styles.textDefault]}>{data?.timeStart} | {data?.timeEnd}</Text>
+                  <View style={[Styles.sectionActionRow, { padding: 16, borderBottomWidth: 1, borderBottomColor: colors.icon + '14' }]}>
-                     }
+                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.dimmed + '18' }]}>
+                        <MaterialIcons name="people" size={18} color={colors.dimmed} />
+                     </View>
+                     <Text style={[Styles.textDefaultSemiBold, Styles.flex1, { color: colors.text }]}>Anggota</Text>
+                     <Text style={[Styles.textMediumNormal, { color: colors.dimmed }]}>{member.length} anggota</Text>
                   </View>
-                  <View style={[Styles.rowItemsCenter, Styles.mt10]}>
+
-                     <MaterialCommunityIcons name="repeat" size={30} color={colors.text} style={Styles.mr10} />
+                  {member.length === 0
-                     {
+                     ? (
-                        loading ?
+                        <View style={[Styles.contentItemCenter, { paddingVertical: 40 }]}>
-                           <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
+                           <MaterialIcons name="people-outline" size={34} color={colors.icon + '50'} />
-                           :
+                           <Text style={[Styles.textMediumNormal, Styles.mt10, { color: colors.dimmed }]}>Belum ada anggota</Text>
-                           <Text style={[Styles.textDefault]}>
+                        </View>
+                     )
+                     : member.map((item, index) => (
+                        <Pressable
+                           key={index}
+                           onPress={() => {
+                              if (!canManage) return
+                              setMemberChoose({ id: item.idUser, name: item.name })
+                              setModalMember(true)
+                           }}
+                           style={({ pressed }) => [
+                              Styles.rowItemsCenter, Styles.ph15,
                               {
-                                 data?.repeatEventTyper.toString() === 'once' ? 'Acara 1 Kali' :
+                                 paddingVertical: 12, gap: 14,
-                                    data?.repeatEventTyper.toString() === 'daily' ? 'Setiap Hari' :
+                                 borderBottomWidth: index < member.length - 1 ? 1 : 0,
-                                       data?.repeatEventTyper.toString() === 'weekly' ? 'Mingguan' :
+                                 borderBottomColor: colors.icon + '14',
-                                          data?.repeatEventTyper.toString() === 'monthly' ? 'Bulanan' :
+                                 backgroundColor: pressed && canManage ? colors.icon + '0E' : 'transparent',
-                                             data?.repeatEventTyper.toString() === 'yearly' ? 'Tahunan' :
+                              },
-                                                ''
+                           ]}
-                              }
+                        >
-                           </Text>
+                           <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="xs" />
-                     }
+                           <View style={Styles.flex1}>
-                  </View>
+                              <Text style={[Styles.textDefault, { color: colors.text }]} numberOfLines={1}>{item.name}</Text>
-                  <View style={[Styles.rowItemsCenter, Styles.mt10]}>
+                              <Text style={[Styles.textMediumNormal, { color: colors.dimmed }]} numberOfLines={1}>{item.email}</Text>
-                     <MaterialCommunityIcons name="link-variant" size={30} color={colors.text} style={Styles.mr10} />
+                           </View>
-                     {
+                           {canManage && <MaterialCommunityIcons name="chevron-right" size={18} color={colors.icon + '60'} />}
-                        loading ?
+                        </Pressable>
-                           <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
+                     ))
-                           :
+                  }
-                           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, { alignItems: 'flex-start' }]}>
-                     <MaterialCommunityIcons name="card-text-outline" size={30} color={colors.text} style={Styles.mr10} />
-                     {
-                        loading ?
-                           <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
-                           :
-                           <Text style={[Styles.textDefault, Styles.w90]}>{data?.desc}</Text>
-                     }
-                  </View>
                </View>
 
-               <View style={[Styles.mb15]}>
-                  <View style={[Styles.rowSpaceBetween, Styles.mv05]}>
-                     <Text style={[Styles.textDefaultSemiBold]}>Anggota</Text>
-                     <Text style={[Styles.textDefault]}>Total {member.length} Anggota</Text>
-                  </View>
-
-                  <View style={[Styles.wrapPaper, { backgroundColor: colors.card, borderColor: colors.background }]}>
-                     {
-                        member.map((item, index) => (
-                           <BorderBottomItem
-                              key={index}
-                              borderType="bottom"
-                              icon={<ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} />}
-                              title={item.name}
-                              subtitle={item.email}
-                              onPress={() => {
-                                 if ((entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision) {
-                                    null
-                                 } else {
-                                    setMemberChoose({ id: item.idUser, name: item.name })
-                                    setModalMember(true)
-                                 }
-                              }}
-                           />
-                        ))
-                     }
-                  </View>
-               </View>
             </View>
          </ScrollView>
 

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

@@ -1,7 +1,5 @@
 import AppHeader from "@/components/AppHeader";
-import BorderBottomItem from "@/components/borderBottomItem";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
-import ButtonSelect from "@/components/buttonSelect";
 import DrawerBottom from "@/components/drawerBottom";
 import { InputForm } from "@/components/inputForm";
 import LoadingCenter from "@/components/loadingCenter";
@@ -16,10 +14,30 @@ 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, 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";
 
+function getFileIcon(ext: string): keyof typeof MaterialCommunityIcons.glyphMap {
+   if (['jpg', 'jpeg', 'png', 'gif', 'webp', 'heic', 'heif'].includes(ext)) return 'image-outline'
+   if (ext === 'pdf') return 'file-pdf-box'
+   if (['mp4', 'mov', 'avi', 'mkv'].includes(ext)) return 'video-outline'
+   if (['doc', 'docx'].includes(ext)) return 'file-word-outline'
+   if (['xls', 'xlsx'].includes(ext)) return 'file-excel-outline'
+   if (['zip', 'rar', '7z'].includes(ext)) return 'zip-box-outline'
+   return 'file-outline'
+}
+
+function getFileColor(ext: string): string {
+   if (['jpg', 'jpeg', 'png', 'gif', 'webp', 'heic', 'heif'].includes(ext)) return '#339AF0'
+   if (ext === 'pdf') return '#F03E3E'
+   if (['mp4', 'mov', 'avi', 'mkv'].includes(ext)) return '#AE3EC9'
+   if (['doc', 'docx'].includes(ext)) return '#1C7ED6'
+   if (['xls', 'xlsx'].includes(ext)) return '#2F9E44'
+   if (['zip', 'rar', '7z'].includes(ext)) return '#E8590C'
+   return '#868E96'
+}
+
 export default function DiscussionDivisionEdit() {
    const { colors } = useTheme();
    const { id, detail } = useLocalSearchParams<{ id: string; detail: string }>();
@@ -33,30 +51,49 @@ export default function DiscussionDivisionEdit() {
    const [indexDelFile, setIndexDelFile] = useState<{ id: string | number; cat: "newFile" | "oldFile" }>({ id: "", cat: "newFile" })
    const [dataFile, setDataFile] = useState<{ id: string; idStorage: string; name: string; extension: string; delete?: boolean }[]>([])
 
+   const visibleOldFiles = dataFile.filter(v => !v.delete)
+   const totalFiles = fileForm.length + visibleOldFiles.length
 
    async function handleLoad() {
       try {
          const hasil = await decryptToken(String(token?.current));
-         const response = await apiGetDiscussionOne({
+         const response = await apiGetDiscussionOne({ id: detail, user: hasil, cat: "data" });
-            id: detail,
+         const response2 = await apiGetDiscussionOne({ id: detail, user: hasil, cat: "file" });
-            user: hasil,
-            cat: "data",
-         });
-         const response2 = await apiGetDiscussionOne({
-            id: detail,
-            user: hasil,
-            cat: "file",
-         });
-         setDataFile(response2.data);
          setData(response.data.desc);
+         setDataFile(response2.data);
       } catch (error) {
          console.error(error);
       }
    }
 
-   useEffect(() => {
+   useEffect(() => { handleLoad() }, []);
-      handleLoad();
+
-   }, []);
+   const pickDocumentAsync = async () => {
+      const result = await DocumentPicker.getDocumentAsync({ type: ["*/*"], multiple: true });
+      if (!result.canceled) {
+         let skipped = 0
+         for (const asset of result.assets) {
+            if (!asset.uri) continue
+            const isDup = fileForm.some(f => f.name === asset.name) ||
+               visibleOldFiles.some(f => `${f.name}.${f.extension}` === asset.name)
+            if (isDup) {
+               skipped++
+            } else {
+               setFileForm(prev => [...prev, asset])
+            }
+         }
+         if (skipped > 0) Toast.show({ type: 'small', text1: 'Beberapa file sudah ditambahkan' })
+      }
+   };
+
+   function deleteFile(index: number | string, cat: "newFile" | "oldFile" | null) {
+      if (cat === "newFile") {
+         setFileForm(fileForm.filter((_, i) => i !== index))
+      } else {
+         setDataFile(prev => prev.map(item => item.id === index ? { ...item, delete: true } : item))
+      }
+      setModalFile(false)
+   }
 
    async function handleUpdate() {
       try {
@@ -64,94 +101,29 @@ export default function DiscussionDivisionEdit() {
          const hasil = await decryptToken(String(token?.current));
          const fd = new FormData()
          for (let i = 0; i < fileForm.length; i++) {
-            fd.append(`file${i}`, {
+            fd.append(`file${i}`, { uri: fileForm[i].uri, type: 'application/octet-stream', name: fileForm[i].name } as any);
-               uri: fileForm[i].uri,
-               type: 'application/octet-stream',
-               name: fileForm[i].name,
-            } as any);
          }
-
+         fd.append("data", JSON.stringify({ user: hasil, desc: data, oldFile: dataFile }))
-         fd.append("data", JSON.stringify(
-            {
-               user: hasil, desc: data, oldFile: dataFile
-            }
-         ))
          const response = await apiEditDiscussion(fd, detail);
-
-         // const response = await apiEditDiscussion({
-         //    data: { user: hasil, desc: data },
-         //    id: detail,
-         // });
          if (response.success) {
-            Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
+            Toast.show({ type: 'small', text1: 'Berhasil mengubah data' })
             dispatch(setUpdateDiscussion({ ...update, data: !update.data }));
             router.back();
          } else {
-            Toast.show({ type: 'small', text1: response.message, })
+            Toast.show({ type: 'small', text1: response.message })
          }
       } catch (error: any) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal mengubah data"
+         Toast.show({ type: 'small', text1: error?.response?.data?.message || "Gagal mengubah data" })
-
-         Toast.show({ type: 'small', text1: message })
       } 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 | string, cat: "newFile" | "oldFile" | null) {
-      if (cat == "newFile") {
-         setFileForm([...fileForm.filter((val, i) => i !== index)])
-      } else {
-         setDataFile(prev =>
-            prev.map(item =>
-               item.id === index
-                  ? { ...item, delete: true }
-                  : item
-            )
-         );
-      }
-      setModalFile(false)
-   }
-
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
          <Stack.Screen
             options={{
-               // headerLeft: () => (
-               //    <ButtonBackHeader
-               //       onPress={() => {
-               //          router.back();
-               //       }}
-               //    />
-               // ),
-               headerTitle: "Edit Diskusi",
-               headerTitleAlign: "center",
-               // headerRight: () => (
-               //    <ButtonSaveHeader
-               //       disable={data == "" || loading}
-               //       category="update"
-               //       onPress={() => {
-               //          handleUpdate();
-               //       }}
-               //    />
-               // ),
                header: () => (
                   <AppHeader
                      title="Edit Diskusi"
@@ -161,9 +133,7 @@ export default function DiscussionDivisionEdit() {
                         <ButtonSaveHeader
                            disable={data == "" || loading}
                            category="update"
-                           onPress={() => {
+                           onPress={() => handleUpdate()}
-                              handleUpdate();
-                           }}
                         />
                      }
                   />
@@ -171,8 +141,8 @@ export default function DiscussionDivisionEdit() {
             }}
          />
          {loading && <LoadingCenter />}
-         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100]}>
+         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100, Styles.flex1, { backgroundColor: colors.background }]}>
-            <View style={[Styles.p15]}>
+            <View style={Styles.p15}>
                <InputForm
                   label="Diskusi"
                   type="default"
@@ -184,57 +154,87 @@ export default function DiscussionDivisionEdit() {
                   bg={colors.card}
                />
 
-               <ButtonSelect value="Upload File" onPress={pickDocumentAsync} />
+               {/* File */}
-               {
+               <View style={[Styles.wrapPaper, Styles.mb15, Styles.sectionCard,
-                  (fileForm.length > 0 || dataFile.filter((val) => !val.delete).length > 0)
+                  { backgroundColor: colors.card, borderColor: colors.icon + '18' }]}>
-                  &&
+                  <Pressable
-                  <>
+                     onPress={pickDocumentAsync}
-                     <View style={[Styles.rowSpaceBetween, Styles.mv05]}>
+                     style={[Styles.sectionActionRow, { marginBottom: totalFiles > 0 ? 12 : 0 }]}
-                        <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                  >
-                        <Text style={[Styles.textDefault]}>{fileForm.length + dataFile.filter((val) => !val.delete).length} file</Text>
+                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.icon + '15' }]}>
+                        <MaterialCommunityIcons name="paperclip" size={18} color={colors.dimmed} />
                      </View>
-                     <View style={[Styles.borderAll, Styles.round05, Styles.p10, Styles.mb10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+                     <View style={Styles.flex1}>
-                        {
+                        <Text style={[Styles.textDefaultSemiBold, { color: colors.text }]}>File</Text>
-                           dataFile.filter((val) => !val.delete).map((item, index) => (
+                        {totalFiles === 0 && (
-                              <BorderBottomItem
+                           <Text style={[Styles.textMediumNormal, { color: colors.dimmed }]}>Opsional — ketuk untuk upload</Text>
-                                 key={index}
+                        )}
-                                 borderType={dataFile.filter((val) => !val.delete).length - 1 == index && fileForm.length == 0 ? "none" : "bottom"}
+                     </View>
-                                 icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
+                     {totalFiles > 0 && (
-                                 title={item.name + '.' + item.extension}
+                        <View style={[Styles.sectionBadge, { backgroundColor: colors.dimmed + '18' }]}>
-                                 titleWeight="normal"
+                           <Text style={[Styles.textSmallSemiBold, { color: colors.dimmed }]}>{totalFiles} file</Text>
+                        </View>
+                     )}
+                     <MaterialCommunityIcons name="chevron-right" size={18} color={colors.dimmed} />
+                  </Pressable>
+                  {totalFiles > 0 && (
+                     <View style={Styles.fileGrid}>
+                        {visibleOldFiles.map((item, index) => {
+                           const ext = item.extension.toLowerCase()
+                           const iconName = getFileIcon(ext)
+                           const iconColor = getFileColor(ext)
+                           return (
+                              <Pressable
+                                 key={`old-${index}`}
                                  onPress={() => { setIndexDelFile({ id: item.id, cat: "oldFile" }); setModalFile(true) }}
-                              />
+                                 style={[Styles.fileCard, { backgroundColor: 'transparent', borderColor: colors.icon + '18' }]}
-                           ))
+                              >
-                        }
+                                 <View style={[Styles.sectionIconBox, { backgroundColor: iconColor + '20' }]}>
-                        {
+                                    <MaterialCommunityIcons name={iconName} size={18} color={iconColor} />
-                           fileForm.map((item, index) => (
+                                 </View>
-                              <BorderBottomItem
+                                 <View style={Styles.flex1}>
-                                 key={index}
+                                    <Text style={Styles.textDefault} numberOfLines={1}>{item.name}</Text>
-                                 borderType={fileForm.length - 1 == index ? "none" : "bottom"}
+                                    <Text style={[Styles.textSmallSemiBold, { color: colors.dimmed }]}>{ext.toUpperCase()}</Text>
-                                 icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
+                                 </View>
-                                 title={item.name}
+                              </Pressable>
-                                 titleWeight="normal"
+                           )
+                        })}
+                        {fileForm.map((item, index) => {
+                           const ext = item.name.split('.').pop()?.toLowerCase() ?? ''
+                           const baseName = item.name.includes('.') ? item.name.split('.').slice(0, -1).join('.') : item.name
+                           const iconName = getFileIcon(ext)
+                           const iconColor = getFileColor(ext)
+                           return (
+                              <Pressable
+                                 key={`new-${index}`}
                                  onPress={() => { setIndexDelFile({ id: index, cat: "newFile" }); setModalFile(true) }}
-                              />
+                                 style={[Styles.fileCard, { backgroundColor: 'transparent', borderColor: colors.icon + '18' }]}
-                           ))
+                              >
-                        }
+                                 <View style={[Styles.sectionIconBox, { backgroundColor: iconColor + '20' }]}>
+                                    <MaterialCommunityIcons name={iconName} size={18} color={iconColor} />
+                                 </View>
+                                 <View style={Styles.flex1}>
+                                    <Text style={Styles.textDefault} numberOfLines={1}>{baseName}</Text>
+                                    <Text style={[Styles.textSmallSemiBold, { color: colors.dimmed }]}>{ext.toUpperCase()}</Text>
+                                 </View>
+                              </Pressable>
+                           )
+                        })}
                      </View>
-                  </>
+                  )}
-               }
+               </View>
             </View>
          </ScrollView>
 
-
          <DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
                   icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
                   title="Hapus"
-                  onPress={() => { deleteFile(indexDelFile.id, indexDelFile.cat) }}
+                  onPress={() => deleteFile(indexDelFile.id, indexDelFile.cat)}
                />
             </View>
          </DrawerBottom>
-
       </SafeAreaView>
    );
 }

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

@@ -1,7 +1,5 @@
 import AppHeader from "@/components/AppHeader"
-import BorderBottomItem from "@/components/borderBottomItem"
 import ButtonSaveHeader from "@/components/buttonSaveHeader"
-import ButtonSelect from "@/components/buttonSelect"
 import DrawerBottom from "@/components/drawerBottom"
 import { InputForm } from "@/components/inputForm"
 import LoadingCenter from "@/components/loadingCenter"
@@ -16,10 +14,29 @@ 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, 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"
 
+function getFileIcon(ext: string): keyof typeof MaterialCommunityIcons.glyphMap {
+   if (['jpg', 'jpeg', 'png', 'gif', 'webp', 'heic', 'heif'].includes(ext)) return 'image-outline'
+   if (ext === 'pdf') return 'file-pdf-box'
+   if (['mp4', 'mov', 'avi', 'mkv'].includes(ext)) return 'video-outline'
+   if (['doc', 'docx'].includes(ext)) return 'file-word-outline'
+   if (['xls', 'xlsx'].includes(ext)) return 'file-excel-outline'
+   if (['zip', 'rar', '7z'].includes(ext)) return 'zip-box-outline'
+   return 'file-outline'
+}
+
+function getFileColor(ext: string): string {
+   if (['jpg', 'jpeg', 'png', 'gif', 'webp', 'heic', 'heif'].includes(ext)) return '#339AF0'
+   if (ext === 'pdf') return '#F03E3E'
+   if (['mp4', 'mov', 'avi', 'mkv'].includes(ext)) return '#AE3EC9'
+   if (['doc', 'docx'].includes(ext)) return '#1C7ED6'
+   if (['xls', 'xlsx'].includes(ext)) return '#2F9E44'
+   if (['zip', 'rar', '7z'].includes(ext)) return '#E8590C'
+   return '#868E96'
+}
 
 export default function CreateDiscussionDivision() {
    const { colors } = useTheme();
@@ -34,76 +51,55 @@ export default function CreateDiscussionDivision() {
    const [indexDelFile, setIndexDelFile] = useState<number>(0)
 
    const pickDocumentAsync = async () => {
-      let result = await DocumentPicker.getDocumentAsync({
+      const result = await DocumentPicker.getDocumentAsync({ type: ["*/*"], multiple: true });
-         type: ["*/*"],
-         multiple: true
-      });
       if (!result.canceled) {
-         for (let i = 0; i < result.assets?.length; i++) {
+         let skipped = 0
-            if (result.assets[i].uri) {
+         for (const asset of result.assets) {
-               setFileForm((prev) => [...prev, result.assets[i]])
+            if (!asset.uri) continue
+            if (fileForm.some(f => f.name === asset.name)) {
+               skipped++
+            } else {
+               setFileForm(prev => [...prev, asset])
             }
          }
+         if (skipped > 0) Toast.show({ type: 'small', text1: 'Beberapa file sudah ditambahkan' })
       }
    };
 
    function deleteFile(index: number) {
-      setFileForm([...fileForm.filter((val, i) => i !== index)])
+      setFileForm(fileForm.filter((_, i) => i !== index))
       setModalFile(false)
    }
 
-
    async function handleCreate() {
       try {
          setLoading(true)
          const hasil = await decryptToken(String(token?.current))
          const fd = new FormData()
-
          for (let i = 0; i < fileForm.length; i++) {
-            fd.append(`file${i}`, {
+            fd.append(`file${i}`, { uri: fileForm[i].uri, type: 'application/octet-stream', name: fileForm[i].name } as any);
-               uri: fileForm[i].uri,
-               type: 'application/octet-stream',
-               name: fileForm[i].name,
-            } as any);
          }
-
+         fd.append("data", JSON.stringify({ user: hasil, desc, idDivision: id }))
-         fd.append("data", JSON.stringify(
-            { user: hasil, desc, idDivision: id }
-         ))
-
          const response = await apiCreateDiscussion(fd)
-
-         // const response = await apiCreateDiscussion({ data: { user: hasil, desc, idDivision: id } })
          if (response.success) {
-            Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
+            Toast.show({ type: 'small', text1: 'Berhasil menambahkan data' })
             dispatch(setUpdateDiscussion({ ...update, data: !update.data }));
             router.back()
          } else {
-            Toast.show({ type: 'small', text1: response.message, })
+            Toast.show({ type: 'small', text1: response.message })
          }
       } catch (error: any) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal menambahkan data"
+         Toast.show({ type: 'small', text1: error?.response?.data?.message || "Gagal menambahkan data" })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
    }
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
          <Stack.Screen
             options={{
-               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
-               headerTitle: 'Tambah Diskusi',
-               headerTitleAlign: 'center',
-               // headerRight: () => <ButtonSaveHeader
-               //    disable={desc == "" || loading}
-               //    category="create"
-               //    onPress={() => {
-               //       handleCreate()
-               //    }} />
                header: () => (
                   <AppHeader
                      title="Tambah Diskusi"
@@ -113,16 +109,15 @@ export default function CreateDiscussionDivision() {
                         <ButtonSaveHeader
                            disable={desc == "" || loading}
                            category="create"
-                           onPress={() => {
+                           onPress={() => handleCreate()}
-                              handleCreate()
+                        />
-                           }} />
                      }
                   />
                )
             }}
          />
          {loading && <LoadingCenter />}
-         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100]}>
+         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100, Styles.flex1, { backgroundColor: colors.background }]}>
             <View style={[Styles.p15, Styles.mb100]}>
                <InputForm
                   label="Diskusi"
@@ -133,32 +128,56 @@ export default function CreateDiscussionDivision() {
                   multiline
                   bg={colors.card}
                />
-               <ButtonSelect value="Upload File" onPress={pickDocumentAsync} />
-               {
-                  fileForm.length > 0
-                  &&
-                  <>
-                     <View style={[Styles.rowSpaceBetween, Styles.mv05]}>
-                        <Text style={[Styles.textDefaultSemiBold]}>File</Text>
-                        <Text style={[Styles.textDefault]}>{fileForm.length} file</Text>
-                     </View>
-                     <View style={[Styles.borderAll, Styles.round05, Styles.p10, Styles.mb10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
-                        {
-                           fileForm.map((item, index) => (
-                              <BorderBottomItem
-                                 key={index}
-                                 borderType={fileForm.length - 1 == index ? "none" : "bottom"}
-                                 icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
-                                 title={item.name}
-                                 titleWeight="normal"
-                                 onPress={() => { setIndexDelFile(index); setModalFile(true) }}
-                              />
-                           ))
-                        }
-                     </View>
-                  </>
 
-               }
+               {/* File */}
+               <View style={[Styles.wrapPaper, Styles.mb15, Styles.sectionCard,
+                  { backgroundColor: colors.card, borderColor: colors.icon + '18' }]}>
+                  <Pressable
+                     onPress={pickDocumentAsync}
+                     style={[Styles.sectionActionRow, { marginBottom: fileForm.length > 0 ? 12 : 0 }]}
+                  >
+                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.icon + '15' }]}>
+                        <MaterialCommunityIcons name="paperclip" size={18} color={colors.dimmed} />
+                     </View>
+                     <View style={Styles.flex1}>
+                        <Text style={[Styles.textDefaultSemiBold, { color: colors.text }]}>File</Text>
+                        {fileForm.length === 0 && (
+                           <Text style={[Styles.textMediumNormal, { color: colors.dimmed }]}>Opsional — ketuk untuk upload</Text>
+                        )}
+                     </View>
+                     {fileForm.length > 0 && (
+                        <View style={[Styles.sectionBadge, { backgroundColor: colors.dimmed + '18' }]}>
+                           <Text style={[Styles.textSmallSemiBold, { color: colors.dimmed }]}>{fileForm.length} file</Text>
+                        </View>
+                     )}
+                     <MaterialCommunityIcons name="chevron-right" size={18} color={colors.dimmed} />
+                  </Pressable>
+                  {fileForm.length > 0 && (
+                     <View style={Styles.fileGrid}>
+                        {fileForm.map((item, index) => {
+                           const ext = item.name.split('.').pop()?.toLowerCase() ?? ''
+                           const baseName = item.name.includes('.') ? item.name.split('.').slice(0, -1).join('.') : item.name
+                           const iconName = getFileIcon(ext)
+                           const iconColor = getFileColor(ext)
+                           return (
+                              <Pressable
+                                 key={index}
+                                 onPress={() => { setIndexDelFile(index); setModalFile(true) }}
+                                 style={[Styles.fileCard, { backgroundColor: 'transparent', borderColor: colors.icon + '18' }]}
+                              >
+                                 <View style={[Styles.sectionIconBox, { backgroundColor: iconColor + '20' }]}>
+                                    <MaterialCommunityIcons name={iconName} size={18} color={iconColor} />
+                                 </View>
+                                 <View style={Styles.flex1}>
+                                    <Text style={Styles.textDefault} numberOfLines={1}>{baseName}</Text>
+                                    <Text style={[Styles.textSmallSemiBold, { color: colors.dimmed }]}>{ext.toUpperCase()}</Text>
+                                 </View>
+                              </Pressable>
+                           )
+                        })}
+                     </View>
+                  )}
+               </View>
             </View>
          </ScrollView>
 
@@ -167,10 +186,10 @@ export default function CreateDiscussionDivision() {
                <MenuItemRow
                   icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
                   title="Hapus"
-                  onPress={() => { deleteFile(indexDelFile) }}
+                  onPress={() => deleteFile(indexDelFile)}
                />
             </View>
          </DrawerBottom>
       </SafeAreaView>
    )
-}
+}

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

@@ -98,11 +98,23 @@ export default function DiscussionDivision() {
 
    const isOpen = (item: Props) => item.status === 1
 
+   const themed = {
+      background:       { backgroundColor: colors.background },
+      card:             { backgroundColor: colors.card, borderColor: colors.icon + '20' },
+      cardPressed:      { backgroundColor: colors.icon + '10' },
+      title:            { color: colors.text },
+      dimmed:           { color: colors.dimmed },
+      statusOpen:       { borderColor: '#10B981' as const },
+      statusClosed:     { borderColor: colors.dimmed + '80' },
+      statusTextOpen:   { color: '#10B981' as const },
+      statusTextClosed: { color: colors.dimmed },
+   }
+
    return (
-      <View style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <View style={[Styles.flex1, themed.background]}>
          <GuideOverlay visible={guideVisible} steps={GUIDE_DIVISION_DISCUSSION} onDismiss={dismissGuide} />
          {((entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision) && (
-            <View style={[Styles.ph15, { paddingTop: 12 }]}>
+            <View style={[Styles.ph15, Styles.discussionHeaderPadding]}>
                <WrapTab>
                   <ButtonTab
                      active={status == "false" ? "false" : "true"}
@@ -125,13 +137,13 @@ export default function DiscussionDivision() {
             </View>
          )}
 
-         <View style={[Styles.flex1, Styles.ph15, { paddingTop: 8 }]}>
+         <View style={[Styles.flex1, Styles.ph15, Styles.discussionListPadding]}>
             {loading ? (
                arrSkeleton.map((_, i) => <SkeletonContent key={i} />)
             ) : data.length === 0 ? (
                <View style={[Styles.contentItemCenter, Styles.mt30]}>
                   <Feather name="message-circle" size={42} color={colors.icon + '40'} />
-                  <Text style={[Styles.mt10, { color: colors.dimmed, fontSize: 14 }]}>
+                  <Text style={[Styles.mt10, Styles.discussionEmptyText, themed.dimmed]}>
                      Tidak ada diskusi
                   </Text>
                </View>
@@ -151,18 +163,19 @@ export default function DiscussionDivision() {
                         onPress={() => router.push(`./discussion/${item.id}`)}
                         style={({ pressed }) => [
                            Styles.discussionCard,
-                           { backgroundColor: pressed ? colors.icon + '10' : colors.card, borderColor: colors.icon + '20' }
+                           themed.card,
+                           pressed && themed.cardPressed,
                         ]}
                      >
                         <View style={[Styles.rowItemsCenter, Styles.mb08]}>
                            <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="xs" />
-                           <View style={[Styles.flex1, { marginLeft: 10 }]}>
+                           <View style={[Styles.flex1, Styles.discussionTitleCol]}>
-                              <Text style={[Styles.textDefaultSemiBold, { color: colors.text }]} numberOfLines={1}>
+                              <Text style={[Styles.textDefaultSemiBold, themed.title]} numberOfLines={1}>
                                  {item.user_name}
                               </Text>
                               {status === "true" && (
-                                 <View style={[Styles.discussionStatusPill, { borderColor: isOpen(item) ? '#10B981' : colors.dimmed + '80' }]}>
+                                 <View style={[Styles.discussionStatusPill, isOpen(item) ? themed.statusOpen : themed.statusClosed]}>
-                                    <Text style={[Styles.discussionStatusText, { color: isOpen(item) ? '#10B981' : colors.dimmed }]}>
+                                    <Text style={[Styles.discussionStatusText, isOpen(item) ? themed.statusTextOpen : themed.statusTextClosed]}>
                                        {isOpen(item) ? 'Buka' : 'Tutup'}
                                     </Text>
                                  </View>
@@ -171,7 +184,7 @@ export default function DiscussionDivision() {
                         </View>
 
                         {item.desc ? (
-                           <Text style={[Styles.textMediumNormal, Styles.discussionCardIndent, { color: colors.dimmed, marginBottom: 10 }]} numberOfLines={2}>
+                           <Text style={[Styles.textMediumNormal, Styles.discussionCardIndent, Styles.discussionDescMargin, themed.title]} numberOfLines={2}>
                               {item.desc}
                            </Text>
                         ) : null}
@@ -179,11 +192,11 @@ export default function DiscussionDivision() {
                         <View style={[Styles.rowItemsCenter, Styles.rowSpaceBetween, Styles.discussionCardIndent]}>
                            <View style={Styles.rowItemsCenter}>
                               <Feather name="message-square" size={14} color={colors.dimmed} />
-                              <Text style={[Styles.discussionCommentText, { color: colors.dimmed }]}>
+                              <Text style={[Styles.discussionCommentText, themed.dimmed]}>
                                  {item.total_komentar} Komentar
                               </Text>
                            </View>
-                           <Text style={[Styles.discussionDateText, { color: colors.dimmed }]}>
+                           <Text style={[Styles.discussionDateText, themed.dimmed]}>
                               {item.createdAt}
                            </Text>
                         </View>

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

@@ -169,7 +169,7 @@ export default function AddMemberDivision() {
                         return (
                            <Pressable
                               key={index}
-                              style={[Styles.itemSelectModal]}
+                              style={[Styles.itemSelectModal, { borderBottomColor: colors.icon + '20' }]}
                               onPress={() => {
                                  !found && onChoose(item.id, item.name, item.img)
                               }}

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

@@ -1,20 +1,17 @@
-import ModalConfirmation from "@/components/ModalConfirmation"
 import AppHeader from "@/components/AppHeader"
-import BorderBottomItem from "@/components/borderBottomItem"
-import HeaderRightDivisionInfo from "@/components/division/headerDivisionInfo"
 import DrawerBottom from "@/components/drawerBottom"
+import HeaderRightDivisionInfo from "@/components/division/headerDivisionInfo"
 import ImageUser from "@/components/imageNew"
+import MenuItemRow from "@/components/menuItemRow"
+import ModalConfirmation from "@/components/ModalConfirmation"
 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, apiGetDivisionOneFeature, apiUpdateStatusAdminDivision } from "@/lib/api"
 import { useAuthSession } from "@/providers/AuthProvider"
 import { useTheme } from "@/providers/ThemeProvider"
-import { Feather, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons"
+import { MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons"
 import { router, Stack, useLocalSearchParams } from "expo-router"
 import { useEffect, useState } from "react"
 import { Pressable, RefreshControl, SafeAreaView, ScrollView, View } from "react-native"
@@ -50,8 +47,8 @@ export default function InformationDivision() {
    const [dataMember, setDataMember] = useState<PropsMember[]>([])
    const [refresh, setRefresh] = useState(false)
    const update = useSelector((state: any) => state.divisionUpdate)
-   const arrSkeleton = Array.from({ length: 5 }, (_, index) => index)
    const [loading, setLoading] = useState(true)
+   const SKELETON_COUNT = 5
    const [isMemberDivision, setIsMemberDivision] = useState(false)
    const [isAdminDivision, setIsAdminDivision] = useState(false)
    const [dataMemberChoose, setDataMemberChoose] = useState({
@@ -186,109 +183,123 @@ export default function InformationDivision() {
             }}
          />
          <ScrollView
-            refreshControl={
+            showsVerticalScrollIndicator={false}
-               <RefreshControl
+            refreshControl={<RefreshControl refreshing={refreshing} onRefresh={handleRefresh} tintColor={colors.icon} />}
-                  refreshing={refreshing}
-                  onRefresh={handleRefresh}
-                  tintColor={colors.icon}
-               />
-            }
             style={[Styles.h100, { backgroundColor: colors.background }]}
          >
-            <View style={[Styles.p15]}>
+            <View style={[Styles.p15, Styles.mb100]}>
-               {
+
-                  dataDetail?.isActive == false && (
+               {dataDetail?.isActive === false && <SectionCancel title="Divisi nonaktif" />}
-                     <SectionCancel title={'Divisi nonaktif'} />
+
-                  )
+               {/* Deskripsi */}
-               }
+               <View style={[Styles.wrapPaper, Styles.sectionCard, Styles.noShadow, Styles.mb15,
-               <View style={[Styles.mb15]}>
+                  { backgroundColor: colors.card, borderColor: colors.icon + '18' }]}>
-                  <Text style={[Styles.textDefaultSemiBold, Styles.mb05]}>Deskripsi Divisi</Text>
+                  <View style={[Styles.sectionActionRow, { marginBottom: 12 }]}>
-                  <View style={[Styles.wrapPaper, Styles.noShadow, { backgroundColor: colors.card, borderWidth: 1, borderColor: colors.icon + '20' }]}>
+                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.dimmed + '18' }]}>
-                     {loading ?
+                        <MaterialIcons name="info-outline" size={18} color={colors.dimmed} />
-                        arrSkeleton.map((item, index) => {
+                     </View>
+                     <Text style={[Styles.textDefaultSemiBold, Styles.flex1, { color: colors.text }]}>Deskripsi</Text>
+                  </View>
+                  {loading
+                     ? Array.from({ length: 3 }).map((_, i) => (
+                        <View key={i} style={{ height: 13, borderRadius: 6, marginBottom: 8, backgroundColor: colors.icon + '20', width: i === 2 ? '60%' : '100%' }} />
+                     ))
+                     : <Text style={[Styles.textDefault, { color: colors.text, lineHeight: 22 }]}>{dataDetail?.desc}</Text>
+                  }
+               </View>
+
+               {/* Tombol tambah anggota */}
+               {((entityUser.role !== "user" && entityUser.role !== "coadmin") || isAdminDivision) && dataDetail?.isActive && (
+                  <View style={[Styles.wrapPaper, Styles.sectionCard, Styles.mb15,
+                     { backgroundColor: colors.card, borderColor: colors.icon + '18' }]}>
+                     <Pressable
+                        onPress={() => router.push(`/division/${id}/add-member`)}
+                        style={Styles.sectionActionRow}
+                     >
+                        <View style={[Styles.sectionIconBox, { backgroundColor: colors.icon + '18' }]}>
+                           <MaterialCommunityIcons name="account-plus-outline" size={18} color={colors.icon} />
+                        </View>
+                        <Text style={[Styles.textDefaultSemiBold, Styles.flex1, { color: colors.text }]}>Tambah Anggota</Text>
+                        <MaterialCommunityIcons name="chevron-right" size={18} color={colors.dimmed} />
+                     </Pressable>
+                  </View>
+               )}
+
+               {/* Daftar anggota */}
+               <View style={[Styles.wrapPaper, Styles.sectionCard,
+                  { backgroundColor: colors.card, borderColor: colors.icon + '18', padding: 0, overflow: 'hidden' }]}>
+
+                  {/* Header */}
+                  <View style={[Styles.sectionActionRow, { padding: 16, borderBottomWidth: 1, borderBottomColor: colors.icon + '14' }]}>
+                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.dimmed + '18' }]}>
+                        <MaterialIcons name="people" size={18} color={colors.dimmed} />
+                     </View>
+                     <Text style={[Styles.textDefaultSemiBold, Styles.flex1, { color: colors.text }]}>Anggota</Text>
+                     {!loading && (
+                        <Text style={[Styles.textMediumNormal, { color: colors.dimmed }]}>{dataMember.length} anggota</Text>
+                     )}
+                  </View>
+
+                  {loading
+                     ? Array.from({ length: SKELETON_COUNT }).map((_, i) => (
+                        <View key={i} style={[Styles.rowItemsCenter, Styles.ph15,
+                           { paddingVertical: 14, gap: 14, borderBottomWidth: i < SKELETON_COUNT - 1 ? 1 : 0, borderBottomColor: colors.icon + '14' }]}>
+                           <View style={[Styles.userProfileExtraSmall, { backgroundColor: colors.icon + '20', borderRadius: 100 }]} />
+                           <View style={{ height: 13, borderRadius: 6, flex: 1, backgroundColor: colors.icon + '20', maxWidth: 140 + (i % 3) * 30 }} />
+                        </View>
+                     ))
+                     : dataMember.length === 0
+                        ? (
+                           <View style={[Styles.contentItemCenter, { paddingVertical: 40 }]}>
+                              <MaterialIcons name="people-outline" size={34} color={colors.icon + '50'} />
+                              <Text style={[Styles.textMediumNormal, Styles.mt10, { color: colors.dimmed }]}>Belum ada anggota</Text>
+                           </View>
+                        )
+                        : dataMember.map((item, index) => {
+                           const canPress = dataDetail?.isActive && (isAdminDivision || (entityUser.role !== "user" && entityUser.role !== "coadmin"))
                            return (
-                              <Skeleton key={index} width={100} height={10} widthType="percent" borderRadius={10} />
+                              <Pressable
+                                 key={index}
+                                 onPress={() => canPress && handleChooseMember(item)}
+                                 style={({ pressed }) => [
+                                    Styles.rowItemsCenter, Styles.ph15,
+                                    {
+                                       paddingVertical: 13, gap: 14,
+                                       borderBottomWidth: index < dataMember.length - 1 ? 1 : 0,
+                                       borderBottomColor: colors.icon + '14',
+                                       backgroundColor: pressed && canPress ? colors.icon + '0E' : 'transparent',
+                                    },
+                                 ]}
+                              >
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="xs" />
+                                 <Text style={[Styles.textDefault, Styles.flex1, { color: colors.text }]} numberOfLines={1}>
+                                    {item.name}
+                                 </Text>
+                                 <Text style={[Styles.textMediumNormal, { color: item.isAdmin ? colors.tabActive : colors.dimmed }]}>
+                                    {item.isAdmin ? 'Admin' : 'Anggota'}
+                                 </Text>
+                                 {canPress && <MaterialCommunityIcons name="chevron-right" size={18} color={colors.icon + '60'} />}
+                              </Pressable>
                            )
                         })
-                        :
+                  }
-                        <Text>{dataDetail?.desc}</Text>
-                     }
-                  </View>
                </View>
-               <View style={[Styles.mb15]}>
-                  <Text style={[Styles.textDefault, Styles.mv05]}>{dataMember.length} Anggota</Text>
-                  <View style={[Styles.wrapPaper, Styles.noShadow, { backgroundColor: colors.card, borderWidth: 1, borderColor: colors.icon + '20' }]}>
-                     {
-                        ((entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision) &&
-                        dataDetail?.isActive && (
-                           <BorderBottomItem
-                              onPress={() => { router.push(`/division/${id}/add-member`) }}
-                              borderType="none"
-                              icon={
-                                 <View style={[Styles.iconContent]}>
-                                    <Feather name="user-plus" size={25} color={'black'} />
-                                 </View>
-                              }
-                              title="Tambah Anggota"
-                           />
-                        )
-                     }
 
-                     {
-                        loading ?
-                           arrSkeleton.map((item, index) => {
-                              return (
-                                 <SkeletonTwoItem key={index} />
-                              )
-                           })
-                           :
-                           dataMember.map((item, index) => {
-                              return (
-                                 <BorderBottomItem
-                                    key={index}
-                                    borderType="bottom"
-                                    onPress={() => { dataDetail?.isActive && (isAdminDivision || (entityUser.role != "user" && entityUser.role != "coadmin")) && handleChooseMember(item) }}
-                                    icon={
-                                       <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="sm" />
-                                    }
-                                    title={item.name}
-                                    rightTopInfo={item.isAdmin ? "Admin" : "Anggota"}
-                                 />
-                              )
-                           })
-                     }
-                  </View>
-               </View>
             </View>
          </ScrollView>
 
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title={dataMemberChoose.name}>
-            <View>
+            <View style={Styles.rowItemsCenter}>
-               <Pressable style={[Styles.wrapItemBorderBottom]} onPress={() => { handleMemberAdmin() }}>
+               <MenuItemRow
-                  <View style={[Styles.rowItemsCenter]}>
+                  icon={<MaterialIcons name="verified-user" color={colors.text} size={25} />}
-                     <View style={[Styles.iconContent]}>
+                  title={dataMemberChoose.isAdmin ? 'Berhentikan admin' : 'Jadikan admin'}
-                        <MaterialIcons name="verified-user" size={25} color={'black'} />
+                  onPress={handleMemberAdmin}
-                     </View>
+               />
-                     <View style={[Styles.rowSpaceBetween, { width: '88%' }]}>
+               <MenuItemRow
-                        <View style={[Styles.ml10]}>
+                  icon={<MaterialCommunityIcons name="account-remove" color={colors.text} size={25} />}
-                           <Text style={[Styles.textDefault]}>{dataMemberChoose.isAdmin ? 'Memberhentikan sebagai admin' : 'Jadikan admin'}</Text>
+                  title="Keluarkan"
-                        </View>
+                  onPress={handleMemberOut}
-                     </View>
+               />
-                  </View>
-               </Pressable>
-
-               <Pressable style={[Styles.wrapItemBorderBottom]} onPress={() => { handleMemberOut() }}>
-                  <View style={[Styles.rowItemsCenter]}>
-                     <View style={[Styles.iconContent, ColorsStatus.info]}>
-                        <MaterialCommunityIcons name="close-circle" size={25} color={colors.primary} />
-                     </View>
-                     <View style={[Styles.rowSpaceBetween, { width: '88%' }]}>
-                        <View style={[Styles.ml10]}>
-                           <Text style={[Styles.textDefault]}>Keluarkan dari divisi</Text>
-                        </View>
-                     </View>
-                  </View>
-               </Pressable>
             </View>
          </DrawerBottom>
 

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

@@ -117,7 +117,7 @@ export default function CreateDivisionAddAdmin() {
                         return (
                            <Pressable
                               key={index}
-                              style={[Styles.itemSelectModal]}
+                              style={[Styles.itemSelectModal, { borderBottomColor: colors.icon + '20' }]}
                               onPress={() => {
                                  !found && onChoose(item.idUser)
                               }}

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

@@ -121,7 +121,7 @@ export default function CreateDivisionAddMember() {
                         return (
                            <Pressable
                               key={index}
-                              style={[Styles.itemSelectModal]}
+                              style={[Styles.itemSelectModal, { borderBottomColor: colors.icon + '20' }]}
                               onPress={() => {
                                  !found && onChoose(item.id, item.name, item.img)
                               }}

app/(application)/division/index.tsx

@@ -206,7 +206,7 @@ export default function ListDivision() {
                </Pressable>
             </View>
             {(entityUser.role == "supadmin" || entityUser.role == "developer") && (
-               <View style={[Styles.mv05, Styles.rowOnly]}>
+               <View style={[Styles.mt10, Styles.rowOnly]}>
                   <Text>Filter :</Text>
                   <LabelStatus size="small" category="secondary" text={nameGroup} style={[Styles.mh05]} />
                </View>

app/(application)/member/index.tsx

@@ -142,7 +142,7 @@ export default function Index() {
             <InputSearch onChange={setSearch} />
             {
                (entityUser.role == "supadmin" || entityUser.role == "developer") &&
-               <View style={[Styles.mv05, Styles.rowOnly]}>
+               <View style={[Styles.mt10, Styles.rowOnly]}>
                   <Text>Filter :</Text>
                   <LabelStatus size="small" category="secondary" text={nameGroup} style={[Styles.mh05]} />
                </View>

app/(application)/position/index.tsx

@@ -185,7 +185,7 @@ export default function Index() {
             <InputSearch onChange={setSearch} />
             {
                (entityUser.role == "supadmin" || entityUser.role == "developer") &&
-               <View style={[Styles.mv05, Styles.rowOnly]}>
+               <View style={[Styles.mt10, Styles.rowOnly]}>
                   <Text>Filter :</Text>
                   <LabelStatus size="small" category="secondary" text={nameGroup} style={[Styles.mh05]} />
                </View>

components/imageNew.tsx

@@ -1,4 +1,5 @@
 import Styles from "@/constants/Styles";
+import { useTheme } from "@/providers/ThemeProvider";
 import { useState } from "react";
 import { Image } from "react-native";
 
@@ -9,12 +10,16 @@ type Props = {
    onError?: (val:boolean) => void
 }
 
-export default function ImageUser({ src, size, onError }: Props) {
+export default function ImageUser({ src, size, border = true, onError }: Props) {
    const [error, setError] = useState(false)
+   const { colors } = useTheme()
    return (
       <Image
          source={error ? require('../assets/images/user.jpg') : { uri: src }}
-         style={[size == 'xs' ? Styles.userProfileExtraSmall : size == 'lg' ? Styles.userProfileBig : Styles.userProfileSmall, Styles.borderAll]}
+         style={[
+            size == 'xs' ? Styles.userProfileExtraSmall : size == 'lg' ? Styles.userProfileBig : Styles.userProfileSmall,
+            border && { borderWidth: 1, borderColor: colors.icon + '40', borderRadius: 100 }
+         ]}
          onError={() => {
             setError(true)
             onError?.(true)

constants/styles/announcement.styles.ts

@@ -0,0 +1,39 @@
+import { StyleSheet } from "react-native";
+
+const AnnouncementStyles = StyleSheet.create({
+   // list (index.tsx)
+   announcementListContainer:     { padding: 15, paddingBottom: 0 },
+   announcementListInner:         { marginTop: 10 },
+   announcementListCard:          { borderRadius: 8, borderWidth: 1, padding: 12 },
+   announcementListCardHeader:    { marginBottom: 6 },
+   announcementListTitleRow:      { flex: 1, gap: 8, marginRight: 8, flexDirection: 'row', alignItems: 'center' },
+   announcementListIconBox:       { width: 28, height: 28, borderRadius: 8, alignItems: 'center', justifyContent: 'center' },
+   announcementListTitleText:     { flex: 1 },
+   announcementListDateText:      { flexShrink: 0 },
+   announcementListDescText:      { lineHeight: 20 },
+   announcementListSeparator:     { height: 8 },
+   announcementListSkeletonCard:  { gap: 8 },
+   announcementListSkeletonHeader: { marginBottom: 4 },
+   announcementListSkeletonTitleRow: { gap: 8, flex: 1, flexDirection: 'row', alignItems: 'center' },
+
+   // detail ([id].tsx)
+   announcementDetailContainer:         { padding: 15, paddingBottom: 50, gap: 12 },
+   announcementDetailCard:              { borderRadius: 8 },
+   announcementDetailSkeletonGap:       { gap: 8 },
+   announcementDetailSkeletonIconRow:   { gap: 10, marginBottom: 2 },
+   announcementDetailTitleRow:          { gap: 10, marginBottom: 10 },
+   announcementDetailIconBox:           { width: 38, height: 38, borderRadius: 8 },
+   announcementDetailTitleText:         { fontSize: 17, lineHeight: 24, flex: 1 },
+   announcementDetailSectionLabelRow:   { marginBottom: 8, gap: 6 },
+   announcementDetailFileCardPadding:   { padding: 10 },
+   announcementDetailFileChipList:      { gap: 8 },
+   announcementDetailFileChip:          { flexDirection: 'row', alignItems: 'center', gap: 6, paddingHorizontal: 12, paddingVertical: 8, borderRadius: 20, borderWidth: 1 },
+   announcementDetailFileChipText:      { maxWidth: 120 },
+   announcementDetailRecipientGap:      { gap: 10 },
+   announcementDetailGroupSeparator:    { marginTop: 12, paddingTop: 12, borderTopWidth: 1 },
+   announcementDetailGroupLabel:        { marginBottom: 6 },
+   announcementDetailDivisionRow:       { gap: 8, paddingVertical: 6 },
+   announcementDetailDivisionIconCircle: { width: 26, height: 26, borderRadius: 100, alignItems: 'center', justifyContent: 'center' },
+});
+
+export default AnnouncementStyles;

constants/styles/approval.styles.ts

@@ -2,7 +2,7 @@ import { StyleSheet } from "react-native";
 
 const ApprovalStyles = StyleSheet.create({
    approvalBadge: { borderRadius: 20, paddingHorizontal: 10, paddingVertical: 3, alignSelf: 'flex-start' },
-   approvalItem: { borderWidth: 1, borderRadius: 10, padding: 12, marginBottom: 10 },
+   approvalItem: { borderWidth: 1, borderRadius: 8, padding: 12, marginBottom: 10 },
    approvalItemHeader: { justifyContent: 'space-between', marginBottom: 8 },
    approvalIconMr: { marginRight: 6 },
    approvalNoteBox: { borderRadius: 8, padding: 8, marginTop: 4 },

constants/styles/border.styles.ts

@@ -1,12 +1,15 @@
 import { StyleSheet } from "react-native";
 
 const BorderStyles = StyleSheet.create({
-   round05: { borderRadius: 5 },
+   round04: { borderRadius: 4 },
+   round05: { borderRadius: 8 },
    round08: { borderRadius: 8 },
    round10: { borderRadius: 10 },
+   round12: { borderRadius: 12 },
    round15: { borderRadius: 15 },
    round20: { borderRadius: 20 },
    round30: { borderRadius: 30 },
+   roundFull: { borderRadius: 100 },
    borderRight: { borderRightWidth: 1, borderRightColor: '#d6d8f6' },
    borderLeft: { borderLeftWidth: 1, borderLeftColor: '#d6d8f6' },
    borderBottom: { borderBottomWidth: 1, borderBottomColor: '#d6d8f6' },

constants/styles/button.styles.ts

@@ -2,7 +2,7 @@ import { StyleSheet } from "react-native";
 
 const ButtonStyles = StyleSheet.create({
    btnIconHeader: { padding: 3 },
-   btnFiturMenu: { padding: 13, borderRadius: 15, borderWidth: 1 },
+   btnFiturMenu: { padding: 13, borderRadius: 20, borderWidth: 1 },
    btnRound: {
       backgroundColor: '#1F3C88',
       borderWidth: 0,
@@ -37,8 +37,8 @@ const ButtonStyles = StyleSheet.create({
       padding: 5,
       borderWidth: 1,
    },
-   labelStatus: { paddingHorizontal: 15, borderRadius: 10 },
+   labelStatus: { paddingHorizontal: 15, paddingVertical: 4, borderRadius: 20 },
-   labelStatusSmall: { paddingHorizontal: 10, borderRadius: 10 },
+   labelStatusSmall: { paddingHorizontal: 10, paddingVertical: 3, borderRadius: 20 },
 });
 
 export default ButtonStyles;

constants/styles/card.styles.ts

@@ -4,7 +4,7 @@ const CardStyles = StyleSheet.create({
    wrapPaper: {
       padding: 10,
       backgroundColor: 'white',
-      borderRadius: 5,
+      borderRadius: 8,
       shadowColor: '#171717',
       shadowOffset: { width: 0, height: 0 },
       shadowOpacity: 0.1,
@@ -31,7 +31,7 @@ const CardStyles = StyleSheet.create({
       shadowOpacity: 0.1,
       shadowRadius: 5,
       elevation: 2,
-      borderRadius: 5,
+      borderRadius: 8,
       marginBottom: 15,
    },
    wrapGridCaraousel: {
@@ -42,7 +42,7 @@ const CardStyles = StyleSheet.create({
       shadowOpacity: 0.1,
       shadowRadius: 5,
       elevation: 2,
-      borderRadius: 5,
+      borderRadius: 8,
       marginLeft: 5,
       display: 'flex',
    },
@@ -57,27 +57,27 @@ const CardStyles = StyleSheet.create({
       paddingVertical: 25,
       paddingHorizontal: 20,
       alignItems: 'center',
-      borderTopStartRadius: 5,
+      borderTopStartRadius: 8,
-      borderTopEndRadius: 5,
+      borderTopEndRadius: 8,
    },
    contentPaperGrid: {
       height: 125,
-      borderBottomEndRadius: 5,
+      borderBottomEndRadius: 8,
-      borderBottomStartRadius: 5,
+      borderBottomStartRadius: 8,
       paddingHorizontal: 20,
       justifyContent: 'space-evenly',
    },
    contentPaperGrid2: {
       height: 100,
-      borderBottomEndRadius: 5,
+      borderBottomEndRadius: 8,
-      borderBottomStartRadius: 5,
+      borderBottomStartRadius: 8,
       paddingHorizontal: 20,
       paddingVertical: 15,
       justifyContent: 'flex-start',
    },
    wrapGridItem: {
       borderWidth: 1,
-      borderRadius: 5,
+      borderRadius: 8,
       padding: 10,
       flexDirection: 'row',
       alignItems: 'center',
@@ -88,13 +88,13 @@ const CardStyles = StyleSheet.create({
       flexDirection: 'row',
       alignItems: 'center',
       backgroundColor: 'transparent',
-      borderRadius: 10,
+      borderRadius: 8,
       borderWidth: 1,
       paddingHorizontal: 12,
       paddingVertical: 10,
       gap: 12,
    },
-   sectionCard: { borderRadius: 12, padding: 16, borderWidth: 1 },
+   sectionCard: { borderRadius: 8, padding: 16, borderWidth: 1 },
    sectionHeader: { flexDirection: 'row', alignItems: 'center', marginBottom: 12 },
    sectionHeaderRow: {
       flexDirection: 'row',
@@ -110,12 +110,12 @@ const CardStyles = StyleSheet.create({
       justifyContent: 'center',
    },
    sectionActionRow: { flexDirection: 'row', alignItems: 'center', gap: 10 },
-   sectionBadge: { borderRadius: 10, paddingHorizontal: 8, paddingVertical: 2 },
+   sectionBadge: { borderRadius: 20, paddingHorizontal: 8, paddingVertical: 2 },
    wrapBar: { height: 20, backgroundColor: '#ccc', borderRadius: 10, margin: 0, width: '100%' },
    contentBar: { height: 20, backgroundColor: '#3B82F6', borderRadius: 10 },
    toastContainer: {
       backgroundColor: 'white',
-      borderRadius: 10,
+      borderRadius: 8,
       padding: 10,
       width: '90%',
       borderWidth: 1,
@@ -135,7 +135,7 @@ const CardStyles = StyleSheet.create({
    loadingBox: {
       paddingVertical: 15,
       paddingHorizontal: 40,
-      borderRadius: 5,
+      borderRadius: 8,
       alignItems: 'center',
       gap: 10,
    },
@@ -143,16 +143,16 @@ const CardStyles = StyleSheet.create({
       flex: 1,
       justifyContent: "center",
       marginHorizontal: 15,
-      borderRadius: 15,
+      borderRadius: 8,
       backgroundColor: '#19345E',
       display: 'flex',
       width: '92%',
       resizeMode: 'stretch',
       overflow: 'hidden',
    },
-   wrapItemDiscussion: { padding: 15, borderRadius: 5, borderBottomWidth: 1 },
+   wrapItemDiscussion: { padding: 15, borderRadius: 8, borderBottomWidth: 1 },
    wrapItemBorderBottom: { padding: 10, borderBottomWidth: 1 },
-   wrapItemBorderAll: { padding: 10, borderWidth: 1, borderRadius: 5, marginBottom: 5 },
+   wrapItemBorderAll: { padding: 10, borderWidth: 1, borderRadius: 8, marginBottom: 5 },
    wrapItemBorderNone: { padding: 10, marginBottom: 5 },
 });
 

constants/styles/component.styles.ts

@@ -5,14 +5,14 @@ const ComponentStyles = StyleSheet.create({
    userProfileExtraSmall: { width: 35, height: 35, borderRadius: 100 },
    userProfileSmall: { width: 48, height: 48, borderRadius: 100 },
    userProfileBig: { width: 100, height: 100, borderRadius: 100 },
-   imgListBanner: { width: 100, height: 50, borderRadius: 5 },
+   imgListBanner: { width: 100, height: 50, borderRadius: 8 },
    iconContent: { padding: 10, borderRadius: 100, backgroundColor: '#E5E7EB' },
 
    // chip
    chip: {
       paddingVertical: 5,
       paddingHorizontal: 15,
-      borderRadius: 5,
+      borderRadius: 20,
       borderWidth: 1,
       borderColor: "transparent",
       marginRight: 10,
@@ -26,14 +26,14 @@ const ComponentStyles = StyleSheet.create({
       top: -6,
       left: -6,
       backgroundColor: "#384288",
-      borderRadius: 10,
+      borderRadius: 8,
       padding: 2,
    },
 
    // badge & progress
    badgeCol: { alignItems: 'center', gap: 6 },
-   progressBadge: { borderRadius: 10, paddingHorizontal: 12, paddingVertical: 5, borderWidth: 1, alignItems: 'center' },
+   progressBadge: { borderRadius: 8, paddingHorizontal: 12, paddingVertical: 5, borderWidth: 1, alignItems: 'center' },
-   taskCountBadge: { borderRadius: 6, paddingHorizontal: 7, paddingVertical: 2 },
+   taskCountBadge: { borderRadius: 8, paddingHorizontal: 7, paddingVertical: 2 },
    positionBadge: { borderRadius: 20, paddingHorizontal: 8, paddingVertical: 3 },
    textProgressPercent: { fontSize: 22, fontWeight: 'bold', lineHeight: 28 },
    progressTrack: { height: 8, borderRadius: 4, overflow: 'hidden' },
@@ -41,11 +41,11 @@ const ComponentStyles = StyleSheet.create({
    reportContent: { borderLeftWidth: 3, paddingLeft: 12 },
    expandBtn: { flexDirection: 'row', alignItems: 'center', alignSelf: 'flex-start', marginTop: 8, gap: 4 },
    fileGrid: { flexDirection: 'row', flexWrap: 'wrap', gap: 8 },
-   fileCard: { width: '48%', borderRadius: 10, borderWidth: 1, padding: 12, flexDirection: 'row', alignItems: 'center', gap: 10 },
+   fileCard: { width: '48%', borderRadius: 8, borderWidth: 1, padding: 12, flexDirection: 'row', alignItems: 'center', gap: 10 },
 
    // calendar
-   signDate: { width: 20, height: 2, borderRadius: 3, marginTop: 3 },
+   signDate: { width: 20, height: 2, borderRadius: 4, marginTop: 3 },
-   selectedDate: { backgroundColor: '#238be6', borderRadius: 5 },
+   selectedDate: { backgroundColor: '#238be6', borderRadius: 4 },
    selectRangeDate: { backgroundColor: '#228be61f' },
    calendarDotRow: { flexDirection: 'row', gap: 2, height: 6, marginTop: 1 },
    calendarDot: { width: 5, height: 5, borderRadius: 3 },
@@ -55,7 +55,7 @@ const ComponentStyles = StyleSheet.create({
    villageEventBadge: { paddingHorizontal: 6, paddingVertical: 2, borderRadius: 4, marginRight: 6 },
 
    // event item
-   itemEvent: { padding: 10, borderRadius: 10, flexDirection: 'row', alignContent: 'stretch', marginBottom: 10 },
+   itemEvent: { padding: 10, borderRadius: 8, flexDirection: 'row', alignContent: 'stretch', marginBottom: 10 },
    dividerEvent: { width: 7, borderRadius: 5, marginRight: 10 },
 
    // member
@@ -75,17 +75,22 @@ const ComponentStyles = StyleSheet.create({
    memberInfoContent: { flex: 1, marginLeft: 10 },
 
    // discussion
-   discussionCard: { borderRadius: 10, borderWidth: 1, padding: 14 },
+   discussionCard: { borderRadius: 8, borderWidth: 1, padding: 14 },
-   discussionIconCircle: { width: 40, height: 40, borderRadius: 20, alignItems: 'center', justifyContent: 'center', flexShrink: 0 },
+   discussionIconCircle: { width: 40, height: 40, borderRadius: 100, alignItems: 'center', justifyContent: 'center', flexShrink: 0 },
-   discussionIconCircleLg: { width: 44, height: 44, borderRadius: 22, alignItems: 'center', justifyContent: 'center' },
+   discussionIconCircleLg: { width: 44, height: 44, borderRadius: 100, alignItems: 'center', justifyContent: 'center' },
    discussionStatusPill: { alignSelf: 'flex-start', marginTop: 3, paddingHorizontal: 8, paddingVertical: 2, borderRadius: 20, borderWidth: 1 },
    discussionStatusText: { fontSize: 11, fontWeight: '600' },
    discussionCardIndent: { marginLeft: 50 },
    discussionSeparator: { height: 8 },
    discussionCommentText: { fontSize: 12, marginLeft: 5 },
    discussionDateText: { fontSize: 11 },
-   discussionCommentCard: { borderRadius: 10, borderWidth: 1, padding: 12, marginBottom: 8, flexDirection: 'row' },
+   discussionCommentCard: { borderRadius: 8, borderWidth: 1, padding: 12, marginBottom: 8, flexDirection: 'row' },
    discussionEditedText: { fontSize: 10, fontStyle: 'italic' },
+   discussionHeaderPadding: { paddingTop: 12 },
+   discussionListPadding: { paddingTop: 8 },
+   discussionTitleCol: { marginLeft: 10 },
+   discussionDescMargin: { marginBottom: 10 },
+   discussionEmptyText: { fontSize: 14 },
 
    // guide overlay
    guideOverlay: { flex: 1, backgroundColor: 'rgba(0,0,0,0.6)', justifyContent: 'center', alignItems: 'center' },
@@ -93,7 +98,7 @@ const ComponentStyles = StyleSheet.create({
       position: 'absolute',
       left: 24,
       right: 24,
-      borderRadius: 16,
+      borderRadius: 8,
       padding: 20,
       shadowColor: '#000',
       shadowOffset: { width: 0, height: 4 },

constants/styles/index.ts

@@ -11,6 +11,7 @@ import HeaderStyles from './header.styles';
 import ComponentStyles from './component.styles';
 import NotificationStyles from './notification.styles';
 import ApprovalStyles from './approval.styles';
+import AnnouncementStyles from './announcement.styles';
 
 const Styles = StyleSheet.create({
    ...SpacingStyles,
@@ -25,6 +26,7 @@ const Styles = StyleSheet.create({
    ...ComponentStyles,
    ...NotificationStyles,
    ...ApprovalStyles,
+   ...AnnouncementStyles,
 });
 
 export default Styles;

constants/styles/input.styles.ts

@@ -2,7 +2,7 @@ import { StyleSheet } from "react-native";
 
 const InputStyles = StyleSheet.create({
    inputRoundForm: {
-      borderRadius: 5,
+      borderRadius: 12,
       borderColor: '#d6d8f6',
       borderWidth: 1,
       paddingVertical: 10,
@@ -25,7 +25,7 @@ const InputStyles = StyleSheet.create({
       lineHeight: 45,
       fontSize: 24,
       borderWidth: 1,
-      borderRadius: 15,
+      borderRadius: 12,
       borderColor: 'gray',
       textAlign: 'center',
    },

constants/styles/modal.styles.ts

@@ -6,31 +6,31 @@ const ModalStyles = StyleSheet.create({
       width: '100%',
       paddingBottom: 20,
       backgroundColor: 'white',
-      borderTopRightRadius: 18,
+      borderTopRightRadius: 20,
-      borderTopLeftRadius: 18,
+      borderTopLeftRadius: 20,
       position: 'absolute',
       bottom: 0,
    },
    modalContentNew: {
       width: '100%',
       backgroundColor: 'white',
-      borderTopRightRadius: 18,
+      borderTopRightRadius: 20,
-      borderTopLeftRadius: 18,
+      borderTopLeftRadius: 20,
       paddingTop: 5,
       paddingBottom: 5,
       paddingHorizontal: 20,
    },
    modalFloatContent: {
       backgroundColor: 'white',
-      borderRadius: 18,
+      borderRadius: 20,
       paddingTop: 5,
       paddingBottom: 10,
       paddingHorizontal: 20,
    },
    titleContainer: {
       backgroundColor: 'white',
-      borderTopRightRadius: 10,
+      borderTopRightRadius: 20,
-      borderTopLeftRadius: 10,
+      borderTopLeftRadius: 20,
       paddingHorizontal: 20,
       flexDirection: 'row',
       alignItems: 'center',
@@ -65,7 +65,7 @@ const ModalStyles = StyleSheet.create({
    },
    modalConfirmContainer: {
       width: '80%',
-      borderRadius: 14,
+      borderRadius: 8,
       overflow: 'hidden',
       elevation: 2,
       shadowColor: '#000',
@@ -92,7 +92,7 @@ const ModalStyles = StyleSheet.create({
       position: 'absolute',
       width: 300,
       height: 300,
-      borderRadius: 150,
+      borderRadius: 100,
       backgroundColor: 'rgba(255, 255, 255, 0.05)',
       top: -50,
       right: -50,

constants/styles/notification.styles.ts

@@ -8,7 +8,7 @@ const NotificationStyles = StyleSheet.create({
    notifItemRow: {
       flexDirection: 'row',
       alignItems: 'center',
-      borderRadius: 10,
+      borderRadius: 8,
       borderWidth: 1,
       paddingHorizontal: 12,
       paddingVertical: 10,
@@ -17,7 +17,7 @@ const NotificationStyles = StyleSheet.create({
    notifIconContainer: {
       width: 42,
       height: 42,
-      borderRadius: 21,
+      borderRadius: 100,
       alignItems: 'center',
       justifyContent: 'center',
       flexShrink: 0,

ios/Desa.xcodeproj/project.pbxproj

@@ -394,7 +394,7 @@
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
 				PRODUCT_BUNDLE_IDENTIFIER = mobiledarmasaba.app;
-				PRODUCT_NAME = Desa;
+				PRODUCT_NAME = "Desa";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Desa/Desa-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -429,7 +429,7 @@
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = mobiledarmasaba.app;
-				PRODUCT_NAME = Desa;
+				PRODUCT_NAME = "Desa";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Desa/Desa-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

ios/Desa/Info.plist

@@ -19,7 +19,7 @@
     <key>CFBundlePackageType</key>
     <string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
     <key>CFBundleShortVersionString</key>
-    <string>2.1.0</string>
+    <string>2.2.0</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleURLTypes</key>
@@ -39,7 +39,7 @@
       </dict>
     </array>
     <key>CFBundleVersion</key>
-    <string>9</string>
+    <string>10</string>
     <key>ITSAppUsesNonExemptEncryption</key>
     <false/>
     <key>LSMinimumSystemVersion</key>