Merge pull request 'join' (#19) from join into v1

Reviewed-on: http://wibugit.wibudev.com/wibu/mobile-darmasaba/pulls/19

CLAUDE.md

@@ -1,37 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
-
-## Project Overview
-
-**Desa+** is a React Native (Expo) mobile app for village administration — managing announcements, projects, discussions, members, divisions, and documents. Primary platforms are Android and iOS.
-
-## Commands
-
-```bash
-npm run start           # Start Expo dev server
-npm run android         # Run on Android
-npm run ios             # Run on iOS
-npm run lint            # Expo lint
-npm run test            # Jest tests
-npm run build:android   # Production Android build via EAS (bumps version first)
-```
-
-Run a single test file:
-```bash
-bunx jest path/to/test.tsx --no-coverage
-```
-
-> Project uses **Bun** as the package manager (`bun.lock` present). Use `bun add` / `bunx` instead of `npm install` / `npx`.
-
-## Architecture
-
-See @docs/ARCHITECTURE.md
-
-## Key Conventions
-
-See @docs/CONVENTIONS.md
-
-## File Health
-
-See @docs/FILE-HEALTH.md

GEMINI.md

@@ -1,86 +0,0 @@
-# Project Overview: Desa+
-
-Desa+ is a mobile application built with React Native and Expo, designed to facilitate management and communication within villages/communities. It aims to streamline village administration, inter-community communication, and the management of essential information.
-
-## Key Features:
-- Village announcements and information
-- Community discussion forum
-- Village activity calendar
-- Village documentation and archives
-- Project and task management
-- Member and organizational structure management
-- Push notifications for important updates
-- Verification and authentication features
-
-## Technologies Used:
-- **React Native**: Cross-platform mobile development framework.
-- **Expo**: Platform for React Native application development.
-- **Firebase**: Backend services including Authentication, Realtime Database, and Cloud Messaging.
-- **Redux Toolkit**: State management.
-- **React Navigation**: Application navigation.
-- **TypeScript**: For type safety.
-
-## Building and Running:
-
-### Installation
-1.  **Clone the repository:**
-    ```bash
-    git clone <repository-url>
-    cd mobile-darmasaba
-    ```
-2.  **Install dependencies:**
-    ```bash
-    npm install
-    ```
-3.  **Configure environment variables:**
-    Create a `.env` file in the root directory and add the following variables:
-    ```
-    URL_API=<api-endpoint>
-    URL_OTP=<otp-service-endpoint>
-    URL_STORAGE=<storage-endpoint>
-    URL_FIREBASE_DB=<firebase-database-url>
-    PASS_ENC=<encryption-password>
-    WA_SERVER_TOKEN=<whatsapp-server-token>
-    IOS_GOOGLE_SERVICES_FILE=<path-to-ios-google-services>
-    ```
-
-### Running the Application
--   **Start development server:**
-    ```bash
-    npx expo start
-    ```
--   **Run on Android emulator/device:**
-    ```bash
-    npm run android
-    ```
--   **Run on iOS simulator/device:**
-    ```bash
-    npm run ios
-    ```
-
-### Build Production
--   **Build Android production package:**
-    ```bash
-    npm run build:android
-    ```
-
-## Development Conventions:
-
-### Project Structure:
--   `app/`: Main page files.
--   `components/`: Reusable UI components, categorized by feature (e.g., `announcement/`, `auth/`, `discussion/`).
--   `assets/`: Images and static assets.
--   `constants/`: Global constants.
--   `lib/`: Libraries and utilities.
-
-### Contribution Guidelines:
-1.  Fork the repository.
-2.  Create a new feature branch (`git checkout -b feature/FeatureName`).
-3.  Commit your changes (`git commit -m 'Add FeatureName feature'`).
-4.  Push to the branch (`git push origin feature/FeatureName`).
-5.  Create a pull request.
-
-## Platform Support:
--   ✅ Android
--   ✅ iOS
--   ❌ Web (not yet optimized)

README.md

@@ -1,6 +1,6 @@
 # Desa+
 
-Desa+ (Desa Plus) adalah aplikasi mobile berbasis React Native yang dikembangkan dengan Expo untuk membantu pengelolaan dan komunikasi di lingkungan desa/kelurahan. Aplikasi ini menyediakan berbagai fitur untuk memudahkan administrasi desa, komunikasi antar warga, dan pengelolaan informasi penting.
+Desa+ adalah aplikasi mobile berbasis React Native yang dikembangkan dengan Expo untuk membantu pengelolaan dan komunikasi di lingkungan desa/kelurahan. Aplikasi ini menyediakan berbagai fitur untuk memudahkan administrasi desa, komunikasi antar warga, dan pengelolaan informasi penting.
 
 ## Fitur Utama
 

__tests__/ErrorBoundary-test.tsx

@@ -1,77 +0,0 @@
-import React from 'react';
-import { render, fireEvent } from '@testing-library/react-native';
-import ErrorBoundary from '@/components/ErrorBoundary';
-
-// Komponen yang sengaja throw error saat render
-const BrokenComponent = () => {
-  throw new Error('Test error boundary!');
-};
-
-// Komponen normal
-const NormalComponent = () => <></>;
-
-// Suppress React's error boundary console output selama test
-
-beforeEach(() => {
-  jest.spyOn(console, 'error').mockImplementation(() => {});
-});
-
-afterEach(() => {
-  (console.error as jest.Mock).mockRestore();
-});
-
-describe('ErrorBoundary', () => {
-  it('merender children dengan normal jika tidak ada error', () => {
-    // Tidak boleh throw dan tidak menampilkan teks error
-    const { queryByText } = render(
-      <ErrorBoundary>
-        <NormalComponent />
-      </ErrorBoundary>
-    );
-    expect(queryByText('Terjadi Kesalahan')).toBeNull();
-  });
-
-  it('menampilkan UI fallback ketika child throw error', () => {
-    const { getByText } = render(
-      <ErrorBoundary>
-        <BrokenComponent />
-      </ErrorBoundary>
-    );
-    expect(getByText('Terjadi Kesalahan')).toBeTruthy();
-  });
-
-  it('menampilkan pesan error yang dilempar', () => {
-    const { getByText } = render(
-      <ErrorBoundary>
-        <BrokenComponent />
-      </ErrorBoundary>
-    );
-    expect(getByText('Test error boundary!')).toBeTruthy();
-  });
-
-  it('merender custom fallback jika prop fallback diberikan', () => {
-    const { getByText } = render(
-      <ErrorBoundary fallback={<></>}>
-        <BrokenComponent />
-      </ErrorBoundary>
-    );
-    // Custom fallback fragment kosong — pastikan teks default tidak muncul
-    expect(() => getByText('Terjadi Kesalahan')).toThrow();
-  });
-
-  it('mereset error state saat tombol Coba Lagi ditekan', () => {
-    const { getByText } = render(
-      <ErrorBoundary>
-        <BrokenComponent />
-      </ErrorBoundary>
-    );
-
-    const button = getByText('Coba Lagi');
-    expect(button).toBeTruthy();
-
-    // Tekan tombol reset — hasError kembali false, BrokenComponent throw lagi
-    // sehingga fallback muncul kembali (membuktikan reset berjalan)
-    fireEvent.press(button);
-    expect(getByText('Terjadi Kesalahan')).toBeTruthy();
-  });
-});

android/app/build.gradle

@@ -92,8 +92,8 @@ android {
         applicationId 'mobiledarmasaba.app'
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 17
+        versionCode 6
-        versionName "2.2.0"
+        versionName "1.0.2"
     }
     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"/>

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

@@ -1,9 +1,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
     <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
+    <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
     <item name="colorPrimary">@color/colorPrimary</item>
     <item name="android:statusBarColor">#ffffff</item>
-    <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
   </style>
   <style name="Theme.App.SplashScreen" parent="Theme.SplashScreen">
     <item name="windowSplashScreenBackground">@color/splashscreen_background</item>

app.config.js

@@ -4,7 +4,7 @@ export default {
    expo: {
       name: "Desa+",
       slug: "mobile-darmasaba",
-      version: "2.2.0", // Versi aplikasi (App Store)
+      version: "2.0.5", // 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: "10",
+         buildNumber: "7",
          infoPlist: {
             ITSAppUsesNonExemptEncryption: false,
             CFBundleDisplayName: "Desa+"
@@ -23,7 +23,7 @@ export default {
       },
       android: {
          package: "mobiledarmasaba.app",
-         versionCode: 19,
+         versionCode: 15,
          adaptiveIcon: {
             foregroundImage: "./assets/images/logo-icon-small.png",
             backgroundColor: "#ffffff"
@@ -32,7 +32,9 @@ export default {
          permissions: [
             "READ_EXTERNAL_STORAGE",
             "WRITE_EXTERNAL_STORAGE",
-            "READ_MEDIA_AUDIO"
+            "READ_MEDIA_IMAGES",   // Android 13+
+            "READ_MEDIA_VIDEO",    // Android 13+
+            "READ_MEDIA_AUDIO"     // Android 13+
          ]
       },
       web: {
@@ -77,14 +79,6 @@ export default {
          URL_FIREBASE_DB: process.env.URL_FIREBASE_DB,
          PASS_ENC: process.env.PASS_ENC,
          WA_SERVER_TOKEN: process.env.WA_SERVER_TOKEN,
-         FIREBASE_API_KEY: process.env.FIREBASE_API_KEY,
-         FIREBASE_AUTH_DOMAIN: process.env.FIREBASE_AUTH_DOMAIN,
-         FIREBASE_PROJECT_ID: process.env.FIREBASE_PROJECT_ID,
-         FIREBASE_STORAGE_BUCKET: process.env.FIREBASE_STORAGE_BUCKET,
-         FIREBASE_MESSAGING_SENDER_ID: process.env.FIREBASE_MESSAGING_SENDER_ID,
-         FIREBASE_APP_ID: process.env.FIREBASE_APP_ID,
-         URL_MONITORING: process.env.URL_MONITORING,
-         KEY_API_MONITORING: process.env.KEY_API_MONITORING,
       }
    }
 };

app/(application)/_layout.tsx

@@ -1,6 +1,5 @@
 import HeaderRightAnnouncementList from "@/components/announcement/headerAnnouncementList";
 import AppHeader from "@/components/AppHeader";
-import Styles from "@/constants/Styles";
 import HeaderDiscussionGeneral from "@/components/discussion_general/headerDiscussionGeneral";
 import HeaderRightDivisionList from "@/components/division/headerDivisionList";
 import HeaderRightGroupList from "@/components/group/headerGroupList";
@@ -9,106 +8,28 @@ import HeaderRightPositionList from "@/components/position/headerRightPositionLi
 import HeaderRightProjectList from "@/components/project/headerProjectList";
 import Text from "@/components/Text";
 import ToastCustom from "@/components/toastCustom";
-import ModalUpdateMaintenance from "@/components/ModalUpdateMaintenance";
+import { apiReadOneNotification } from "@/lib/api";
-import { apiGetVersion, apiReadOneNotification } from "@/lib/api";
 import { pushToPage } from "@/lib/pushToPage";
 import store from "@/lib/store";
 import { useAuthSession } from "@/providers/AuthProvider";
 import AsyncStorage from "@react-native-async-storage/async-storage";
-import Constants from "expo-constants";
 import { getApp } from "@react-native-firebase/app";
 import { getMessaging, onMessage } from "@react-native-firebase/messaging";
 import { Redirect, router, Stack, usePathname } from "expo-router";
-import { StatusBar } from 'expo-status-bar'; 
+import { StatusBar } from 'expo-status-bar';
-import { useEffect, useState } from "react";
+import { useEffect } from "react";
-import { Easing, Notifier, NotifierComponents } from 'react-native-notifier';
+import { Easing, Notifier } from 'react-native-notifier';
 import { Provider } from "react-redux";
-import { useTheme } from "@/providers/ThemeProvider";
 
 export default function RootLayout() {
    const { token, decryptToken, isLoading } = useAuthSession()
    const pathname = usePathname()
-   const { colors } = useTheme()
-   const [modalUpdateMaintenance, setModalUpdateMaintenance] = useState(false)
-   const [modalType, setModalType] = useState<'update' | 'maintenance'>('update')
-   const [isForceUpdate, setIsForceUpdate] = useState(false)
-   const [updateMessage, setUpdateMessage] = useState('')
-
-   const currentVersion = Constants.expoConfig?.version ?? '0.0.0'
-
-   const compareVersions = (v1: string, v2: string) => {
-      const parts1 = v1.split('.').map(Number);
-      const parts2 = v2.split('.').map(Number);
-      for (let i = 0; i < Math.max(parts1.length, parts2.length); i++) {
-         const p1 = parts1[i] || 0;
-         const p2 = parts2[i] || 0;
-         if (p1 < p2) return -1;
-         if (p1 > p2) return 1;
-      }
-      return 0;
-   };
-
-   useEffect(() => {
-      const checkVersion = async () => {
-         try {
-            const response = await apiGetVersion();
-            if (response.success && response.data) {
-               const maintenance = response.data.find((item: any) => item.id === 'mobile_maintenance')?.value === 'true';
-               const latestVersion = response.data.find((item: any) => item.id === 'mobile_latest_version')?.value || '0.0.0';
-               const minVersion = response.data.find((item: any) => item.id === 'mobile_minimum_version')?.value || '0.0.0';
-               const message = response.data.find((item: any) => item.id === 'mobile_message_update')?.value || '';
-
-               if (maintenance) {
-                  setModalType('maintenance');
-                  setModalUpdateMaintenance(true);
-                  setIsForceUpdate(true);
-                  return;
-               }
-
-               if (compareVersions(currentVersion, minVersion) === -1) {
-                  setModalType('update');
-                  setIsForceUpdate(true);
-                  setUpdateMessage(message);
-                  setModalUpdateMaintenance(true);
-               } else if (compareVersions(currentVersion, latestVersion) === -1) {
-                  // Check if this soft update version was already dismissed
-                  const dismissedVersion = await AsyncStorage.getItem('dismissed_update_version');
-                  if (dismissedVersion !== latestVersion) {
-                     setModalType('update');
-                     setIsForceUpdate(false);
-                     setUpdateMessage(message);
-                     setModalUpdateMaintenance(true);
-                  }
-               }
-            }
-         } catch (error) {
-            console.error('Failed to check version:', error);
-         }
-      };
-
-      checkVersion();
-   }, [currentVersion]);
-
-   const handleDismissUpdate = async () => {
-      if (!isForceUpdate) {
-         try {
-            const response = await apiGetVersion();
-            const latestVersion = response.data.find((item: any) => item.id === 'mobile_latest_version')?.value;
-            if (latestVersion) {
-               await AsyncStorage.setItem('dismissed_update_version', latestVersion);
-            }
-         } catch (e) {
-            console.error(e);
-         }
-         setModalUpdateMaintenance(false);
-      }
-   }
 
    async function handleReadNotification(id: string, category: string, idContent: string, title: string) {
       try {
-         if (title !== "Komentar Baru") {
+         if (title != "Komentar Baru") {
             const hasil = await decryptToken(String(token?.current))
-            await apiReadOneNotification({ user: hasil, id: id })
+            const response = await apiReadOneNotification({ user: hasil, id: id })
          }
          pushToPage(category, idContent)
       } catch (error) {
@@ -144,34 +65,12 @@ export default function RootLayout() {
             } else if (pathname !== `/${category}/${content}`) {
                Notifier.showNotification({
                   title: title,
-                  description: String(remoteMessage.notification?.body),
+                  description: remoteMessage.notification?.body,
                   duration: 3000,
                   animationDuration: 300,
                   showEasing: Easing.ease,
                   onPress: () => handleReadNotification(String(id), String(category), String(content), String(title)),
                   hideOnPress: true,
-                  Component: NotifierComponents.Notification,
-                  componentProps: {
-                     containerStyle: [
-                        Styles.shadowBox,
-                        {
-                           backgroundColor: colors.modalBackground,
-                           borderRadius: 5,
-                           marginHorizontal: 15,
-                           marginTop: 10,
-                           padding: 15,
-                        }
-                     ],
-                     titleStyle: {
-                        color: colors.text,
-                        fontWeight: 'bold',
-                        fontSize: 16,
-                     },
-                     descriptionStyle: {
-                        color: colors.dimmed,
-                        fontSize: 14,
-                     },
-                  }
                });
             }
          }
@@ -194,15 +93,18 @@ export default function RootLayout() {
          <Stack screenOptions={{
             headerShown: true,
             animation: "slide_from_right",
+
+            // ⬇️ PENTING BANGET
             animationTypeForReplace: "pop",
             fullScreenGestureEnabled: true,
             gestureEnabled: true,
-            contentStyle: { backgroundColor: colors.header },
          }} >
             <Stack.Screen name="home" options={{ title: 'Home' }} />
             <Stack.Screen name="feature" options={{ title: 'Fitur' }} />
             <Stack.Screen name="search" options={{ title: 'Pencarian' }} />
             <Stack.Screen name="notification" options={{
+               title: 'Notifikasi',
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Notifikasi',
                headerTitleAlign: 'center',
                header: () => (
@@ -210,19 +112,11 @@ export default function RootLayout() {
                )
             }} />
             <Stack.Screen name="profile" options={{ title: 'Profile' }} />
-            <Stack.Screen name="setting/index" options={{
-               title: 'Pengaturan',
-               headerTitleAlign: 'center',
-               header: () => (
-                  <AppHeader title="Pengaturan"
-                     showBack={true}
-                     onPressLeft={() => router.back()}
-                  />
-               )
-            }} />
             <Stack.Screen name="member/index" options={{
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                title: 'Anggota',
                headerTitleAlign: 'center',
+               // headerRight: () => <HeaderMemberList />
                header: () => (
                   <AppHeader title="Anggota"
                      showBack={true}
@@ -232,8 +126,10 @@ export default function RootLayout() {
                )
             }} />
             <Stack.Screen name="discussion/index" options={{
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                title: 'Diskusi Umum',
                headerTitleAlign: 'center',
+               // headerRight: () => <HeaderDiscussionGeneral />
                header: () => (
                   <AppHeader
                      title="Diskusi Umum"
@@ -244,8 +140,10 @@ export default function RootLayout() {
                )
             }} />
             <Stack.Screen name="project/index" options={{
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                title: 'Kegiatan',
                headerTitleAlign: 'center',
+               // headerRight: () => <HeaderRightProjectList />
                header: () => (
                   <AppHeader title="Kegiatan"
                      showBack={true}
@@ -255,8 +153,10 @@ export default function RootLayout() {
                )
             }} />
             <Stack.Screen name="division/index" options={{
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                title: 'Divisi',
                headerTitleAlign: 'center',
+               // headerRight: () => <HeaderRightDivisionList />
                header: () => (
                   <AppHeader title="Divisi"
                      showBack={true}
@@ -267,8 +167,10 @@ export default function RootLayout() {
             }} />
             <Stack.Screen name="division/[id]/(fitur-division)" options={{ headerShown: false }} />
             <Stack.Screen name="group/index" options={{
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Lembaga Desa',
                headerTitleAlign: 'center',
+               // headerRight: () => <HeaderRightGroupList />
                header: () => (
                   <AppHeader title="Lembaga Desa"
                      showBack={true}
@@ -278,8 +180,10 @@ export default function RootLayout() {
                )
             }} />
             <Stack.Screen name="position/index" options={{
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Jabatan',
                headerTitleAlign: 'center',
+               // headerRight: () => <HeaderRightPositionList />
                header: () => (
                   <AppHeader title="Jabatan"
                      showBack={true}
@@ -290,8 +194,10 @@ export default function RootLayout() {
             }} />
             <Stack.Screen name="announcement/index"
                options={{
+                  // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                   headerTitle: 'Pengumuman',
                   headerTitleAlign: 'center',
+                  // headerRight: () => <HeaderRightAnnouncementList />
                   header: () => (
                      <AppHeader title="Pengumuman"
                         showBack={true}
@@ -304,13 +210,6 @@ export default function RootLayout() {
          </Stack>
          <StatusBar style={'light'} translucent={false} backgroundColor="black" />
          <ToastCustom />
-         <ModalUpdateMaintenance
-            visible={modalUpdateMaintenance}
-            type={modalType}
-            isForceUpdate={isForceUpdate}
-            customDescription={updateMessage}
-            onDismiss={handleDismissUpdate}
-         />
       </Provider>
    )
 }

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

@@ -1,15 +1,14 @@
 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";
 import { ConstEnv } from "@/constants/ConstEnv";
 import { isImageFile } from "@/constants/FileExtensions";
 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";
@@ -22,6 +21,7 @@ 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;
@@ -51,40 +51,32 @@ interface ApiResponse {
 export default function DetailAnnouncement() {
    const { id } = useLocalSearchParams<{ id: string }>();
    const { token, decryptToken } = useAuthSession()
-   const { colors } = useTheme();
    const [data, setData] = useState<AnnouncementData>({ id: '', title: '', desc: '' })
    const [dataMember, setDataMember] = useState<Record<string, MemberData[]>>({})
    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 - 62
+   const contentWidth = Dimensions.get('window').width
    const [loading, setLoading] = useState(true)
+   const arrSkeleton = Array.from({ length: 2 }, (_, index) => index)
    const [refreshing, setRefreshing] = useState(false)
    const [loadingOpen, setLoadingOpen] = useState(false)
    const [preview, setPreview] = useState(false)
    const [chooseFile, setChooseFile] = useState<FileData>()
-   const [isError, setIsError] = useState(false)
 
-   const themed = {
+   /**
-      background:      { backgroundColor: colors.background },
+    * Opens the image preview modal for the selected image file
-      card:            { backgroundColor: colors.card, borderColor: colors.icon + '18' },
+    * @param item The file data object containing image information
-      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)
          setLoading(loading)
          const hasil = await decryptToken(String(token?.current))
          const response: ApiResponse = await apiGetAnnouncementOne({ id: id, user: hasil })
@@ -93,29 +85,42 @@ export default function DetailAnnouncement() {
             setDataMember(response.member)
             setDataFile(response.file)
          } else {
-            setIsError(true)
             Toast.show({ type: 'small', text1: response.message })
          }
-      } catch (error: any) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         setIsError(true)
+         Toast.show({ type: 'small', text1: 'Gagal mengambil data' })
-         const message = error?.response?.data?.message || "Gagal mengambil data"
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
    }
 
-   useEffect(() => { handleLoad(false) }, [update])
+   useEffect(() => {
-   useEffect(() => { handleLoad(true) }, [])
+      handleLoad(false)
+   }, [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) {
-      return /<[a-z][\s\S]*>/i.test(text);
+      const htmlRegex = /<[a-z][\s\S]*>/i;
+      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)
    };
@@ -127,173 +132,173 @@ 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('android.intent.action.VIEW', {
+               await startActivityAsync(
-                  data: contentURL,
+                  'android.intent.action.VIEW',
-                  flags: 1,
+                  {
-                  type: mimeType as string,
+                     data: contentURL,
-               });
+                     flags: 1,
+                     type: mimeType as string,
+                  }
+               );
             } else if (Platform.OS === 'ios') {
                await Sharing.shareAsync(localPath);
             }
-         } catch {
+         } catch (openError) {
-            Toast.show({ type: 'error', text1: 'Tidak ada aplikasi yang dapat membuka file ini' });
+            console.error('Error opening file:', openError);
+            Toast.show({
+               type: 'error',
+               text1: 'Tidak ada aplikasi yang dapat membuka file ini'
+            });
          }
-      } catch {
+      } catch (error) {
-         Toast.show({ type: 'error', text1: 'Gagal membuka file', text2: 'Silakan coba lagi nanti' });
+         console.error('Error downloading or opening file:', error);
+         Toast.show({
+            type: 'error',
+            text1: 'Gagal membuka file',
+            text2: 'Silakan coba lagi nanti'
+         });
       } finally {
          setLoadingOpen(false);
       }
    };
 
    return (
-      <SafeAreaView style={[Styles.flex1, themed.background]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               headerTitle: 'Pengumuman',
+               headerTitleAlign: 'center',
+               // headerRight: () => entityUser.role != 'user' && entityUser.role != 'coadmin' ? <HeaderRightAnnouncementDetail id={id} /> : <></>,
                header: () => (
-                  <AppHeader
+                  <AppHeader title="Pengumuman"
-                     title="Pengumuman"
                      showBack={true}
                      onPressLeft={() => router.back()}
-                     right={entityUser.role != 'user' && entityUser.role != 'coadmin'
+                     right={entityUser.role != 'user' && entityUser.role != 'coadmin' ? <HeaderRightAnnouncementDetail id={id} /> : <></>}
-                        ? <HeaderRightAnnouncementDetail id={id} />
-                        : <></>
-                     }
                   />
                )
             }}
          />
          <ScrollView
             showsVerticalScrollIndicator={false}
-            style={[Styles.flex1, themed.background]}
+            style={[Styles.h100]}
             refreshControl={
-               <RefreshControl refreshing={refreshing} onRefresh={handleRefresh} tintColor={colors.icon} />
+               <RefreshControl
+                  refreshing={refreshing}
+                  onRefresh={() => handleRefresh()}
+               />
             }
          >
-            {isError && !loading ? (
+            <View style={[Styles.p15, Styles.mb50]}>
-               <View style={Styles.mv50}>
+               <View style={[Styles.wrapPaper]}>
-                  <ErrorView />
+                  {
-               </View>
+                     loading ?
-            ) : (
+                        <View>
-               <View style={Styles.announcementDetailContainer}>
+                           <View style={[Styles.rowOnly]}>
-
+                              <Skeleton width={30} height={30} borderRadius={10} />
-                  {/* Title + Description */}
+                              <View style={[{ flex: 1 }, Styles.ph05]}>
-                  <View style={[Styles.wrapPaper, Styles.noShadow, Styles.sectionCard, Styles.announcementDetailCard, themed.card]}>
+                                 <Skeleton width={100} widthType="percent" height={30} borderRadius={10} />
-                     {loading ? (
+                              </View>
-                        <View style={Styles.announcementDetailSkeletonGap}>
-                           <View style={[Styles.rowItemsCenter, Styles.announcementDetailSkeletonIconRow]}>
-                              <Skeleton width={38} height={38} borderRadius={10} />
-                              <Skeleton width={60} widthType="percent" height={16} borderRadius={6} />
                            </View>
-                           <Skeleton width={100} widthType="percent" height={10} borderRadius={6} />
+                           <Skeleton width={100} widthType="percent" height={10} borderRadius={10} />
-                           <Skeleton width={100} widthType="percent" height={10} borderRadius={6} />
+                           <Skeleton width={100} widthType="percent" height={10} borderRadius={10} />
-                           <Skeleton width={80} widthType="percent" height={10} borderRadius={6} />
+                           <Skeleton width={100} widthType="percent" height={10} borderRadius={10} />
                         </View>
-                     ) : (
+                        :
                         <>
-                           <View style={[Styles.rowItemsCenter, Styles.announcementDetailTitleRow]}>
+                           <View style={[Styles.rowItemsCenter, { alignItems: 'flex-start' }]}>
-                              <View style={[Styles.sectionIconBox, Styles.announcementDetailIconBox, themed.iconBox]}>
+                              <MaterialIcons name="campaign" size={25} color="black" style={[Styles.mr05]} />
-                                 <MaterialIcons name="campaign" size={22} color={colors.icon} />
+                              <Text style={[Styles.textDefaultSemiBold, Styles.w90, Styles.mt02]}>{data?.title}</Text>
-                              </View>
+                           </View>
-                              <Text style={[Styles.textDefaultSemiBold, Styles.announcementDetailTitleText, themed.titleText]} numberOfLines={2}>
+                           <View style={[Styles.mt10]}>
-                                 {data.title}
+                              {
-                              </Text>
+                                 hasHtmlTags(data?.desc) ?
+                                    <RenderHTML
+                                       contentWidth={contentWidth}
+                                       source={{ html: data?.desc }}
+                                       baseStyle={{ color: 'black' }}
+                                    />
+                                    :
+                                    <Text>{data?.desc}</Text>
+                              }
                            </View>
-                           {hasHtmlTags(data.desc)
-                              ? <RenderHTML
-                                 contentWidth={contentWidth}
-                                 source={{ html: data.desc }}
-                                 baseStyle={{ color: colors.text }}
-                              />
-                              : <Text style={Styles.textDefault}>{data.desc}</Text>
-                           }
                         </>
-                     )}
+                  }
-                  </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>
-            )}
+               {
+                  dataFile.length > 0 && (
+                     <View style={[Styles.wrapPaper, Styles.mt10]}>
+                        <View style={[Styles.mb05]}>
+                           <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                        </View>
+                        {dataFile.map((item, index) => (
+                           <BorderBottomItem
+                              key={`${item.id}-${index}`}
+                              borderType="bottom"
+                              icon={<MaterialCommunityIcons
+                                 name={isImageFile(item.extension) ? "file-image-outline" : "file-document-outline"}
+                                 size={25}
+                                 color="black"
+                              />}
+                              title={item.name + '.' + item.extension}
+                              titleWeight="normal"
+                              onPress={() => {
+                                 isImageFile(item.extension) ?
+                                    handleChooseFile(item)
+                                    : openFile(item)
+                              }}
+                           />
+                        ))}
+                     </View>
+                  )
+               }
+               <View style={[Styles.wrapPaper, Styles.mt10]}>
+                  {
+                     loading ?
+                        arrSkeleton.map((item, index) => {
+                           return (
+                              <View key={index}>
+                                 <Skeleton width={30} 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>
+                           )
+                        })
+                        :
+                        Object.keys(dataMember).map((v: any, i: any) => {
+                           return (
+                              <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="black" />
+                                             <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode='tail'>{item.division}</Text>
+                                          </View>
+                                       )
+                                    })
+                                 }
+
+                              </View>
+                           )
+                        })
+                  }
+               </View>
+            </View>
          </ScrollView>
 
          <ImageViewing
@@ -302,26 +307,38 @@ export default function DetailAnnouncement() {
             visible={preview}
             onRequestClose={() => setPreview(false)}
             doubleTapToZoomEnabled
-            HeaderComponent={() => (
+            HeaderComponent={({ imageIndex }) => (
-               <View style={Styles.headerModalViewImg}>
+               <View style={[Styles.headerModalViewImg]}>
-                  <Pressable onPress={() => setPreview(false)} accessibilityRole="button">
+                  {/* CLOSE */}
-                     <Text style={[Styles.textWhite, Styles.font26]}>✕</Text>
+                  <Pressable
+                     onPress={() => setPreview(false)}
+                     accessibilityRole="button"
+                     accessibilityLabel="Close image viewer"
+                  >
+                     <Text style={{ color: 'white', fontSize: 26 }}>✕</Text>
                   </Pressable>
+
+                  {/* MENU */}
                   <Pressable
                      onPress={() => chooseFile && openFile(chooseFile)}
                      accessibilityRole="button"
+                     accessibilityLabel="Download or share image"
                      disabled={loadingOpen}
                   >
-                     <Text style={[Styles.font26, { color: loadingOpen ? 'gray' : 'white' }]}>⋯</Text>
+                     <Text style={{ color: loadingOpen ? 'gray' : 'white', fontSize: 22 }}>⋯</Text>
                   </Pressable>
                </View>
             )}
-            FooterComponent={() => (
+            FooterComponent={({ imageIndex }) => (
-               <View style={[Styles.pb20, Styles.ph16, Styles.alignCenter]}>
+               <View style={{
-                  <Text style={[Styles.textWhite, Styles.font16]}>{chooseFile?.name}.{chooseFile?.extension}</Text>
+                  paddingBottom: 20,
+                  paddingHorizontal: 16,
+                  alignItems: 'center',
+               }}>
+                  <Text style={{ color: 'white', fontSize: 16 }}>{chooseFile?.name}.{chooseFile?.extension}</Text>
                </View>
             )}
          />
       </SafeAreaView>
    )
-}
+}

app/(application)/announcement/create.tsx

@@ -1,8 +1,10 @@
 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";
+import LoadingOverlay from "@/components/loadingOverlay";
 import MenuItemRow from "@/components/menuItemRow";
 import ModalSelectMultiple from "@/components/modalSelectMultiple";
 import Text from "@/components/Text";
@@ -10,265 +12,242 @@ import Styles from "@/constants/Styles";
 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 { Pressable, SafeAreaView, ScrollView, View } from "react-native";
+import { SafeAreaView, ScrollView, StyleSheet, View } from "react-native";
 import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
-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)
    const { token, decryptToken } = useAuthSession()
-   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({ title: "", desc: "" });
+   const [dataForm, setDataForm] = useState({
-   const [error, setError] = useState({ title: false, desc: false });
+      title: "",
-
+      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 });
-         setError({ ...error, title: val === "" || val === "null" });
+         if (val == "" || val == "null") {
-      } else if (cat === "desc") {
+            setError({ ...error, title: true });
+         } else {
+            setError({ ...error, title: false });
+         }
+      } else if (cat == "desc") {
          setDataForm({ ...dataForm, desc: val });
-         setError({ ...error, desc: val === "" || val === "null" });
+         if (val == "" || val == "null") {
+            setError({ ...error, desc: true });
+         } else {
+            setError({ ...error, desc: false });
+         }
       }
    }
 
    function checkForm() {
-      const hasError = Object.values(error).some(v => v)
+      if (
-      const hasEmpty = Object.values(dataForm).some(v => v === "")
+         Object.values(error).some((v) => v == true) ||
-      setDisableBtn(hasError || hasEmpty);
+         Object.values(dataForm).some((v) => v == "")
+      ) {
+         setDisableBtn(true);
+      } else {
+         setDisableBtn(false);
+      }
    }
 
-   useEffect(() => { checkForm() }, [error, dataForm]);
+   useEffect(() => {
+      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}`, { uri: fileForm[i].uri, type: 'application/octet-stream', name: fileForm[i].name } as any);
+            fd.append(`file${i}`, {
+               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)
+
+         // const response = await apiCreateAnnouncement({
+         //    data: { ...dataForm, user: hasil, groups: divisionMember },
+         // });
+
          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 })
          }
-      } catch (error: any) {
+      } catch (error) {
          console.error(error);
-         Toast.show({ type: 'small', text1: error?.response?.data?.message || "Tidak dapat terhubung ke server" })
       } finally {
          setLoading(false)
       }
    }
 
    const pickDocumentAsync = async () => {
-      const result = await DocumentPicker.getDocumentAsync({ type: ["*/*"], multiple: true });
+      let result = await DocumentPicker.getDocumentAsync({
+         type: ["*/*"],
+         multiple: true
+      });
       if (!result.canceled) {
-         let skipped = 0
+         for (let i = 0; i < result.assets?.length; i++) {
-         for (const asset of result.assets) {
+            if (result.assets[i].uri) {
-            if (!asset.uri) continue
+               setFileForm((prev) => [...prev, result.assets[i]])
-            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((_, i) => i !== index))
+      setFileForm([...fileForm.filter((val, i) => i !== index)])
       setModalFile(false)
    }
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <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"
                      showBack={true}
                      onPressLeft={() => router.back()}
                      right={
-                        <ButtonSaveHeader
+                           <ButtonSaveHeader
-                           disable={disableBtn || divisionMember.length === 0 || loading}
+                              disable={disableBtn || divisionMember.length == 0 || loading ? true : false}
-                           category="create"
+                              category="create"
-                           onPress={() => {
+                              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();
-                           }}
+                              }}
-                        />
+                           />
                      }
                   />
                )
             }}
          />
-         {loading && <LoadingCenter />}
+         <LoadingOverlay visible={loading} />
-         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100, { backgroundColor: colors.background }]}>
+         <ScrollView
-            <View style={Styles.p15}>
+            showsVerticalScrollIndicator={false}
-
+            style={[Styles.h100]}
+         >
+            <View style={[Styles.p15]}>
                <InputForm
                   label="Judul"
                   type="default"
                   placeholder="Judul Pengumuman"
                   required
                   error={error.title}
-                  bg={colors.card}
                   errorText="Judul harus diisi"
                   onChange={(val) => validationForm("title", val)}
                />
-
                <InputForm
                   label="Pengumuman"
                   type="default"
                   placeholder="Deskripsi Pengumuman"
                   required
                   error={error.desc}
-                  bg={colors.card}
                   errorText="Pengumuman harus diisi"
                   onChange={(val) => validationForm("desc", val)}
                   multiline
                />
+               <ButtonSelect value="Upload File" onPress={pickDocumentAsync} />
+               {
+                  fileForm.length > 0
+                  &&
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
+                     <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                     {
+                        fileForm.map((item, index) => (
+                           <BorderBottomItem
+                              key={index}
+                              borderType={fileForm.length > 1 ? "bottom" : "none"}
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
+                              title={item.name}
+                              titleWeight="normal"
+                              onPress={() => { setIndexDelFile(index); setModalFile(true) }}
+                           />
+                        ))
+                     }
+                  </View>
+               }
 
-               {/* File */}
+               <ButtonSelect
-               <View style={[Styles.wrapPaper, Styles.mb15, Styles.sectionCard,
+                  value="Pilih divisi penerima pengumuman"
-                  { backgroundColor: colors.card, borderColor: colors.icon + '18' }]}>
+                  onPress={() => {
-                  <Pressable
+                     setModalDivisi(true)
-                     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} />
+                  divisionMember.length > 0
-                     </View>
+                  &&
-                     <View style={Styles.flex1}>
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10]}>
-                        <Text style={[Styles.textDefaultSemiBold, { color: colors.text }]}>File</Text>
+                     {
-                        {fileForm.length === 0 && (
+                        divisionMember.map((item: { name: any; Division: any }, index: any) => {
-                           <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
+                              <View key={index}>
-                                 key={index}
+                                 <Text style={[Styles.textDefaultSemiBold]}>{item.name}</Text>
-                                 onPress={() => { setIndexDelFile(index); setModalFile(true) }}
+                                 {
-                                 style={[Styles.fileCard, { backgroundColor: 'transparent', borderColor: colors.icon + '18' }]}
+                                    item.Division.map((division: any, i: any) => (
-                              >
+                                       <View key={i} style={[Styles.rowItemsCenter, Styles.w90]}>
-                                 <View style={[Styles.sectionIconBox, { backgroundColor: iconColor + '20' }]}>
+                                          <Entypo name="dot-single" size={24} color="black" />
-                                    <MaterialCommunityIcons name={iconName} size={18} color={iconColor} />
+                                          <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode='tail'>{division.name}</Text>
-                                 </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>
+               }
-
             </View>
          </ScrollView>
 
@@ -287,12 +266,25 @@ export default function CreateAnnouncement() {
          <DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
+                  icon={<Ionicons name="trash" color="black" size={25} />}
                   title="Hapus"
-                  onPress={() => deleteFile(indexDelFile)}
+                  onPress={() => { deleteFile(indexDelFile) }}
                />
             </View>
          </DrawerBottom>
       </SafeAreaView>
    );
 }
+
+const styles = StyleSheet.create({
+   container: {
+      padding: 20,
+   },
+   textArea: {
+      height: 100, // Or use flex-based sizing
+      borderColor: 'gray',
+      borderWidth: 1,
+      padding: 10,
+      textAlignVertical: 'top', // Important for Android to align text at the top
+   },
+});

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

@@ -1,8 +1,10 @@
 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";
+import LoadingOverlay from "@/components/loadingOverlay";
 import MenuItemRow from "@/components/menuItemRow";
 import ModalSelectMultiple from "@/components/modalSelectMultiple";
 import Text from '@/components/Text';
@@ -10,39 +12,22 @@ import Styles from "@/constants/Styles";
 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 { Pressable, SafeAreaView, ScrollView, View } from "react-native";
+import { 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: { id: string; name: string }[];
+   Division: {
+      id: string;
+      name: string;
+   }[];
 }
 
 export default function EditAnnouncement() {
@@ -50,32 +35,45 @@ export default function EditAnnouncement() {
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.announcementUpdate)
    const { token, decryptToken } = useAuthSession();
-   const { colors } = useTheme();
    const [modalDivisi, setModalDivisi] = useState(false);
    const [disableBtn, setDisableBtn] = useState(true);
-   const [dataMember, setDataMember] = useState<GroupDivision[]>([]);
+   const [dataMember, setDataMember] = useState<any>([]);
    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({ title: "", desc: "" });
+   const [dataForm, setDataForm] = useState({
-   const [error, setError] = useState({ title: false, desc: false });
+      title: "",
-
+      desc: "",
-   const visibleOldFiles = dataFile.filter(v => !v.delete)
+   });
-   const totalFiles = fileForm.length + visibleOldFiles.length
+   const [error, setError] = useState({
-   const totalDivisi = dataMember.reduce((acc: number, g: any) => acc + g.Division.length, 0)
+      title: false,
+      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) => ({
+
-            id: response.member[v][0].idGroup,
+         const arrNew: GroupDivision[] = []
-            name: v,
+         const coba = Object.keys(response.member).map((v: any, i: any) => {
-            Division: response.member[v].map((m: any) => ({ id: m.idDivision, name: m.division }))
+            const newObject = {
-         }))
+               "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,25 +81,42 @@ export default function EditAnnouncement() {
       }
    }
 
-   useEffect(() => { handleLoad() }, []);
+   useEffect(() => {
+      handleLoad();
+   }, []);
 
    function validationForm(cat: string, val: any) {
-      if (cat === "title") {
+      if (cat == "title") {
          setDataForm({ ...dataForm, title: val });
-         setError({ ...error, title: val === "" || val === "null" });
+         if (val == "" || val == "null") {
-      } else if (cat === "desc") {
+            setError({ ...error, title: true });
+         } else {
+            setError({ ...error, title: false });
+         }
+      } else if (cat == "desc") {
          setDataForm({ ...dataForm, desc: val });
-         setError({ ...error, desc: val === "" || val === "null" });
+         if (val == "" || val == "null") {
+            setError({ ...error, desc: true });
+         } else {
+            setError({ ...error, desc: false });
+         }
       }
    }
 
    function checkForm() {
-      const hasError = Object.values(error).some(v => v)
+      if (
-      const hasEmpty = Object.values(dataForm).some(v => v === "")
+         Object.values(error).some((v) => v == true) ||
-      setDisableBtn(hasError || hasEmpty);
+         Object.values(dataForm).some((v) => v == "")
+      ) {
+         setDisableBtn(true);
+      } else {
+         setDisableBtn(false);
+      }
    }
 
-   useEffect(() => { checkForm() }, [error, dataForm]);
+   useEffect(() => {
+      checkForm();
+   }, [error, dataForm]);
 
    async function handleEdit() {
       try {
@@ -109,56 +124,85 @@ 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}`, { uri: fileForm[i].uri, type: 'application/octet-stream', name: fileForm[i].name } as any);
+            fd.append(`file${i}`, {
+               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' })
          }
-      } catch (error: any) {
+      } catch (error) {
          console.error(error);
-         Toast.show({ type: 'small', text1: error?.response?.data?.message || "Gagal mengubah data" })
       } finally {
          setLoading(false)
       }
    }
 
    const pickDocumentAsync = async () => {
-      const result = await DocumentPicker.getDocumentAsync({ type: ["*/*"], multiple: true });
+      let result = await DocumentPicker.getDocumentAsync({
+         type: ["*/*"],
+         multiple: true
+      });
       if (!result.canceled) {
-         let skipped = 0
+         for (let i = 0; i < result.assets?.length; i++) {
-         for (const asset of result.assets) {
+            if (result.assets[i].uri) {
-            if (!asset.uri) continue
+               setFileForm((prev) => [...prev, result.assets[i]])
-            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((_, i) => i !== index))
+         setFileForm([...fileForm.filter((val, i) => i !== index)])
       } else {
-         setDataFile(prev => prev.map(item => item.id === index ? { ...item, delete: true } : item))
+         setDataFile(prev =>
+            prev.map(item =>
+               item.id === index
+                  ? { ...item, delete: true }
+                  : item
+            )
+         );
       }
       setModalFile(false)
    }
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <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"
@@ -166,12 +210,12 @@ export default function EditAnnouncement() {
                      onPressLeft={() => router.back()}
                      right={
                         <ButtonSaveHeader
-                           disable={disableBtn || dataMember.length === 0 || loading}
+                           disable={disableBtn || loading ? true : false}
                            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();
                            }}
                         />
                      }
@@ -179,153 +223,94 @@ export default function EditAnnouncement() {
                )
             }}
          />
-         {loading && <LoadingCenter />}
+         <LoadingOverlay visible={loading} />
-         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100, { backgroundColor: colors.background }]}>
+         <ScrollView
-            <View style={Styles.p15}>
+            showsVerticalScrollIndicator={false}
-
+            style={[Styles.h100]}
+         >
+            <View style={[Styles.p15]}>
                <InputForm
                   label="Judul"
                   type="default"
                   placeholder="Judul Pengumuman"
                   required
                   error={error.title}
-                  bg={colors.card}
                   errorText="Judul harus diisi"
                   onChange={(val) => validationForm("title", val)}
                   value={dataForm.title}
                />
-
                <InputForm
                   label="Pengumuman"
                   type="default"
                   placeholder="Deskripsi Pengumuman"
                   required
                   error={error.desc}
-                  bg={colors.card}
                   errorText="Pengumuman harus diisi"
                   onChange={(val) => validationForm("desc", val)}
                   value={dataForm.desc}
                   multiline
                />
-
+               <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
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
-                     onPress={pickDocumentAsync}
+                     <Text style={[Styles.textDefaultSemiBold]}>File</Text>
-                     style={[Styles.sectionActionRow, { marginBottom: totalFiles > 0 ? 12 : 0 }]}
+                     {
-                  >
+                        dataFile.filter((val) => !val.delete).map((item, index) => (
-                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.icon + '15' }]}>
+                           <BorderBottomItem
-                        <MaterialCommunityIcons name="paperclip" size={18} color={colors.dimmed} />
+                              key={index}
-                     </View>
+                              borderType={(fileForm.length + dataFile.length) > 1 ? "bottom" : "none"}
-                     <View style={Styles.flex1}>
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
-                        <Text style={[Styles.textDefaultSemiBold, { color: colors.text }]}>File</Text>
+                              title={item.name + '.' + item.extension}
-                        {totalFiles === 0 && (
+                              titleWeight="normal"
-                           <Text style={[Styles.textMediumNormal, { color: colors.dimmed }]}>Opsional — ketuk untuk upload</Text>
+                              onPress={() => { setIndexDelFile({ id: item.id, cat: "oldFile" }); setModalFile(true) }}
-                        )}
+                           />
-                     </View>
+                        ))
-                     {totalFiles > 0 && (
+                     }
-                        <View style={[Styles.sectionBadge, { backgroundColor: colors.dimmed + '18' }]}>
+                     {
-                           <Text style={[Styles.textSmallSemiBold, { color: colors.dimmed }]}>{totalFiles} file</Text>
+                        fileForm.map((item, index) => (
-                        </View>
+                           <BorderBottomItem
-                     )}
+                              key={index}
-                     <MaterialCommunityIcons name="chevron-right" size={18} color={colors.dimmed} />
+                              borderType={(fileForm.length + dataFile.length) > 1 ? "bottom" : "none"}
-                  </Pressable>
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
-                  {totalFiles > 0 && (
+                              title={item.name}
-                     <View style={Styles.fileGrid}>
+                              titleWeight="normal"
-                        {visibleOldFiles.map((item, index) => {
+                              onPress={() => { setIndexDelFile({ id: index, cat: "newFile" }); setModalFile(true) }}
-                           const ext = item.extension.toLowerCase()
+                           />
-                           const iconName = getFileIcon(ext)
+                        ))
-                           const iconColor = getFileColor(ext)
+                     }
+                  </View>
+               }
+               <ButtonSelect
+                  value="Pilih divisi penerima pengumuman"
+                  onPress={() => {
+                     setModalDivisi(true)
+                  }}
+               />
+               {
+                  dataMember.length > 0
+                  &&
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10]}>
+                     {
+                        dataMember.map((item: { name: any; Division: any }, index: any) => {
                            return (
-                              <Pressable
+                              <View key={index}>
-                                 key={`old-${index}`}
+                                 <Text style={[Styles.textDefaultSemiBold]}>{item.name}</Text>
-                                 onPress={() => { setIndexDelFile({ id: item.id, cat: "oldFile" }); setModalFile(true) }}
+                                 {
-                                 style={[Styles.fileCard, { backgroundColor: 'transparent', borderColor: colors.icon + '18' }]}
+                                    item.Division.map((division: any, i: any) => (
-                              >
+                                       <View key={i} style={[Styles.rowItemsCenter, Styles.w90]}>
-                                 <View style={[Styles.sectionIconBox, { backgroundColor: iconColor + '20' }]}>
+                                          <Entypo name="dot-single" size={24} color="black" />
-                                    <MaterialCommunityIcons name={iconName} size={18} color={iconColor} />
+                                          <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode='tail'>{division.name}</Text>
-                                 </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>
+               }
-
             </View>
          </ScrollView>
 
@@ -345,9 +330,9 @@ export default function EditAnnouncement() {
          <DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
+                  icon={<Ionicons name="trash" color="black" size={25} />}
                   title="Hapus"
-                  onPress={() => deleteFile(indexDelFile.id, indexDelFile.cat)}
+                  onPress={() => { deleteFile(indexDelFile.id, indexDelFile.cat) }}
                />
             </View>
          </DrawerBottom>

app/(application)/announcement/index.tsx

@@ -1,155 +1,139 @@
-import GuideOverlay from "@/components/GuideOverlay";
+import BorderBottomItem from "@/components/borderBottomItem";
 import InputSearch from "@/components/inputSearch";
-import Skeleton from "@/components/skeleton";
+import SkeletonContent from "@/components/skeletonContent";
 import Text from '@/components/Text';
+import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
 import { apiGetAnnouncement } from "@/lib/api";
-import { GUIDE_ANNOUNCEMENT } from "@/lib/guideSteps";
-import { useGuide } from "@/lib/useGuide";
 import { useAuthSession } from "@/providers/AuthProvider";
-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, useRef, useState } from "react";
+import { useEffect, useState } from "react";
-import { Pressable, RefreshControl, View, VirtualizedList } from "react-native";
+import { 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
 }
 
+
 export default function Announcement() {
    const { token, decryptToken } = useAuthSession()
-   const { colors } = useTheme();
+   const [data, setData] = useState<Props[]>([])
    const [search, setSearch] = useState('')
    const update = useSelector((state: any) => state.announcementUpdate)
-   const isFirstRender = useRef(true)
+   const [loading, setLoading] = useState(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 [page, setPage] = useState(1)
+   const [waiting, setWaiting] = useState(false)
+   const [refreshing, setRefreshing] = useState(false)
 
-   const themed = {
+   async function handleLoad(loading: boolean, thisPage: number) {
-      background:  { backgroundColor: colors.background },
+      try {
-      card:        { backgroundColor: colors.card, borderColor: colors.icon + '18' },
+         setWaiting(true)
-      iconBox:     { backgroundColor: colors.icon + '18' },
+         setLoading(loading)
-      title:       { color: colors.text },
+         setPage(thisPage)
-      desc:        { color: colors.dimmed },
+         const hasil = await decryptToken(String(token?.current))
-      date:        { color: colors.dimmed },
+         const response = await apiGetAnnouncement({ user: hasil, search: search, page: thisPage })
-      cardPressed: { backgroundColor: colors.icon + '08' },
+         if (thisPage == 1) {
+            setData(response.data)
+         } else if (thisPage > 1 && response.data.length > 0) {
+            setData([...data, ...response.data])
+         } else {
+            return;
+         }
+      } catch (error) {
+         console.error(error)
+      } finally {
+         setLoading(false)
+         setWaiting(false)
+      }
    }
 
-   const {
-      data,
-      fetchNextPage,
-      hasNextPage,
-      isFetchingNextPage,
-      isLoading,
-      refetch,
-      isRefetching
-   } = useInfiniteQuery({
-      queryKey: ['announcements', search],
-      queryFn: async ({ pageParam = 1 }) => {
-         const hasil = await decryptToken(String(token?.current))
-         const response = await apiGetAnnouncement({ user: hasil, search, page: pageParam })
-         return response.data
-      },
-      initialPageParam: 1,
-      getNextPageParam: (lastPage, allPages) => {
-         return lastPage.length > 0 ? allPages.length + 1 : undefined
-      },
-   })
-
    useEffect(() => {
-      if (isFirstRender.current) { isFirstRender.current = false; return }
+      handleLoad(false, 1)
-      refetch()
    }, [update])
 
-   const flattenedData = useMemo(() => data?.pages.flat() || [], [data])
+   useEffect(() => {
+      handleLoad(true, 1)
+   }, [search])
+
+   const loadMoreData = () => {
+      if (waiting) return
+      setTimeout(() => {
+         handleLoad(false, page + 1)
+      }, 1000);
+   };
+
+   const handleRefresh = async () => {
+      setRefreshing(true)
+      handleLoad(false, 1)
+      await new Promise(resolve => setTimeout(resolve, 2000));
+      setRefreshing(false)
+   };
 
    const getItem = (_data: unknown, index: number): Props => ({
-      id: flattenedData[index].id,
+      id: data[index].id,
-      title: flattenedData[index].title,
+      title: data[index].title,
-      desc: flattenedData[index].desc,
+      desc: data[index].desc,
-      createdAt: flattenedData[index].createdAt,
+      createdAt: data[index].createdAt,
    })
 
-   const renderSkeleton = () => (
-      <View style={Styles.announcementListSkeletonCard}>
-         <View style={[Styles.rowSpaceBetween, Styles.rowItemsCenter, Styles.announcementListSkeletonHeader]}>
-            <View style={[Styles.rowItemsCenter, Styles.announcementListSkeletonTitleRow]}>
-               <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>
-         <Skeleton width={100} widthType="percent" height={10} borderRadius={6} />
-         <Skeleton width={80} widthType="percent" height={10} borderRadius={6} />
-      </View>
-   )
-
-   const renderItem = ({ item }: { item: Props }) => (
-      <Pressable
-         onPress={() => router.push(`/announcement/${item.id}`)}
-         style={({ pressed }) => [Styles.announcementListCard, themed.card, pressed && themed.cardPressed]}
-      >
-         <View style={[Styles.rowSpaceBetween, Styles.rowItemsCenter, Styles.announcementListCardHeader]}>
-            <View style={[Styles.rowItemsCenter, Styles.announcementListTitleRow]}>
-               <View style={[Styles.announcementListIconBox, themed.iconBox]}>
-                  <MaterialIcons name="campaign" size={16} color={colors.icon} />
-               </View>
-               <Text style={[Styles.textDefaultSemiBold, Styles.announcementListTitleText, themed.title]} numberOfLines={1}>
-                  {item.title}
-               </Text>
-            </View>
-            <Text style={[Styles.textInformation, Styles.announcementListDateText, themed.date]}>
-               {item.createdAt}
-            </Text>
-         </View>
-         <Text style={[Styles.textMediumNormal, Styles.announcementListDescText, themed.title]} numberOfLines={2}>
-            {item.desc.replace(/<[^>]*>?/gm, '').replace(/\r?\n|\r/g, ' ')}
-         </Text>
-      </Pressable>
-   )
-
    return (
-      <View style={[Styles.flex1, Styles.announcementListContainer, themed.background]}>
+      <View style={[Styles.p15, { flex: 1 }]}>
-         <GuideOverlay visible={guideVisible} steps={GUIDE_ANNOUNCEMENT} onDismiss={dismissGuide} />
+         <View>
-         <InputSearch onChange={setSearch} />
+            <InputSearch onChange={setSearch} />
-         <View style={[Styles.flex1, Styles.announcementListInner]}>
+         </View>
-            {isLoading && !flattenedData.length ? (
+         <View style={[{ flex: 2 }, Styles.mt05]}>
-               arrSkeleton.map((_, i) => (
+            {
-                  <View key={i} style={[Styles.announcementListCard, themed.card]}>
+               loading ?
-                     {renderSkeleton()}
+                  arrSkeleton.map((item, index) => {
-                  </View>
+                     return (
-               ))
+                        <SkeletonContent key={index} />
-            ) : flattenedData.length > 0 ? (
+                     )
-               <VirtualizedList
+                  })
-                  data={flattenedData}
+                  :
-                  getItemCount={() => flattenedData.length}
+                  data.length > 0
-                  getItem={getItem}
+                     ?
-                  renderItem={renderItem}
+                     <VirtualizedList
-                  keyExtractor={(item, index) => String(item.id || index)}
+                        data={data}
-                  onEndReached={() => { if (hasNextPage && !isFetchingNextPage) fetchNextPage() }}
+                        getItemCount={() => data.length}
-                  onEndReachedThreshold={0.5}
+                        getItem={getItem}
-                  showsVerticalScrollIndicator={false}
+                        renderItem={({ item, index }: { item: Props, index: number }) => {
-                  ItemSeparatorComponent={() => <View style={Styles.announcementListSeparator} />}
+                           return (
-                  refreshControl={
+                              <BorderBottomItem
-                     <RefreshControl
+                                 key={index}
-                        refreshing={isRefetching && !isFetchingNextPage}
+                                 onPress={() => { router.push(`/announcement/${item.id}`) }}
-                        onRefresh={refetch}
+                                 borderType="bottom"
-                        tintColor={colors.icon}
+                                 icon={
+                                    <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
+                                       <MaterialIcons name="campaign" size={25} color={'#384288'} />
+                                    </View>
+                                 }
+                                 title={item.title}
+                                 desc={item.desc.replace(/<[^>]*>?/gm, '').replace(/\r?\n|\r/g, ' ')}
+                                 rightTopInfo={item.createdAt}
+                              />
+                           )
+                        }}
+                        keyExtractor={(item, index) => String(index)}
+                        onEndReached={loadMoreData}
+                        onEndReachedThreshold={0.5}
+                        showsVerticalScrollIndicator={false}
+                        refreshControl={
+                           <RefreshControl
+                              refreshing={refreshing}
+                              onRefresh={handleRefresh}
+                           />
+                        }
                      />
-                  }
+                     :
-               />
+                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada pengumuman</Text>
-            ) : (
+            }
-               <Text style={[Styles.textDefault, Styles.textCenter, Styles.mt30, themed.desc]}>
-                  Tidak ada pengumuman
-               </Text>
-            )}
          </View>
       </View>
    )
-}
+}

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

@@ -1,14 +1,12 @@
 import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
-import LoadingCenter from "@/components/loadingCenter";
 import Text from "@/components/Text";
 import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiEditBanner, apiGetBanner, apiGetBannerOne } from "@/lib/api";
 import { setEntities } from "@/lib/bannerSlice";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { Entypo } from "@expo/vector-icons";
 import * as ImagePicker from "expo-image-picker";
 import { router, Stack, useLocalSearchParams } from "expo-router";
@@ -26,7 +24,6 @@ import { useDispatch } from "react-redux";
 export default function EditBanner() {
    const dispatch = useDispatch();
    const { decryptToken, token } = useAuthSession();
-   const { colors } = useTheme();
    const { id } = useLocalSearchParams<{ id: string }>();
    const [selectedImage, setSelectedImage] = useState<
       string | undefined | { uri: string }
@@ -106,18 +103,16 @@ export default function EditBanner() {
          } else {
             Toast.show({ type: 'small', text1: 'Gagal mengupdate data', })
          }
-      } catch (error: any) {
+      } catch (error) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal mengupdate data"
+         Toast.show({ type: 'small', text1: 'Gagal mengupdate data', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
    };
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => (
@@ -148,8 +143,7 @@ export default function EditBanner() {
                )
             }}
          />
-         {loading && <LoadingCenter />}
+         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100]}>
-         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100, { backgroundColor: colors.background }]}>
             <View style={[Styles.p15, Styles.mb100]}>
                <View style={[Styles.mb15]}>
                   {selectedImage != undefined ? (
@@ -160,7 +154,7 @@ export default function EditBanner() {
                                  ? selectedImage
                                  : selectedImage.uri
                            }
-                           style={[Styles.resizeContain, Styles.w100, { height: 100 }]}
+                           style={{ resizeMode: "contain", width: "100%", height: 100 }}
                         />
                      </Pressable>
                   ) : (
@@ -169,7 +163,7 @@ export default function EditBanner() {
                         style={[Styles.wrapPaper, Styles.contentItemCenter]}
                      >
                         <View
-                           style={[Styles.contentItemCenter]}
+                           style={{ justifyContent: "center", alignItems: "center" }}
                         >
                            <Entypo name="image" size={50} color={"#aeaeae"} />
                            <Text style={[Styles.textInformation, Styles.mt05]}>
@@ -185,7 +179,7 @@ export default function EditBanner() {
                   type="default"
                   placeholder="Judul"
                   required
-                  bg={colors.card}
+                  bg="white"
                   value={title}
                   error={error}
                   onChange={onValidate}

app/(application)/banner/create.tsx

@@ -1,13 +1,11 @@
 import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
-import LoadingCenter from "@/components/loadingCenter";
 import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
 import { apiCreateBanner, apiGetBanner } from "@/lib/api";
 import { setEntities } from "@/lib/bannerSlice";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { Entypo } from "@expo/vector-icons";
 import * as ImagePicker from "expo-image-picker";
 import { router, Stack } from "expo-router";
@@ -24,7 +22,6 @@ import { useDispatch } from "react-redux";
 
 export default function CreateBanner() {
    const { decryptToken, token } = useAuthSession();
-   const { colors } = useTheme();
    const dispatch = useDispatch();
    const [selectedImage, setSelectedImage] = useState<string | undefined>(
       undefined
@@ -88,22 +85,36 @@ export default function CreateBanner() {
          } else {
             Toast.show({ type: 'small', text1: 'Gagal menambahkan data', })
          }
-      } catch (error: any) {
+      } catch (error) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal menambahkan data"
+         Toast.show({ type: 'small', text1: 'Gagal menambahkan data', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
    };
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Tambah Banner",
                headerTitleAlign: "center",
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       disable={title == "" || selectedImage == undefined || error || loading ? true : false}
+               //       category="create"
+               //       onPress={() => {
+               //          handleCreateEntity();
+               //       }}
+               //    />
+               // ),
                header: () => (
                   <AppHeader
                      title="Fitur"
@@ -122,27 +133,26 @@ export default function CreateBanner() {
                )
             }}
          />
-         {loading && <LoadingCenter />}
+         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100]}>
-         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100, { backgroundColor: colors.background }]}>
             <View style={[Styles.p15]}>
                <View style={[Styles.mb15]}>
                   {selectedImage != undefined ? (
                      <Pressable onPress={pickImageAsync}>
                         <Image
                            src={selectedImage}
-                           style={[Styles.resizeContain, Styles.w100, { height: 100 }]}
+                           style={{ resizeMode: "contain", width: "100%", height: 100 }}
                         />
                      </Pressable>
                   ) : (
                      <Pressable
                         onPress={pickImageAsync}
-                        style={[Styles.wrapPaper, Styles.contentItemCenter, Styles.borderAll, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}
+                        style={[Styles.wrapPaper, Styles.contentItemCenter]}
                      >
                         <View
-                           style={[Styles.contentItemCenter]}
+                           style={{ justifyContent: "center", alignItems: "center" }}
                         >
-                           <Entypo name="image" size={50} color={colors.dimmed} />
+                           <Entypo name="image" size={50} color={"#aeaeae"} />
-                           <Text style={[Styles.textInformation, Styles.mt05, { color: colors.dimmed }]}>
+                           <Text style={[Styles.textInformation, Styles.mt05]}>
                               Mohon unggah gambar dalam resolusi 1650 x 720 pixel untuk
                               memastikan
                            </Text>
@@ -155,7 +165,7 @@ export default function CreateBanner() {
                   type="default"
                   placeholder="Judul"
                   required
-                  bg={colors.card}
+                  bg="white"
                   onChange={onValidate}
                   error={error}
                   errorText="Judul harus diisi"

app/(application)/banner/index.tsx

@@ -1,28 +1,22 @@
+import AlertKonfirmasi from "@/components/alertKonfirmasi"
 import AppHeader from "@/components/AppHeader"
-import GuideOverlay from "@/components/GuideOverlay"
 import HeaderRightBannerList from "@/components/banner/headerBannerList"
 import BorderBottomItem from "@/components/borderBottomItem"
 import DrawerBottom from "@/components/drawerBottom"
 import MenuItemRow from "@/components/menuItemRow"
-import ModalConfirmation from "@/components/ModalConfirmation"
 import ModalLoading from "@/components/modalLoading"
-import Skeleton from "@/components/skeleton"
 import Text from "@/components/Text"
 import { ConstEnv } from "@/constants/ConstEnv"
 import Styles from "@/constants/Styles"
 import { apiDeleteBanner, apiGetBanner } from "@/lib/api"
 import { setEntities } from "@/lib/bannerSlice"
-import { GUIDE_BANNER } from "@/lib/guideSteps"
-import { useGuide } from "@/lib/useGuide"
 import { useAuthSession } from "@/providers/AuthProvider"
-import { useTheme } from "@/providers/ThemeProvider"
 import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons"
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"
 import * as FileSystem from 'expo-file-system'
 import { startActivityAsync } from 'expo-intent-launcher'
 import { router, Stack } from "expo-router"
 import * as Sharing from 'expo-sharing'
-import { useEffect, useState } from "react"
+import { useState } from "react"
 import { Alert, Image, Platform, RefreshControl, SafeAreaView, ScrollView, View } from "react-native"
 import ImageViewing from 'react-native-image-viewing'
 import * as mime from 'react-native-mime-types'
@@ -38,7 +32,6 @@ type Props = {
 
 export default function BannerList() {
    const { decryptToken, token } = useAuthSession()
-   const { colors } = useTheme()
    const [isModal, setModal] = useState(false)
    const entities = useSelector((state: any) => state.banner)
    const [dataId, setDataId] = useState('')
@@ -46,54 +39,35 @@ export default function BannerList() {
    const dispatch = useDispatch()
    const [refreshing, setRefreshing] = useState(false)
    const [loadingOpen, setLoadingOpen] = useState(false)
-   const { visible: guideVisible, dismiss: dismissGuide } = useGuide('banner')
    const [viewImg, setViewImg] = useState(false)
-   const [showDeleteModal, setShowDeleteModal] = useState(false)
-   const queryClient = useQueryClient()
 
-   // 1. Fetching logic with useQuery
+   const handleDeleteEntity = async () => {
-   const { data: bannersRes, isLoading } = useQuery({
+      try {
-      queryKey: ['banners'],
+         const hasil = await decryptToken(String(token?.current));
-      queryFn: async () => {
+         const deletedEntity = await apiDeleteBanner({ user: hasil }, dataId);
-         const hasil = await decryptToken(String(token?.current))
+         if (deletedEntity.success) {
-         const response = await apiGetBanner({ user: hasil })
+            Toast.show({ type: 'small', text1: 'Berhasil menghapus data', })
-         return response.data || []
+            apiGetBanner({ user: hasil }).then((data) =>
-      },
+               dispatch(setEntities(data.data))
-      enabled: !!token?.current,
+            );
-      staleTime: 0,
+         } else {
-   })
+            Toast.show({ type: 'small', text1: 'Gagal menghapus data', })
-
+         }
-   // Sync results with Redux
+      } catch (error) {
-   useEffect(() => {
+         console.error(error)
-      if (bannersRes) {
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-         dispatch(setEntities(bannersRes))
+      } finally {
+         setModal(false)
       }
-   }, [bannersRes, dispatch])
-
-   // 2. Deletion logic with useMutation
-   const deleteMutation = useMutation({
-      mutationFn: async (id: string) => {
-         const hasil = await decryptToken(String(token?.current))
-         return await apiDeleteBanner({ user: hasil }, id)
-      },
-      onSuccess: () => {
-         Toast.show({ type: 'small', text1: 'Berhasil menghapus data' })
-         queryClient.invalidateQueries({ queryKey: ['banners'] })
-      },
-      onError: (error: any) => {
-         const message = error?.response?.data?.message || "Gagal menghapus data"
-         Toast.show({ type: 'small', text1: message })
-      }
-   })
-
-   const handleDeleteEntity = () => {
-      deleteMutation.mutate(dataId)
-      setModal(false)
    };
 
    const handleRefresh = async () => {
       setRefreshing(true)
-      await queryClient.invalidateQueries({ queryKey: ['banners'] })
+      const hasil = await decryptToken(String(token?.current));
+      apiGetBanner({ user: hasil }).then((data) =>
+         dispatch(setEntities(data.data))
+      );
+      await new Promise(resolve => setTimeout(resolve, 2000));
       setRefreshing(false)
    };
 
@@ -131,7 +105,7 @@ export default function BannerList() {
 
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -150,58 +124,53 @@ export default function BannerList() {
                )
             }}
          />
-         <GuideOverlay visible={guideVisible} steps={GUIDE_BANNER} onDismiss={dismissGuide} />
          <ModalLoading isVisible={loadingOpen} setVisible={setLoadingOpen} />
          <ScrollView
             refreshControl={
                <RefreshControl
                   refreshing={refreshing}
                   onRefresh={handleRefresh}
-                  tintColor={colors.icon}
                />
             }
-            style={[Styles.h100, { backgroundColor: colors.background }]}
+            style={[Styles.h100]}
          >
-            <View style={[Styles.p15, Styles.mb100]}>
+            {
-               {
+               entities.length > 0
-                  isLoading ? (
+                  ?
-                     <>
+                  <View style={[Styles.p15, Styles.mb100]}>
-                        <Skeleton width={100} height={150} borderRadius={10} widthType="percent" />
+                     {entities.map((index: any, key: number) => (
-                        <Skeleton width={100} height={150} borderRadius={10} widthType="percent" />
+                        <BorderBottomItem
-                        <Skeleton width={100} height={150} borderRadius={10} widthType="percent" />
+                           key={key}
-                     </>
+                           onPress={() => {
-                  ) :
+                              setDataId(index.id)
-                     entities.length > 0 ?
+                              setSelectFile(index)
-                        entities.map((index: any, key: number) => (
+                              setModal(true)
-                           <BorderBottomItem
+                           }}
-                              key={key}
+                           borderType="all"
-                              onPress={() => {
+                           icon={
-                                 setDataId(index.id)
+                              <Image
-                                 setSelectFile(index)
+                                 source={{ uri: `${ConstEnv.url_storage}/files/${index.image}` }}
-                                 setModal(true)
+                                 style={[Styles.imgListBanner]}
-                              }}
+                              />
-                              borderType="all"
+                           }
-                              icon={
+                           title={index.title}
-                                 <Image
+                           width={65}
-                                    source={{ uri: `${ConstEnv.url_storage}/files/${index.image}` }}
+                        />
-                                    style={[Styles.imgListBanner]}
+                     ))}
-                                 />
+                  </View>
-                              }
+                  :
-                              title={index.title}
+                  <View style={[Styles.p15, Styles.mb100]}>
-                           />
+                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
-                        ))
+                  </View>
-                        :
+            }
-                        <View style={[Styles.p15, Styles.mb100]}>
+
-                           <Text style={[Styles.textDefault, Styles.textCenter]}>Tidak ada data</Text>
+
-                        </View>
-               }
-            </View>
          </ScrollView>
 
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={() => setModal(false)} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<MaterialCommunityIcons name="pencil-outline" color={colors.text} size={25} />}
+                  icon={<MaterialCommunityIcons name="pencil-outline" color="black" size={25} />}
                   title="Edit"
                   onPress={() => {
                      setModal(false)
@@ -209,7 +178,7 @@ export default function BannerList() {
                   }}
                />
                <MenuItemRow
-                  icon={<MaterialCommunityIcons name="file-eye" color={colors.text} size={25} />}
+                  icon={<MaterialCommunityIcons name="file-eye" color="black" size={25} />}
                   title="Lihat"
                   onPress={() => {
                      setModal(false)
@@ -220,13 +189,15 @@ export default function BannerList() {
                   }}
                />
                <MenuItemRow
-                  icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
+                  icon={<Ionicons name="trash" color="black" size={25} />}
                   title="Hapus"
                   onPress={() => {
                      setModal(false)
-                     setTimeout(() => {
+                     AlertKonfirmasi({
-                        setShowDeleteModal(true)
+                        title: 'Konfirmasi',
-                     }, 600)
+                        desc: 'Apakah anda yakin ingin menghapus data?',
+                        onPress: () => { handleDeleteEntity() }
+                     })
                   }}
                />
             </View>
@@ -239,19 +210,6 @@ export default function BannerList() {
             onRequestClose={() => setViewImg(false)}
             doubleTapToZoomEnabled
          />
-
-         <ModalConfirmation
-            visible={showDeleteModal}
-            title="Konfirmasi"
-            message="Apakah anda yakin ingin menghapus data?"
-            onConfirm={() => {
-               setShowDeleteModal(false)
-               handleDeleteEntity()
-            }}
-            onCancel={() => setShowDeleteModal(false)}
-            confirmText="Hapus"
-            cancelText="Batal"
-         />
       </SafeAreaView>
    )
 }

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

@@ -1,21 +1,23 @@
+import AlertKonfirmasi from "@/components/alertKonfirmasi";
 import AppHeader from "@/components/AppHeader";
+import BorderBottomItem from "@/components/borderBottomItem";
 import BorderBottomItem2 from "@/components/borderBottomItem2";
 import HeaderRightDiscussionGeneralDetail from "@/components/discussion_general/headerDiscussionDetail";
 import DrawerBottom from "@/components/drawerBottom";
 import ImageUser from "@/components/imageNew";
 import { InputForm } from "@/components/inputForm";
+import LabelStatus from "@/components/labelStatus";
 import MenuItemRow from "@/components/menuItemRow";
-import ModalConfirmation from "@/components/ModalConfirmation";
 import Skeleton from "@/components/skeleton";
 import SkeletonContent from "@/components/skeletonContent";
 import Text from '@/components/Text';
+import { ColorsStatus } from "@/constants/ColorsStatus";
 import { ConstEnv } from "@/constants/ConstEnv";
 import { regexOnlySpacesOrEnter } from "@/constants/OnlySpaceOrEnter";
 import Styles from "@/constants/Styles";
 import { apiDeleteDiscussionGeneralCommentar, apiGetDiscussionGeneralOne, apiSendDiscussionGeneralCommentar, apiUpdateDiscussionGeneralCommentar } from "@/lib/api";
 import { getDB } from "@/lib/firebaseDatabase";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { Feather, Ionicons, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons";
 import { ref } from '@react-native-firebase/database';
 import { useHeaderHeight } from '@react-navigation/elements';
@@ -54,7 +56,6 @@ type PropsFile = {
 
 export default function DetailDiscussionGeneral() {
    const { token, decryptToken } = useAuthSession()
-   const { colors } = useTheme();
    const entityUser = useSelector((state: any) => state.user)
    const entities = useSelector((state: any) => state.entities)
    const { id } = useLocalSearchParams<{ id: string }>();
@@ -78,7 +79,6 @@ export default function DetailDiscussionGeneral() {
       comment: ''
    })
    const [viewEdit, setViewEdit] = useState(false)
-   const [showDeleteModal, setShowDeleteModal] = useState(false)
 
    useEffect(() => {
       const onValueChange = reference.on('value', snapshot => {
@@ -156,11 +156,8 @@ export default function DetailDiscussionGeneral() {
                Toast.show({ type: 'small', text1: response.message })
             }
          }
-      } catch (error: any) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         const message = error?.response?.data?.message || "Gagal menambahkan data"
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoadingSendKomentar(false)
       }
@@ -176,11 +173,8 @@ export default function DetailDiscussionGeneral() {
          } else {
             Toast.show({ type: 'small', text1: response.message })
          }
-      } catch (error: any) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         const message = error?.response?.data?.message || "Gagal mengupdate data"
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoadingSendKomentar(false)
          handleViewEditKomentar()
@@ -197,11 +191,8 @@ export default function DetailDiscussionGeneral() {
          } else {
             Toast.show({ type: 'small', text1: response.message })
          }
-      } catch (error: any) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         const message = error?.response?.data?.message || "Gagal menghapus data"
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoadingSendKomentar(false)
          setVisible(false)
@@ -246,15 +237,14 @@ export default function DetailDiscussionGeneral() {
                )
             }}
          />
-         <View style={[Styles.flex1, { backgroundColor: colors.background }]}>
+         <View style={{ flex: 1 }}>
             <ScrollView
                showsVerticalScrollIndicator={false}
-               style={[Styles.h100, { backgroundColor: colors.background }]}
+               style={[Styles.h100]}
                refreshControl={
                   <RefreshControl
                      refreshing={refreshing}
                      onRefresh={() => handleRefresh()}
-                     tintColor={colors.icon}
                   />
                }
             >
@@ -266,43 +256,35 @@ export default function DetailDiscussionGeneral() {
                         <BorderBottomItem2
                            dataFile={fileDiscussion}
                            descEllipsize={false}
-                           borderType="all"
+                           borderType="bottom"
-                           bgColor="white"
                            icon={
-                              <View style={[Styles.discussionIconCircleLg, { backgroundColor: colors.icon + '20' }]}>
+                              <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                                 <Feather name="message-circle" size={22} color={colors.icon} />
+                                 <MaterialIcons name="chat" size={25} color={'#384288'} />
                               </View>
                            }
                            title={data?.title}
                            titleShowAll={true}
                            subtitle={
-                              <View style={[Styles.discussionStatusPill, {
+                              !data?.isActive ?
-                                 borderColor: !data?.isActive
+                                 <LabelStatus category='warning' text='ARSIP' size="small" />
-                                    ? '#F59E0B'
+                                 :
-                                    : data?.status == 1 ? '#10B981' : colors.dimmed + '80',
+                                 <LabelStatus category={data.status == 1 ? 'success' : 'error'} text={data.status == 1 ? 'BUKA' : 'TUTUP'} size="small" />
-                              }]}>
-                                 <Text style={[Styles.discussionStatusText, {
-                                    color: !data?.isActive
-                                       ? '#F59E0B'
-                                       : data?.status == 1 ? '#10B981' : colors.dimmed,
-                                 }]}>
-                                    {!data?.isActive ? 'Arsip' : data?.status == 1 ? 'Buka' : 'Tutup'}
-                                 </Text>
-                              </View>
                            }
                            desc={data?.desc}
                            leftBottomInfo={
                               <View style={[Styles.rowItemsCenter]}>
-                                 <Feather name="message-square" size={14} color={colors.dimmed} style={Styles.mr05} />
+                                 <Ionicons name="chatbox-ellipses-outline" size={18} color="grey" style={Styles.mr05} />
-                                 <Text style={[Styles.textInformation, { color: colors.dimmed }]}>{dataKomentar.length} Komentar</Text>
+                                 <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>{dataKomentar.length} Komentar</Text>
                               </View>
                            }
                            rightBottomInfo={
-                              <Text style={[Styles.textInformation, { color: colors.dimmed }]}>{data?.createdAt}</Text>
+                              <View style={[Styles.rowItemsCenter]}>
+                                 <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>{data?.createdAt}</Text>
+                              </View>
                            }
                         />
                   }
-                  <View style={[Styles.mt10]}>
+                  <View style={[Styles.p15]}>
                      {
                         loadingKomentar ?
                            arrSkeleton.map((item: any, i: number) => {
@@ -311,56 +293,35 @@ export default function DetailDiscussionGeneral() {
                               )
                            })
                            :
-                           dataKomentar.map((item, i) => (
+                           dataKomentar.map((item, i) => {
-                              <Pressable
+                              return (
-                                 key={i}
+                                 <BorderBottomItem
-                                 onPress={() => {
+                                    key={i}
-                                    setDetailMore((prev: any) =>
+                                    borderType="bottom"
-                                       prev.includes(item.id)
+                                    colorPress
-                                          ? prev.filter((id: string) => id !== item.id)
+                                    icon={
-                                          : [...prev, item.id]
+                                       <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="xs" />
-                                    )
-                                 }}
-                                 onLongPress={() => {
-                                    item.idUser == entities.id && data?.status != 2 && data?.isActive && handleMenuKomentar(item.id, item.comment)
-                                 }}
-                                 style={({ pressed }) => [
-                                    Styles.discussionCommentCard,
-                                    {
-                                       backgroundColor: pressed ? colors.icon + '10' : colors.card,
-                                       borderColor: colors.icon + '20',
                                     }
-                                 ]}
+                                    title={item.username}
-                              >
+                                    rightTopInfo={item.createdAt}
-                                 <View style={Styles.flex1}>
+                                    desc={item.comment}
-                                    {/* Name + time */}
+                                    rightBottomInfo={item.isEdited ? "Edited" : ""}
-                                    <View style={[Styles.rowSpaceBetween, Styles.itemsCenter, Styles.mb05]}>
+                                    descEllipsize={detailMore.includes(item.id) ? false : true}
-                                       <View style={[Styles.rowItemsCenter, { gap: 8, flex: 1, marginRight: 8 }]}>
+                                    onPress={() => {
-                                          <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="xs" />
+                                       setDetailMore((prev: any) => {
-                                          <Text style={[Styles.textMediumSemiBold, { color: colors.text }]} numberOfLines={1}>
+                                          if (prev.includes(item.id)) {
-                                             {item.username}
+                                             return prev.filter((id: string) => id !== item.id)
-                                          </Text>
+                                          } else {
-                                          {item.isEdited && (
+                                             return [...prev, item.id]
-                                             <Text style={[Styles.discussionEditedText, { color: colors.dimmed }]}>
+                                          }
-                                                diedit
+                                       })
-                                             </Text>
+                                    }}
-                                          )}
+                                    onLongPress={() => {
-                                       </View>
+                                       item.idUser == entities.id && data?.status != 2 && data?.isActive && handleMenuKomentar(item.id, item.comment)
-                                       <Text style={[Styles.discussionDateText, { color: colors.dimmed, flexShrink: 0 }]}>
+                                    }}
-                                          {item.createdAt}
+                                 />
-                                       </Text>
+                              )
-                                    </View>
+                           })
-
-                                    {/* Comment text */}
-                                    <Text
-                                       style={[Styles.textDefault, { color: colors.text }]}
-                                       numberOfLines={detailMore.includes(item.id) ? 0 : 3}
-                                    >
-                                       {item.comment}
-                                    </Text>
-                                 </View>
-                              </Pressable>
-                           ))
                      }
                   </View>
                </View>
@@ -372,7 +333,7 @@ export default function DetailDiscussionGeneral() {
                <View style={[
                   Styles.contentItemCenter,
                   Styles.w100,
-                  { backgroundColor: colors.background },
+                  { backgroundColor: "#f4f4f4" },
                   viewEdit && Styles.borderTop
                ]}>
                   {
@@ -380,11 +341,11 @@ export default function DetailDiscussionGeneral() {
                         <>
                            <View style={[Styles.w90, Styles.rowSpaceBetween, Styles.pv05]}>
                               <View style={[Styles.rowItemsCenter]}>
-                                 <Feather name="edit-3" color={colors.text} size={22} style={[Styles.mh05]} />
+                                 <Feather name="edit-3" color="black" size={22} style={[Styles.mh05]} />
                                  <Text style={[Styles.textMediumSemiBold]}>Edit Komentar</Text>
                               </View>
                               <Pressable onPress={() => handleViewEditKomentar()}>
-                                 <MaterialIcons name="close" color={colors.text} size={22} />
+                                 <MaterialIcons name="close" color="black" size={22} />
                               </Pressable>
                            </View>
                            <InputForm
@@ -392,19 +353,21 @@ export default function DetailDiscussionGeneral() {
                               type="default"
                               round
                               placeholder="Kirim Komentar"
+                              bg="white"
                               onChange={(val: string) => setSelectKomentar({ ...selectKomentar, comment: val })}
                               value={selectKomentar.comment}
                               multiline
                               focus={viewEdit}
                               itemRight={
-                                 <Pressable
+                                 <Pressable onPress={() => {
-                                    onPress={() => {
+                                    (!loadingSendKomentar && selectKomentar.comment != '' && !regexOnlySpacesOrEnter.test(selectKomentar.comment) && data?.status === 1 && data?.isActive && (memberDiscussion || (entityUser.role != "user" && entityUser.role != "coadmin")))
-                                       (!loadingSendKomentar && selectKomentar.comment != '' && !regexOnlySpacesOrEnter.test(selectKomentar.comment) && data?.status === 1 && data?.isActive && (memberDiscussion || (entityUser.role != "user" && entityUser.role != "coadmin")))
+                                       && handleEditKomentar()
-                                          && handleEditKomentar()
+                                 }}
-                                    }}
+                                    style={[
-                                    style={[Platform.OS == 'android' && Styles.mb12]}
+                                       Platform.OS == 'android' && Styles.mb12,
+                                    ]}
                                  >
-   <MaterialIcons name="send" size={25} style={(loadingSendKomentar || selectKomentar.comment == '' || regexOnlySpacesOrEnter.test(selectKomentar.comment) || data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin"))) ? { color: colors.dimmed } : { color: colors.tint }} />
+                                    <MaterialIcons name="send" size={25} style={(loadingSendKomentar || selectKomentar.comment == '' || regexOnlySpacesOrEnter.test(selectKomentar.comment) || data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin"))) ? Styles.cGray : Styles.cDefault} />
                                  </Pressable>
                               }
                            />
@@ -417,25 +380,27 @@ export default function DetailDiscussionGeneral() {
                               type="default"
                               round
                               placeholder="Kirim Komentar"
+                              bg="white"
                               onChange={setKomentar}
                               value={komentar}
                               multiline
                               focus={viewEdit}
                               itemRight={
-                                 <Pressable
+                                 <Pressable onPress={() => {
-                                    onPress={() => {
+                                    (!loadingSendKomentar && komentar != '' && !regexOnlySpacesOrEnter.test(komentar) && data?.status === 1 && data?.isActive && (memberDiscussion || (entityUser.role != "user" && entityUser.role != "coadmin")))
-                                       (!loadingSendKomentar && komentar != '' && !regexOnlySpacesOrEnter.test(komentar) && data?.status === 1 && data?.isActive && (memberDiscussion || (entityUser.role != "user" && entityUser.role != "coadmin")))
+                                       && handleKomentar()
-                                          && handleKomentar()
+                                 }}
-                                    }}
+                                    style={[
-                                    style={[Platform.OS == 'android' && Styles.mb12]}
+                                       Platform.OS == 'android' && Styles.mb12,
+                                    ]}
                                  >
-   <MaterialIcons name="send" size={25} style={(loadingSendKomentar || komentar == '' || regexOnlySpacesOrEnter.test(komentar) || data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin"))) ? { color: colors.dimmed } : { color: colors.tint }} />
+                                    <MaterialIcons name="send" size={25} style={(loadingSendKomentar || komentar == '' || regexOnlySpacesOrEnter.test(komentar) || data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin"))) ? Styles.cGray : Styles.cDefault} />
                                  </Pressable>
                               }
                            />
                            :
-                           <View style={[Styles.pv20, Styles.itemsCenter]}>
+                           <View style={[Styles.pv20, { alignItems: 'center' }]}>
-                              <Text style={[Styles.textInformation, { color: colors.dimmed }]}>
+                              <Text style={[Styles.textInformation, Styles.cGray]}>
                                  {
                                     data?.status == 2 ? "Diskusi telah ditutup" : data?.isActive == false ? "Diskusi telah diarsipkan" : "Hanya anggota diskusi yang dapat memberikan komentar"
                                  }
@@ -450,35 +415,25 @@ export default function DetailDiscussionGeneral() {
          <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Komentar">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<MaterialCommunityIcons name="pencil-outline" color={colors.text} size={25} />}
+                  icon={<MaterialCommunityIcons name="pencil-outline" color="black" size={25} />}
                   title="Edit"
                   onPress={() => { handleViewEditKomentar() }}
                />
                <MenuItemRow
-                  icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
+                  icon={<MaterialIcons name="delete" color="black" size={25} />}
                   title="Hapus"
                   onPress={() => {
-                     setVisible(false)
+                     AlertKonfirmasi({
-                     setTimeout(() => {
+                        title: 'Konfirmasi',
-                        setShowDeleteModal(true)
+                        desc: 'Apakah anda yakin ingin menghapus komentar?',
-                     }, 600)
+                        onPress: () => {
+                           handleDeleteKomentar()
+                        }
+                     })
                   }}
                />
             </View>
          </DrawerBottom>
-
-         <ModalConfirmation
-            visible={showDeleteModal}
-            title="Konfirmasi"
-            message="Apakah anda yakin ingin menghapus komentar?"
-            onConfirm={() => {
-               setShowDeleteModal(false)
-               handleDeleteKomentar()
-            }}
-            onCancel={() => setShowDeleteModal(false)}
-            confirmText="Hapus"
-            cancelText="Batal"
-         />
       </>
    )
 }

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

@@ -9,7 +9,6 @@ import Styles from "@/constants/Styles";
 import { apiAddMemberDiscussionGeneral, apiGetDiscussionGeneralOne, apiGetUser } from "@/lib/api";
 import { setUpdateDiscussionGeneralDetail } from "@/lib/discussionGeneralDetail";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { AntDesign } from "@expo/vector-icons";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
@@ -27,7 +26,6 @@ export default function AddMemberDiscussionDetail() {
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.discussionGeneralDetailUpdate)
    const { token, decryptToken } = useAuthSession()
-   const { colors } = useTheme();
    const { id } = useLocalSearchParams<{ id: string }>()
    const [dataOld, setDataOld] = useState<Props[]>([])
    const [data, setData] = useState<Props[]>([])
@@ -84,11 +82,9 @@ export default function AddMemberDiscussionDetail() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error: any) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         const message = error?.response?.data?.message || "Gagal menambahkan anggota"
+         Toast.show({ type: 'small', text1: 'Gagal menambahkan anggota', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
@@ -96,7 +92,7 @@ export default function AddMemberDiscussionDetail() {
 
 
    return (
-      <>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -129,7 +125,7 @@ export default function AddMemberDiscussionDetail() {
                )
             }}
          />
-         <View style={[Styles.p15, Styles.flex1, { backgroundColor: colors.background }]}>
+         <View style={[Styles.p15]}>
             <InputSearch onChange={setSearch} value={search} />
 
             {
@@ -151,7 +147,7 @@ export default function AddMemberDiscussionDetail() {
                   </View>
 
                   :
-                  <Text style={[Styles.textDefault, Styles.pv05, Styles.textCenter, { color: colors.dimmed }]}>Tidak ada member yang dipilih</Text>
+                  <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
             }
             <ScrollView
                showsVerticalScrollIndicator={false}
@@ -164,7 +160,7 @@ export default function AddMemberDiscussionDetail() {
                         return (
                            <Pressable
                               key={index}
-                              style={[Styles.itemSelectModal, { borderColor: colors.icon + '20' }]}
+                              style={[Styles.itemSelectModal]}
                               onPress={() => {
                                  !found && onChoose(item.id, item.name, item.img)
                               }}
@@ -174,22 +170,22 @@ export default function AddMemberDiscussionDetail() {
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]}>{item.name}</Text>
                                     {
-                                       found && <Text style={[Styles.textInformation, { color: colors.dimmed }]}>sudah menjadi anggota</Text>
+                                       found && <Text style={[Styles.textInformation, Styles.cGray]}>sudah menjadi anggota</Text>
                                     }
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={colors.text} />
+                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )
                      }
                      )
                      :
-                     <Text style={[Styles.textDefault, Styles.textCenter]}>Tidak ada data</Text>
+                     <Text style={[Styles.textDefault, { textAlign: 'center' }]}>Tidak ada data</Text>
                }
             </ScrollView>
          </View>
-      </>
+      </SafeAreaView>
    )
 }

app/(application)/discussion/create.tsx

@@ -1,9 +1,11 @@
 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";
-import LoadingCenter from "@/components/loadingCenter";
+import LoadingOverlay from "@/components/loadingOverlay";
 import MenuItemRow from "@/components/menuItemRow";
 import ModalSelect from "@/components/modalSelect";
 import SelectForm from "@/components/selectForm";
@@ -14,38 +16,17 @@ import { apiCreateDiscussionGeneral } from "@/lib/api";
 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 { Pressable, SafeAreaView, ScrollView, View } from "react-native";
+import { 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()
-   const { colors } = useTheme();
    const entityUser = useSelector((state: any) => state.user);
    const userLogin = useSelector((state: any) => state.entities)
    const [chooseGroup, setChooseGroup] = useState({ val: "", label: "" });
@@ -60,67 +41,84 @@ export default function CreateDiscussionGeneral() {
    const [fileForm, setFileForm] = useState<any[]>([])
    const [isModalFile, setModalFile] = useState(false)
    const [indexDelFile, setIndexDelFile] = useState<number>(0)
-   const [dataForm, setDataForm] = useState({ idGroup: "", title: "", desc: "" });
+   const [dataForm, setDataForm] = useState({
-   const [error, setError] = useState({ group: false, title: false, desc: false });
+      idGroup: "",
+      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 });
-         setError({ ...error, group: val === "" || val === "null" });
+         if (val == "" || val == "null") {
-      } else if (cat === "title") {
+            setError({ ...error, group: true });
+         } else {
+            setError({ ...error, group: false });
+         }
+      } else if (cat == "title") {
          setDataForm({ ...dataForm, title: val });
-         setError({ ...error, title: val === "" || val === "null" });
+         if (val == "" || val == "null") {
-      } else if (cat === "desc") {
+            setError({ ...error, title: true });
+         } else {
+            setError({ ...error, title: false });
+         }
+      } else if (cat == "desc") {
          setDataForm({ ...dataForm, desc: val });
-         setError({ ...error, desc: val === "" || val === "null" });
+         if (val == "" || val == "null") {
+            setError({ ...error, desc: true });
+         } else {
+            setError({ ...error, desc: false });
+         }
       }
    }
 
    function checkForm() {
-      const hasError = Object.values(error).some(v => v)
+      if (
-      const hasEmpty = Object.values(dataForm).some(v => v === "")
+         Object.values(error).some((v) => v == true) ||
-      setDisableBtn(hasError || hasEmpty);
+         Object.values(dataForm).some((v) => v == "")
-   }
+      ) {
-
+         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 {
-         validationForm('group', userLogin.idGroup, userLogin.group);
+         setDisableBtn(false);
-         setValChoose(userLogin.idGroup)
-         setSelect(true);
-         setValSelect("member");
       }
    }
 
+   useEffect(() => {
+      checkForm();
+   }, [error, dataForm]);
+
+   useEffect(() => {
+      dispatch(setMemberChoose([]))
+   }, [])
+
+   function handleBack() {
+      dispatch(setMemberChoose([]))
+      router.back()
+   }
+
    const pickDocumentAsync = async () => {
-      const result = await DocumentPicker.getDocumentAsync({ type: ["*/*"], multiple: true });
+      let result = await DocumentPicker.getDocumentAsync({
+         type: ["*/*"],
+         multiple: true
+      });
       if (!result.canceled) {
-         let skipped = 0
+         for (let i = 0; i < result.assets?.length; i++) {
-         for (const asset of result.assets) {
+            if (result.assets[i].uri) {
-            if (!asset.uri) continue
+               setFileForm((prev) => [...prev, result.assets[i]])
-            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((_, i) => i !== index))
+      setFileForm([...fileForm.filter((val, i) => i !== index)])
       setModalFile(false)
    }
 
@@ -129,43 +127,75 @@ 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}`, { uri: fileForm[i].uri, type: 'application/octet-stream', name: fileForm[i].name } as any);
+            fd.append(`file${i}`, {
+               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) {
+      } catch (error) {
          console.error(error);
-         Toast.show({ type: 'small', text1: error?.response?.data?.message || "Gagal menambahkan data" })
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
       } finally {
          setLoading(false)
       }
    }
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <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={() => { dispatch(setMemberChoose([])); router.back() }}
+                     onPressLeft={() => router.back()}
                      right={
                         <ButtonSaveHeader
                            category="create"
-                           disable={disableBtn || entitiesMember.length === 0 || loading}
+                           disable={disableBtn || loading ? true : false}
                            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()
                            }}
                         />
@@ -174,152 +204,132 @@ export default function CreateDiscussionGeneral() {
                )
             }}
          />
-         {loading && <LoadingCenter />}
+         <LoadingOverlay visible={loading} />
-         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100, Styles.flex1, { backgroundColor: colors.background }]}>
+         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100]}>
             <View style={[Styles.p15, Styles.mb100]}>
-
+               {
-               {(entityUser.role === "supadmin" || entityUser.role === "developer") && (
+                  (entityUser.role == "supadmin" ||
-                  <SelectForm
+                     entityUser.role == "developer") && (
-                     label="Lembaga Desa"
+                     <SelectForm
-                     placeholder="Pilih Lembaga Desa"
+                        label="Lembaga Desa"
-                     value={chooseGroup.label}
+                        placeholder="Pilih Lembaga Desa"
-                     required
+                        value={chooseGroup.label}
-                     bg={colors.card}
+                        required
-                     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"
                   placeholder="Judul"
                   required
                   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"
                   placeholder="Hal yang didiskusikan"
                   required
                   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} />
+               {
+                  fileForm.length > 0
+                  &&
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
+                     <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                     {
+                        fileForm.map((item, index) => (
+                           <BorderBottomItem
+                              key={index}
+                              borderType={fileForm.length > 1 ? "bottom" : "none"}
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
+                              title={item.name}
+                              titleWeight="normal"
+                              onPress={() => { setIndexDelFile(index); setModalFile(true) }}
+                           />
+                        ))
+                     }
+                  </View>
+               }
+               <ButtonSelect
+                  value="Pilih Anggota"
+                  onPress={() => {
+                     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");
+                     }
 
-               {/* File */}
+                  }}
-               <View style={[Styles.wrapPaper, Styles.mb15, Styles.sectionCard,
+               />
-                  { backgroundColor: colors.card, borderColor: colors.icon + '18' }]}>
+               {
-                  <Pressable
+                  entitiesMember.length > 0 &&
-                     onPress={pickDocumentAsync}
+                  <View>
-                     style={[Styles.sectionActionRow, { marginBottom: fileForm.length > 0 ? 12 : 0 }]}
+                     <View style={[Styles.rowSpaceBetween, Styles.mv05]}>
-                  >
+                        <Text>Anggota</Text>
-                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.icon + '15' }]}>
+                        <Text>Total {entitiesMember.length} Anggota</Text>
-                        <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>
 
-               {/* Anggota */}
+                     <View style={[Styles.borderAll, Styles.round10, Styles.p10]}>
-               <View style={[Styles.wrapPaper, Styles.mb15, Styles.sectionCard,
+                        {
-                  { backgroundColor: colors.card, borderColor: colors.icon + '18' }]}>
+                           entitiesMember.map((item: { img: any; name: any; }, index: any) => {
-                  <Pressable
+                              return (
-                     onPress={handleOpenMemberPicker}
+                                 <BorderBottomItem
-                     style={[Styles.sectionActionRow, { marginBottom: entitiesMember.length > 0 ? 12 : 0 }]}
+                                    key={index}
-                  >
+                                    borderType="bottom"
-                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.tabActive + '18' }]}>
+                                    icon={
-                        <MaterialIcons name="people" size={18} color={colors.tabActive} />
+                                       <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="sm" />
+                                    }
+                                    title={item.name}
+                                 />
+                              )
+                           })
+                        }
                      </View>
-                     <View style={Styles.flex1}>
+                  </View>
-                        <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>
          </ScrollView>
 
          <ModalSelect
             category={valSelect}
             close={setSelect}
-            onSelect={(value) => validationForm(valSelect, value.val, value.label)}
+            onSelect={(value) => {
-            title={valSelect === "group" ? "Lembaga Desa" : "Pilih Anggota"}
+               validationForm(valSelect, value.val, value.label);
+            }}
+            title={valSelect == "group" ? "Lembaga Desa" : "Pilih Anggota"}
             open={isSelect}
-            idParent={valSelect === "member" ? chooseGroup.val : ""}
+            idParent={valSelect == "member" ? chooseGroup.val : ""}
             valChoose={valChoose}
          />
 
          <DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
+                  icon={<Ionicons name="trash" color="black" size={25} />}
                   title="Hapus"
-                  onPress={() => deleteFile(indexDelFile)}
+                  onPress={() => { deleteFile(indexDelFile) }}
                />
             </View>
          </DrawerBottom>

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

@@ -1,46 +1,26 @@
 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 LoadingOverlay from "@/components/loadingOverlay";
 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";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 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 { Pressable, SafeAreaView, ScrollView, View } from "react-native";
+import { 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();
    const { id } = useLocalSearchParams<{ id: string }>();
    const [disableBtn, setDisableBtn] = useState(false)
    const dispatch = useDispatch()
@@ -50,100 +30,157 @@ 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({ title: "", desc: "" });
+   const [dataForm, setDataForm] = useState({
-   const [error, setError] = useState({ title: false, desc: false })
+      title: "",
-
+      desc: "",
-   const visibleOldFiles = dataFile.filter(v => !v.delete)
+   });
-   const totalFiles = fileForm.length + visibleOldFiles.length
+   const [error, setError] = useState({
+      title: false,
+      desc: false,
+   })
 
    async function handleLoad() {
       try {
          const hasil = await decryptToken(String(token?.current));
-         const response = await apiGetDiscussionGeneralOne({ id, user: hasil, cat: "detail" });
+         const response = await apiGetDiscussionGeneralOne({
-         const responseFile = await apiGetDiscussionGeneralOne({ id, user: hasil, cat: "file" });
+            id: id,
-         if (response.success) setDataForm(response.data);
+            user: hasil,
-         if (responseFile.success) setDataFile(responseFile.data);
+            cat: "detail",
+         });
+         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 });
-         setError({ ...error, title: val === "" || val === "null" });
+         if (val == "" || val == "null") {
-      } else if (cat === "desc") {
+            setError({ ...error, title: true });
+         } else {
+            setError({ ...error, title: false });
+         }
+      } else if (cat == "desc") {
          setDataForm({ ...dataForm, desc: val });
-         setError({ ...error, desc: val === "" || val === "null" });
+         if (val == "" || val == "null") {
+            setError({ ...error, desc: true });
+         } else {
+            setError({ ...error, desc: false });
+         }
       }
    }
 
    function checkForm() {
-      const hasError = Object.values(error).some(v => v)
+      if (Object.values(error).some((v) => v == true) == true || Object.values(dataForm).some((v) => v == "") == true) {
-      const hasEmpty = Object.values(dataForm).some(v => v === "")
+         setDisableBtn(true)
-      setDisableBtn(hasError || hasEmpty);
+      } else {
+         setDisableBtn(false)
+      }
    }
 
-   useEffect(() => { checkForm() }, [error, dataForm])
+   useEffect(() => {
+      checkForm()
+   }, [error, dataForm])
 
    const pickDocumentAsync = async () => {
-      const result = await DocumentPicker.getDocumentAsync({ type: ["*/*"], multiple: true });
+      let result = await DocumentPicker.getDocumentAsync({
+         type: ["*/*"],
+         multiple: true
+      });
       if (!result.canceled) {
-         let skipped = 0
+         for (let i = 0; i < result.assets?.length; i++) {
-         for (const asset of result.assets) {
+            if (result.assets[i].uri) {
-            if (!asset.uri) continue
+               setFileForm((prev) => [...prev, result.assets[i]])
-            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((_, i) => i !== index))
+         setFileForm([...fileForm.filter((val, i) => i !== index)])
       } else {
-         setDataFile(prev => prev.map(item => item.id === index ? { ...item, delete: true } : item))
+         setDataFile(prev =>
+            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}`, { uri: fileForm[i].uri, type: 'application/octet-stream', name: fileForm[i].name } as any);
+            fd.append(`file${i}`, {
+               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' })
          }
-      } catch (error: any) {
+      } catch (error) {
          console.error(error);
-         Toast.show({ type: 'small', text1: error?.response?.data?.message || "Gagal mengubah data" })
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
       } finally {
          setLoading(false)
       }
    }
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <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"
@@ -151,123 +188,80 @@ export default function EditDiscussionGeneral() {
                      onPressLeft={() => router.back()}
                      right={
                         <ButtonSaveHeader
-                           disable={disableBtn || loading}
+                           disable={disableBtn || loading ? true : false}
                            category="update"
-                           onPress={() => handleEdit()}
+                           onPress={() => { handleEdit() }}
                         />
                      }
                   />
                )
             }}
          />
-         {loading && <LoadingCenter />}
+         <LoadingOverlay visible={loading} />
-         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100, Styles.flex1, { backgroundColor: colors.background }]}>
+         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100]}>
-            <View style={Styles.p15}>
+            <View style={[Styles.p15]}>
-
                <InputForm
                   label="Judul"
                   type="default"
                   placeholder="Judul"
                   required
-                  bg={colors.card}
                   error={error.title}
                   value={dataForm.title}
                   errorText="Judul tidak boleh kosong"
                   onChange={(val) => validationForm("title", val)}
                />
-
                <InputForm
                   label="Diskusi"
                   type="default"
                   placeholder="Hal yang didiskusikan"
                   required
-                  bg={colors.card}
                   error={error.desc}
                   value={dataForm.desc}
                   errorText="Diskusi tidak boleh kosong"
                   onChange={(val) => validationForm("desc", val)}
                   multiline
                />
-
+               <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
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
-                     onPress={pickDocumentAsync}
+                     <Text style={[Styles.textDefaultSemiBold]}>File</Text>
-                     style={[Styles.sectionActionRow, { marginBottom: totalFiles > 0 ? 12 : 0 }]}
+                     {
-                  >
+                        dataFile.filter((val) => !val.delete).map((item, index) => (
-                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.icon + '15' }]}>
+                           <BorderBottomItem
-                        <MaterialCommunityIcons name="paperclip" size={18} color={colors.dimmed} />
+                              key={index}
-                     </View>
+                              borderType={(fileForm.length + dataFile.length) > 1 ? "bottom" : "none"}
-                     <View style={Styles.flex1}>
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
-                        <Text style={[Styles.textDefaultSemiBold, { color: colors.text }]}>File</Text>
+                              title={item.name + '.' + item.extension}
-                        {totalFiles === 0 && (
+                              titleWeight="normal"
-                           <Text style={[Styles.textMediumNormal, { color: colors.dimmed }]}>Opsional — ketuk untuk upload</Text>
+                              onPress={() => { setIndexDelFile({ id: item.id, cat: "oldFile" }); setModalFile(true) }}
-                        )}
+                           />
-                     </View>
+                        ))
-                     {totalFiles > 0 && (
+                     }
-                        <View style={[Styles.sectionBadge, { backgroundColor: colors.dimmed + '18' }]}>
+                     {
-                           <Text style={[Styles.textSmallSemiBold, { color: colors.dimmed }]}>{totalFiles} file</Text>
+                        fileForm.map((item, index) => (
-                        </View>
+                           <BorderBottomItem
-                     )}
+                              key={index}
-                     <MaterialCommunityIcons name="chevron-right" size={18} color={colors.dimmed} />
+                              borderType={(fileForm.length + dataFile.length) > 1 ? "bottom" : "none"}
-                  </Pressable>
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
-                  {totalFiles > 0 && (
+                              title={item.name}
-                     <View style={Styles.fileGrid}>
+                              titleWeight="normal"
-                        {visibleOldFiles.map((item, index) => {
+                              onPress={() => { setIndexDelFile({ id: index, cat: "newFile" }); setModalFile(true) }}
-                           const ext = item.extension.toLowerCase()
+                           />
-                           const iconName = getFileIcon(ext)
+                        ))
-                           const iconColor = getFileColor(ext)
+                     }
-                           return (
+                  </View>
-                              <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} />
-                                 </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>
-
             </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} />}
+                  icon={<Ionicons name="trash" color="black" size={25} />}
                   title="Hapus"
-                  onPress={() => deleteFile(indexDelFile.id, indexDelFile.cat)}
+                  onPress={() => { deleteFile(indexDelFile.id, indexDelFile.cat) }}
                />
             </View>
          </DrawerBottom>

app/(application)/discussion/index.tsx

@@ -1,23 +1,20 @@
-import GuideOverlay from "@/components/GuideOverlay";
+import BorderBottomItem from "@/components/borderBottomItem";
 import ButtonTab from "@/components/buttonTab";
 import InputSearch from "@/components/inputSearch";
 import LabelStatus from "@/components/labelStatus";
 import SkeletonContent from "@/components/skeletonContent";
 import Text from "@/components/Text";
-import WrapTab from "@/components/wrapTab";
+import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
 import { apiGetDiscussionGeneral } from "@/lib/api";
-import { GUIDE_DISCUSSION } from "@/lib/guideSteps";
-import { useGuide } from "@/lib/useGuide";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
+import { AntDesign, Feather, Ionicons, MaterialIcons } from "@expo/vector-icons";
-import { AntDesign, Feather } from "@expo/vector-icons";
-import { useInfiniteQuery, useQueryClient } from "@tanstack/react-query";
 import { router, useLocalSearchParams } from "expo-router";
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useState } from "react";
-import { FlatList, Pressable, RefreshControl, View } from "react-native";
+import { RefreshControl, View, VirtualizedList } from "react-native";
 import { useSelector } from "react-redux";
 
+
 type Props = {
    id: string
    title: string
@@ -30,196 +27,164 @@ type Props = {
 export default function Discussion() {
    const entityUser = useSelector((state: any) => state.user)
    const { token, decryptToken } = useAuthSession()
-   const { colors } = useTheme();
    const { active, group } = useLocalSearchParams<{ active?: string, group?: string }>()
    const [search, setSearch] = useState('')
+   const [nameGroup, setNameGroup] = useState('')
+   const [data, setData] = useState<Props[]>([])
    const update = useSelector((state: any) => state.discussionGeneralDetailUpdate)
-   const queryClient = useQueryClient()
+   const [loading, setLoading] = useState(true)
-   const [status, setStatus] = useState<'true' | 'false'>(active == 'false' ? 'false' : 'true')
+   const arrSkeleton = Array.from({ length: 5 }, (_, index) => index)
+   const [status, setStatus] = useState<'true' | 'false'>('true')
+   const [page, setPage] = useState(1)
+   const [waiting, setWaiting] = useState(false)
    const [refreshing, setRefreshing] = useState(false)
-   const { visible: guideVisible, dismiss: dismissGuide } = useGuide('discussion')
 
-   const {
+   async function handleLoad(loading: boolean, thisPage: number) {
-      data,
+      try {
-      fetchNextPage,
+         setWaiting(true)
-      hasNextPage,
+         setLoading(loading)
-      isFetchingNextPage,
+         setPage(thisPage)
-      isLoading,
-      refetch
-   } = useInfiniteQuery({
-      queryKey: ['discussions', { status, search, group }],
-      queryFn: async ({ pageParam = 1 }) => {
          const hasil = await decryptToken(String(token?.current))
-         const response = await apiGetDiscussionGeneral({
+         const response = await apiGetDiscussionGeneral({ user: hasil, active: status, search: search, group: String(group), page: thisPage })
-            user: hasil,
+         if (thisPage == 1) {
-            active: status,
+            setData(response.data)
-            search: search,
+         } else if (thisPage > 1 && response.data.length > 0) {
-            group: String(group),
+            setData([...data, ...response.data])
-            page: pageParam
+         } else {
-         })
+            return;
-         return response;
+         }
-      },
+         setNameGroup(response.filter.name)
-      initialPageParam: 1,
+      } catch (error) {
-      getNextPageParam: (lastPage, allPages) => {
+         console.error(error)
-         return lastPage.data.length > 0 ? allPages.length + 1 : undefined;
+      } finally {
-      },
+         setLoading(false)
-      enabled: !!token?.current,
+         setWaiting(false)
-      staleTime: 0,
+      }
-   })
+   }
 
-   const flatData = useMemo(() => {
-      return data?.pages.flatMap(page => page.data) || [];
-   }, [data])
-
-   const nameGroup = useMemo(() => {
-      return data?.pages[0]?.filter?.name || "";
-   }, [data])
 
    useEffect(() => {
-      refetch()
+      handleLoad(false, 1)
-   }, [update, refetch])
+   }, [update])
+
+   useEffect(() => {
+      handleLoad(true, 1)
+   }, [status, search, group])
+
+
+   const loadMoreData = () => {
+      if (waiting) return
+      setTimeout(() => {
+         handleLoad(false, page + 1)
+      }, 1000);
+   };
 
    const handleRefresh = async () => {
       setRefreshing(true)
-      await queryClient.invalidateQueries({ queryKey: ['discussions'] })
+      handleLoad(false, 1)
+      await new Promise(resolve => setTimeout(resolve, 2000));
       setRefreshing(false)
    };
 
-   const isOpen = (item: Props) => item.status === 1
+   const getItem = (_data: unknown, index: number): Props => ({
-
+      id: data[index].id,
-   const themed = {
+      title: data[index].title,
-      background:       { backgroundColor: colors.background },
+      desc: data[index].desc,
-      card:             { backgroundColor: colors.card, borderColor: colors.icon + '20' },
+      status: data[index].status,
-      cardPressed:      { backgroundColor: colors.icon + '10' },
+      total_komentar: data[index].total_komentar,
-      iconCircle:       { backgroundColor: colors.icon + '20' },
+      createdAt: data[index].createdAt,
-      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, themed.background]}>
+      <View style={[Styles.p15, { flex: 1 }]}>
-         <GuideOverlay visible={guideVisible} steps={GUIDE_DISCUSSION} onDismiss={dismissGuide} />
+         <View>
-         {/* Header controls */}
+            {
-         <View style={[Styles.ph15, Styles.discussionHeaderPadding]}>
+               entityUser.role != "user" && entityUser.role != "coadmin" &&
-            {entityUser.role != "user" && entityUser.role != "coadmin" && (
+               <View style={[Styles.wrapBtnTab]}>
-               <WrapTab>
                   <ButtonTab
                      active={status == "false" ? "false" : "true"}
                      value="true"
-                     onPress={() => setStatus("true")}
+                     onPress={() => { setStatus("true") }}
                      label="Aktif"
-                     icon={<Feather name="check-circle" color={status == "false" ? colors.dimmed : 'white'} size={20} />}
+                     icon={<Feather name="check-circle" color={status == "false" ? 'black' : 'white'} size={20} />}
-                     n={2}
+                     n={2} />
-                  />
                   <ButtonTab
                      active={status == "false" ? "false" : "true"}
                      value="false"
-                     onPress={() => setStatus("false")}
+                     onPress={() => { setStatus("false") }}
                      label="Arsip"
-                     icon={<AntDesign name="closecircleo" color={status == "true" ? colors.dimmed : 'white'} size={20} />}
+                     icon={<AntDesign name="closecircleo" color={status == "true" ? 'black' : 'white'} size={20} />}
-                     n={2}
+                     n={2} />
-                  />
+               </View>
-               </WrapTab>
+            }
-            )}
+
             <InputSearch onChange={setSearch} />
-            {(entityUser.role == "supadmin" || entityUser.role == "developer") && (
+            {
-               <View style={[Styles.mt10, Styles.rowOnly]}>
+               (entityUser.role == "supadmin" || entityUser.role == "developer") &&
+               <View style={[Styles.mv05, Styles.rowOnly]}>
                   <Text>Filter :</Text>
                   <LabelStatus size="small" category="secondary" text={nameGroup} style={[Styles.mh05]} />
                </View>
-            )}
+            }
          </View>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
+            {
+               loading ?
+                  arrSkeleton.map((item: any, i: number) => {
+                     return (
+                        <SkeletonContent key={i} />
+                     )
+                  })
+                  :
+                  data.length > 0
+                     ?
+                     <VirtualizedList
+                        data={data}
+                        getItemCount={() => data.length}
+                        getItem={getItem}
+                        renderItem={({ item, index }: { item: Props, index: number }) => {
+                           return (
+                              <BorderBottomItem
+                                 key={index}
+                                 onPress={() => { router.push(`/discussion/${item.id}`) }}
+                                 borderType="bottom"
+                                 icon={
+                                    <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
+                                       <MaterialIcons name="chat" size={25} color={'#384288'} />
+                                    </View>
+                                 }
+                                 title={item.title}
+                                 subtitle={
+                                    status != "false" && <LabelStatus category={item.status === 1 ? "success" : "error"} text={item.status === 1 ? "BUKA" : "TUTUP"} size="small" />
+                                 }
+                                 rightTopInfo={item.createdAt}
+                                 desc={item.desc.replace(/<[^>]*>?/gm, ' ').replace(/\r?\n|\r/g, ' ')}
+                                 leftBottomInfo={
+                                    <View style={[Styles.rowItemsCenter]}>
+                                       <Ionicons name="chatbox-ellipses-outline" size={18} color="grey" style={Styles.mr05} />
+                                       <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>Diskusikan</Text>
+                                    </View>
+                                 }
+                                 rightBottomInfo={`${item.total_komentar} Komentar`}
 
-         {/* List */}
+                              />
-         <View style={[Styles.flex1, Styles.ph15, Styles.discussionListPadding]}>
+                           )
-            {isLoading ? (
+                        }}
-               [0, 1, 2, 3, 4].map((_, i) => <SkeletonContent key={i} />)
+                        keyExtractor={(item, index) => String(index)}
-            ) : flatData.length === 0 ? (
+                        onEndReached={loadMoreData}
-               <View style={[Styles.contentItemCenter, Styles.mt30]}>
+                        onEndReachedThreshold={0.5}
-                  <Feather name="message-circle" size={42} color={colors.icon + '40'} />
+                        showsVerticalScrollIndicator={false}
-                  <Text style={[Styles.mt10, Styles.discussionEmptyText, themed.dimmed]}>
+                        refreshControl={
-                     Tidak ada diskusi
+                           <RefreshControl
-                  </Text>
+                              refreshing={refreshing}
-               </View>
+                              onRefresh={handleRefresh}
-            ) : (
+                           />
-               <FlatList
+                        }
-                  data={flatData}
-                  keyExtractor={(_, i) => String(i)}
-                  showsVerticalScrollIndicator={false}
-                  onEndReached={() => {
-                     if (hasNextPage && !isFetchingNextPage) fetchNextPage()
-                  }}
-                  onEndReachedThreshold={0.5}
-                  refreshControl={
-                     <RefreshControl
-                        refreshing={refreshing}
-                        onRefresh={handleRefresh}
-                        tintColor={colors.icon}
                      />
-                  }
+                     :
-                  ItemSeparatorComponent={() => <View style={Styles.discussionSeparator} />}
+                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
-                  renderItem={({ item }: { item: Props }) => (
+            }
-                     <Pressable
-                        onPress={() => router.push(`/discussion/${item.id}`)}
-                        style={({ pressed }) => [
-                           Styles.discussionCard,
-                           themed.card,
-                           pressed && themed.cardPressed,
-                        ]}
-                     >
-                        {/* Top row: icon + title + status badge */}
-                        <View style={[Styles.rowItemsCenter, Styles.mb08]}>
-                           {/* Discussion icon */}
-                           <View style={[Styles.discussionIconCircle, themed.iconCircle]}>
-                              <Feather name="message-circle" size={20} color={colors.icon} />
-                           </View>
-
-                           {/* Title + status badge */}
-                           <View style={[Styles.flex1, Styles.discussionTitleCol]}>
-                              <Text style={[Styles.textDefaultSemiBold, themed.title]} numberOfLines={1}>
-                                 {item.title}
-                              </Text>
-                              {status !== "false" && (
-                                 <View style={[Styles.discussionStatusPill, isOpen(item) ? themed.statusOpen : themed.statusClosed]}>
-                                    <Text style={[Styles.discussionStatusText, isOpen(item) ? themed.statusTextOpen : themed.statusTextClosed]}>
-                                       {isOpen(item) ? 'Buka' : 'Tutup'}
-                                    </Text>
-                                 </View>
-                              )}
-                           </View>
-                        </View>
-
-                        {/* Description */}
-                        {item.desc ? (
-                           <Text
-                              style={[Styles.textMediumNormal, Styles.discussionCardIndent, Styles.discussionDescMargin, themed.title]}
-                              numberOfLines={2}
-                           >
-                              {item.desc.replace(/<[^>]*>?/gm, ' ').replace(/\r?\n|\r/g, ' ')}
-                           </Text>
-                        ) : null}
-
-                        {/* Bottom row: comment count + date */}
-                        <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, themed.dimmed]}>
-                                 {item.total_komentar} Komentar
-                              </Text>
-                           </View>
-                           <Text style={[Styles.discussionDateText, themed.dimmed]}>
-                              {item.createdAt}
-                           </Text>
-                        </View>
-                     </Pressable>
-                  )}
-               />
-            )}
          </View>
       </View>
    );
-}
+}

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

@@ -1,18 +1,20 @@
+import AlertKonfirmasi from "@/components/alertKonfirmasi";
 import AppHeader from "@/components/AppHeader";
+import BorderBottomItem from "@/components/borderBottomItem";
 import DrawerBottom from "@/components/drawerBottom";
 import ImageUser from "@/components/imageNew";
 import MenuItemRow from "@/components/menuItemRow";
-import ModalConfirmation from "@/components/ModalConfirmation";
+import SkeletonTwoItem from "@/components/skeletonTwoItem";
 import Text from '@/components/Text';
+import { ColorsStatus } from "@/constants/ColorsStatus";
 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 { Pressable, SafeAreaView, ScrollView, View } from "react-native";
+import { SafeAreaView, ScrollView, View } from "react-native";
 import Toast from "react-native-toast-message";
 import { useSelector } from "react-redux";
 
@@ -22,11 +24,8 @@ type Props = {
    img: string
 }
 
-const SKELETON_COUNT = 5
-
 export default function MemberDiscussionDetail() {
    const { token, decryptToken } = useAuthSession()
-   const { colors } = useTheme();
    const entityUser = useSelector((state: any) => state.user)
    const { id } = useLocalSearchParams<{ id: string }>()
    const [data, setData] = useState<Props[]>([])
@@ -34,12 +33,11 @@ export default function MemberDiscussionDetail() {
    const [chooseUser, setChooseUser] = useState({ idUser: '', name: '', img: '' })
    const update = useSelector((state: any) => state.discussionGeneralDetailUpdate)
    const [loading, setLoading] = useState(true)
-   const [showDeleteModal, setShowDeleteModal] = useState(false)
+   const arrSkeleton = Array.from({ length: 5 }, (_, index) => index)
-   const canManage = entityUser.role !== "user" && entityUser.role !== "coadmin"
 
-   async function handleLoad(showLoadingIndicator: boolean) {
+   async function handleLoad(loading: boolean) {
       try {
-         setLoading(showLoadingIndicator)
+         setLoading(loading)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiGetDiscussionGeneralOne({ id: id, user: hasil, cat: 'anggota' })
          setData(response.data)
@@ -50,27 +48,35 @@ export default function MemberDiscussionDetail() {
       }
    }
 
-   useEffect(() => { handleLoad(false) }, [update]);
+   useEffect(() => {
-   useEffect(() => { handleLoad(true) }, []);
+      handleLoad(false)
+   }, [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) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         Toast.show({ type: 'small', text1: error?.response?.data?.message || "Gagal mengeluarkan anggota" })
       } finally {
          setModal(false)
       }
    }
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               headerTitle: 'Anggota Diskusi',
+               headerTitleAlign: 'center',
                header: () => (
                   <AppHeader
                      title="Anggota Diskusi"
@@ -80,117 +86,83 @@ export default function MemberDiscussionDetail() {
                )
             }}
          />
-         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100, Styles.flex1, { backgroundColor: colors.background }]}>
+         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
+            <View style={[Styles.p15]}>
-
+               <Text style={[Styles.textDefault, Styles.mv05]}>{data.length} Anggota</Text>
-               {/* Tombol tambah anggota */}
+               <View style={[Styles.wrapPaper, Styles.mb100]}>
-               {canManage && (
+                  {
-                  <View style={[Styles.wrapPaper, Styles.sectionCard, Styles.mb15,
+                     entityUser.role != "user" && entityUser.role != "coadmin" &&
-                     { backgroundColor: colors.card, borderColor: colors.icon + '18' }]}>
+                     <BorderBottomItem
-                     <Pressable
+                        onPress={() => { router.push(`/discussion/add-member/${id}`) }}
-                        onPress={() => router.push(`/discussion/add-member/${id}`)}
+                        borderType="none"
-                        style={Styles.sectionActionRow}
+                        icon={
-                     >
+                           <View style={[Styles.iconContent, ColorsStatus.gray]}>
-                        <View style={[Styles.sectionIconBox, { backgroundColor: colors.icon + '18' }]}>
+                              <Feather name="user-plus" size={25} color={'#384288'} />
-                           <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>
-                        )
+                        }
-                        : data.map((item, index) => (
+                        title="Tambah Anggota"
-                           <Pressable
+                     />
-                              key={index}
+                  }
-                              onPress={() => { setChooseUser(item); setModal(true) }}
+                  {
-                              style={({ pressed }) => [
+                     loading ?
-                                 Styles.rowItemsCenter, Styles.ph15,
+                        arrSkeleton.map((item, index) => {
-                                 {
+                           return (
-                                    paddingVertical: 13, gap: 14,
+                              <SkeletonTwoItem key={index} />
-                                    borderBottomWidth: index < data.length - 1 ? 1 : 0,
+                           )
-                                    borderBottomColor: colors.icon + '14',
+                        })
-                                    backgroundColor: pressed ? colors.icon + '0E' : 'transparent',
+                        :
-                                 },
+                        data.map((item, index) => {
-                              ]}
+                           return (
-                           >
+                              <BorderBottomItem
-                              <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="xs" />
+                                 key={index}
-                              <Text style={[Styles.textDefault, Styles.flex1, { color: colors.text }]} numberOfLines={1}>
+                                 borderType="bottom"
-                                 {item.name}
+                                 icon={
-                              </Text>
+                                    <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="sm" />
-                              <MaterialCommunityIcons name="chevron-right" size={18} color={colors.icon + '60'} />
+                                 }
-                           </Pressable>
+                                 title={item.name}
-                        ))
+                                 onPress={() => {
+                                    setChooseUser(item)
+                                    setModal(true)
+                                 }}
+                              />
+                           )
+                        })
                   }
                </View>
-
             </View>
          </ScrollView>
 
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title={chooseUser.name}>
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<MaterialCommunityIcons name="account-eye" color={colors.text} size={25} />}
+                  icon={<MaterialCommunityIcons name="account-eye" color="black" size={25} />}
                   title="Lihat Profil"
                   onPress={() => {
                      setModal(false)
                      router.push(`/member/${chooseUser.idUser}`)
                   }}
                />
-               {canManage && (
+               {
+                  entityUser.role != "user" && entityUser.role != "coadmin" &&
                   <MenuItemRow
-                     icon={<MaterialCommunityIcons name="account-remove" color={colors.text} size={25} />}
+                     icon={<MaterialCommunityIcons name="account-remove" color="black" size={25} />}
                      title="Keluarkan"
                      onPress={() => {
                         setModal(false)
-                        setTimeout(() => setShowDeleteModal(true), 600)
+                        AlertKonfirmasi({
+                           title: 'Konfirmasi',
+                           desc: 'Apakah Anda yakin ingin mengeluarkan anggota?',
+                           onPress: () => {
+                              handleDeleteUser()
+                           }
+                        })
+
                      }}
                   />
-               )}
+               }
+
             </View>
          </DrawerBottom>
-
-         <ModalConfirmation
-            visible={showDeleteModal}
-            title="Konfirmasi"
-            message="Apakah anda yakin ingin mengeluarkan anggota?"
-            onConfirm={() => { setShowDeleteModal(false); handleDeleteUser() }}
-            onCancel={() => setShowDeleteModal(false)}
-            confirmText="Hapus"
-            cancelText="Batal"
-         />
       </SafeAreaView>
    )
 }

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

@@ -9,7 +9,6 @@ import Styles from "@/constants/Styles";
 import { apiAddMemberCalendar, apiGetCalendarOne, apiGetDivisionMember } from "@/lib/api";
 import { setUpdateCalendar } from "@/lib/calendarUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { AntDesign } from "@expo/vector-icons";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
@@ -24,7 +23,6 @@ type Props = {
 }
 
 export default function AddMemberCalendarEvent() {
-   const { colors } = useTheme();
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.calendarUpdate)
    const { token, decryptToken } = useAuthSession()
@@ -92,11 +90,9 @@ export default function AddMemberCalendarEvent() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error: any) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         const message = error?.response?.data?.message || "Gagal menambahkan anggota"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
@@ -104,7 +100,7 @@ export default function AddMemberCalendarEvent() {
 
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -158,7 +154,7 @@ export default function AddMemberCalendarEvent() {
                   </View>
 
                   :
-                  <Text style={[Styles.textDefault, Styles.pv05, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada member yang dipilih</Text>
+                  <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
             }
             <ScrollView
                showsVerticalScrollIndicator={false}
@@ -171,7 +167,7 @@ export default function AddMemberCalendarEvent() {
                         return (
                            <Pressable
                               key={index}
-                              style={[Styles.itemSelectModal, {borderColor: colors.icon + '20'}]}
+                              style={[Styles.itemSelectModal]}
                               onPress={() => {
                                  !found && onChoose(item.idUser, item.name, item.img)
                               }}
@@ -181,12 +177,12 @@ export default function AddMemberCalendarEvent() {
                                  <View style={[Styles.ml10, { width: '80%' }]}>
                                     <Text numberOfLines={1} ellipsizeMode="tail" style={[Styles.textDefault]}>{item.name}</Text>
                                     {
-                                       found && <Text style={[Styles.textInformation, { color: colors.dimmed }]}>sudah menjadi anggota</Text>
+                                       found && <Text style={[Styles.textInformation, Styles.cGray]}>sudah menjadi anggota</Text>
                                     }
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} color={colors.text} />
+                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )

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

@@ -9,7 +9,6 @@ import { valueTypeEventRepeat } from "@/constants/TypeEventRepeat"
 import { apiGetCalendarOne, apiUpdateCalendar } from "@/lib/api"
 import { stringToDateTime } from "@/lib/fun_stringToDate"
 import { useAuthSession } from "@/providers/AuthProvider"
-import { useTheme } from "@/providers/ThemeProvider";
 import { useHeaderHeight } from "@react-navigation/elements"
 import { Stack, router, useLocalSearchParams } from "expo-router"
 import moment from "moment"
@@ -18,7 +17,6 @@ import { KeyboardAvoidingView, Platform, SafeAreaView, ScrollView, View } from "
 import Toast from "react-native-toast-message"
 
 export default function EditEventCalendar() {
-   const { colors } = useTheme();
    const { token, decryptToken } = useAuthSession();
    const [choose, setChoose] = useState({ val: "", label: "" })
    const [isSelect, setSelect] = useState(false)
@@ -57,11 +55,9 @@ export default function EditEventCalendar() {
          setData({ ...response.data, dateStart: moment(response.data.dateStartFormat, 'DD-MM-YYYY').format('DD-MM-YYYY') })
          setIdCalendar(response.data.idCalendar)
          setChoose({ val: response.data.repeatEventTyper, label: valueTypeEventRepeat.find((item) => item.id == response.data.repeatEventTyper)?.name || "" })
-      } catch (error: any) {
+      } catch (error) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal mendapatkan data"
+         Toast.show({ type: 'small', text1: 'Gagal mendapatkan data', })
-
-         Toast.show({ type: 'small', text1: message })
       }
    }
 
@@ -156,11 +152,9 @@ export default function EditEventCalendar() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error: any) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         const message = error?.response?.data?.message || "Gagal mengubah acara"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
@@ -168,7 +162,7 @@ export default function EditEventCalendar() {
 
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -211,7 +205,7 @@ export default function EditEventCalendar() {
                      type="default"
                      placeholder="Nama Acara"
                      required
-                     bg={colors.card}
+                     bg="white"
                      value={data.title}
                      onChange={(val) => validationForm("title", val)}
                      error={error.title}
@@ -257,12 +251,12 @@ export default function EditEventCalendar() {
                      label="Link Meet"
                      type="default"
                      placeholder="Link Meet"
-                     bg={colors.card}
+                     bg="white"
                      value={data.linkMeet}
                      onChange={(val) => validationForm("linkMeet", val)}
                   />
                   <SelectForm
-                     bg={colors.card}
+                     bg="white"
                      label="Ulangi Acara"
                      placeholder="Ulangi Acara"
                      value={choose.label}
@@ -274,7 +268,7 @@ export default function EditEventCalendar() {
                      type="numeric"
                      placeholder="Jumlah Pengulangan"
                      required
-                     bg={colors.card}
+                     bg="white"
                      value={String(data.repeatValue)}
                      onChange={(val) => validationForm("repeatValue", val)}
                      error={error.repeatValue}
@@ -285,7 +279,7 @@ export default function EditEventCalendar() {
                      label="Deskripsi"
                      type="default"
                      placeholder="Deskripsi"
-                     bg={colors.card}
+                     bg="white"
                      value={data.desc}
                      onChange={(val) => validationForm("desc", val)}
                      multiline

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

@@ -1,17 +1,19 @@
+import AlertKonfirmasi from "@/components/alertKonfirmasi"
 import AppHeader from "@/components/AppHeader"
-import DrawerBottom from "@/components/drawerBottom"
+import BorderBottomItem from "@/components/borderBottomItem"
+import ButtonBackHeader from "@/components/buttonBackHeader"
 import HeaderRightCalendarDetail from "@/components/calendar/headerCalendarDetail"
+import DrawerBottom from "@/components/drawerBottom"
 import ImageUser from "@/components/imageNew"
 import MenuItemRow from "@/components/menuItemRow"
-import ModalConfirmation from "@/components/ModalConfirmation"
+import Skeleton from "@/components/skeleton"
 import Text from "@/components/Text"
 import { ConstEnv } from "@/constants/ConstEnv"
 import Styles from "@/constants/Styles"
 import { apiDeleteCalendarMember, apiGetCalendarOne, apiGetDivisionOneFeature } from "@/lib/api"
 import { setUpdateCalendar } from "@/lib/calendarUpdate"
 import { useAuthSession } from "@/providers/AuthProvider"
-import { 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"
@@ -43,7 +45,6 @@ type PropsMember = {
 }
 
 export default function DetailEventCalendar() {
-   const { colors } = useTheme()
    const { id, detail } = useLocalSearchParams<{ id: string, detail: string }>();
    const [data, setData] = useState<Props>()
    const [member, setMember] = useState<PropsMember[]>([])
@@ -54,7 +55,6 @@ export default function DetailEventCalendar() {
    const dispatch = useDispatch()
    const entityUser = useSelector((state: any) => state.user);
    const [isMemberDivision, setIsMemberDivision] = useState(false);
-   const [showDeleteModal, setShowDeleteModal] = useState(false)
    const [loading, setLoading] = useState(true)
    const [refreshing, setRefreshing] = useState(false)
 
@@ -134,11 +134,9 @@ export default function DetailEventCalendar() {
             dispatch(setUpdateCalendar({ ...update, member: !update.member }));
          }
          Toast.show({ type: 'small', text1: response.message, })
-      } catch (error: any) {
+      } catch (error) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal menghapus anggota"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setModalMember(false)
       }
@@ -153,142 +151,134 @@ 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={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
-               header: () => (
+               // 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
+                        (entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision ? <></> : <HeaderRightCalendarDetail id={String(data?.idCalendar)} idReminder={String(detail)} />
-                           ? <></> : <HeaderRightCalendarDetail id={String(data?.idCalendar)} idReminder={String(detail)} />
                      }
                   />
                )
             }}
          />
          <ScrollView
-            showsVerticalScrollIndicator={false}
+            style={[Styles.h100]}
-            style={Styles.h100}
+            refreshControl={
-            refreshControl={<RefreshControl refreshing={refreshing} onRefresh={handleRefresh} tintColor={colors.icon} />}
+               <RefreshControl
+                  refreshing={refreshing}
+                  onRefresh={handleRefresh}
+               />
+            }
          >
-            <View style={[Styles.p15, Styles.mb100]}>
+            <View style={[Styles.p15]}>
+               <View style={[Styles.wrapPaper, Styles.mb15]}>
+                  <View style={[Styles.rowItemsCenter, { alignItems: 'flex-start' }]}>
+                     <MaterialCommunityIcons name="calendar-text" size={30} color="black" style={Styles.mr10} />
+                     {
+                        loading ?
+                           <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
+                           : <Text style={[Styles.textDefault, 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={{ paddingHorizontal: 16 }}>
+                  <View style={[Styles.rowItemsCenter, Styles.mt10]}>
-                     <InfoRow icon="format-title" label="Judul" value={data?.title} />
+                     <MaterialCommunityIcons name="calendar-month-outline" size={30} color="black" style={Styles.mr10} />
-                     <InfoRow icon="calendar-month-outline" label="Tanggal" value={data?.dateStart} />
+                     {
-                     <InfoRow icon="clock-outline" label="Waktu" value={data ? `${data.timeStart} – ${data.timeEnd}` : undefined} />
+                        loading ?
-                     <InfoRow icon="repeat" label="Pengulangan" value={data?.repeatEventTyper ? repeatLabel[data.repeatEventTyper] : undefined} />
+                           <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
-                     <InfoRow icon="link-variant" label="Link Meet" value={data?.linkMeet} onCopy={data?.linkMeet ? () => handleCopy(data.linkMeet) : undefined} />
+                           :
-                     <View style={[Styles.sectionActionRow, { paddingVertical: 10, alignItems: 'flex-start' }]}>
+                           <Text style={[Styles.textDefault]}>{data?.dateStart}</Text>
-                        <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>
+                  <View style={[Styles.rowItemsCenter, Styles.mt10]}>
-
+                     <MaterialCommunityIcons name="clock-outline" size={30} color="black" style={Styles.mr10} />
-               {/* Daftar anggota */}
+                     {
-               <View style={[Styles.wrapPaper, Styles.sectionCard, Styles.noShadow,
+                        loading ?
-                  { backgroundColor: colors.card, borderColor: colors.icon + '18', padding: 0, overflow: 'hidden' }]}>
+                           <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
-
+                           :
-                  <View style={[Styles.sectionActionRow, { padding: 16, borderBottomWidth: 1, borderBottomColor: colors.icon + '14' }]}>
+                           <Text style={[Styles.textDefault]}>{data?.timeStart} | {data?.timeEnd}</Text>
-                     <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]}>
-                  {member.length === 0
+                     <MaterialCommunityIcons name="repeat" size={30} color="black" style={Styles.mr10} />
-                     ? (
+                     {
-                        <View style={[Styles.contentItemCenter, { paddingVertical: 40 }]}>
+                        loading ?
-                           <MaterialIcons name="people-outline" size={34} color={colors.icon + '50'} />
+                           <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
-                           <Text style={[Styles.textMediumNormal, Styles.mt10, { color: colors.dimmed }]}>Belum ada anggota</Text>
+                           :
-                        </View>
+                           <Text style={[Styles.textDefault]}>
-                     )
-                     : 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,
                               {
-                                 paddingVertical: 12, gap: 14,
+                                 data?.repeatEventTyper.toString() === 'once' ? 'Acara 1 Kali' :
-                                 borderBottomWidth: index < member.length - 1 ? 1 : 0,
+                                    data?.repeatEventTyper.toString() === 'daily' ? 'Setiap Hari' :
-                                 borderBottomColor: colors.icon + '14',
+                                       data?.repeatEventTyper.toString() === 'weekly' ? 'Mingguan' :
-                                 backgroundColor: pressed && canManage ? colors.icon + '0E' : 'transparent',
+                                          data?.repeatEventTyper.toString() === 'monthly' ? 'Bulanan' :
-                              },
+                                             data?.repeatEventTyper.toString() === 'yearly' ? 'Tahunan' :
-                           ]}
+                                                ''
-                        >
+                              }
-                           <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="xs" />
+                           </Text>
-                           <View style={Styles.flex1}>
+                     }
-                              <Text style={[Styles.textDefault, { color: colors.text }]} numberOfLines={1}>{item.name}</Text>
+                  </View>
-                              <Text style={[Styles.textMediumNormal, { color: colors.dimmed }]} numberOfLines={1}>{item.email}</Text>
+                  <View style={[Styles.rowItemsCenter, Styles.mt10]}>
-                           </View>
+                     <MaterialCommunityIcons name="link-variant" size={30} color="black" style={Styles.mr10} />
-                           {canManage && <MaterialCommunityIcons name="chevron-right" size={18} color={colors.icon + '60'} />}
+                     {
-                        </Pressable>
+                        loading ?
-                     ))
+                           <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="black" 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]}>
+                     {
+                        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>
 
@@ -296,7 +286,7 @@ export default function DetailEventCalendar() {
          <DrawerBottom animation="slide" isVisible={isModalMember} setVisible={setModalMember} title={memberChoose.name}>
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<MaterialCommunityIcons name="account-eye" color={colors.text} size={25} />}
+                  icon={<MaterialCommunityIcons name="account-eye" color="black" size={25} />}
                   title="Lihat Profil"
                   onPress={() => {
                      setModalMember(false)
@@ -305,30 +295,22 @@ export default function DetailEventCalendar() {
                />
 
                <MenuItemRow
-                  icon={<MaterialCommunityIcons name="account-remove" color={colors.text} size={25} />}
+                  icon={<MaterialCommunityIcons name="account-remove" color="black" size={25} />}
                   title="Keluarkan"
                   onPress={() => {
                      setModalMember(false)
-                     setTimeout(() => {
+                     AlertKonfirmasi({
-                        setShowDeleteModal(true)
+                        title: 'Konfirmasi',
-                     }, 600)
+                        desc: 'Apakah Anda yakin ingin mengeluarkan anggota?',
+                        onPress: () => {
+                           handleDeleteUser()
+                        }
+                     })
+
                   }}
                />
             </View>
          </DrawerBottom>
-
-         <ModalConfirmation
-            visible={showDeleteModal}
-            title="Konfirmasi"
-            message="Apakah Anda yakin ingin mengeluarkan anggota?"
-            onConfirm={() => {
-               setShowDeleteModal(false)
-               handleDeleteUser()
-            }}
-            onCancel={() => setShowDeleteModal(false)}
-            confirmText="Keluar"
-            cancelText="Batal"
-         />
       </SafeAreaView>
    )
 }

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

@@ -10,7 +10,6 @@ import { apiCreateCalendar, apiGetDivisionMember } from "@/lib/api";
 import { setFormCreateCalendar } from "@/lib/calendarCreate";
 import { setUpdateCalendar } from "@/lib/calendarUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { AntDesign } from "@expo/vector-icons";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
@@ -25,7 +24,6 @@ type Props = {
 }
 
 export default function CreateCalendarAddMember() {
-   const { colors } = useTheme();
    const { token, decryptToken } = useAuthSession()
    const { id } = useLocalSearchParams<{ id: string }>()
    const [data, setData] = useState<Props[]>([])
@@ -83,18 +81,16 @@ export default function CreateCalendarAddMember() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error: any) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         const message = error?.response?.data?.message || "Gagal membuat acara"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
    }
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -145,7 +141,7 @@ export default function CreateCalendarAddMember() {
                   </View>
 
                   :
-                  <Text style={[Styles.textDefault, Styles.pv05, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada member yang dipilih</Text>
+                  <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
             }
             <ScrollView
                showsVerticalScrollIndicator={false}
@@ -158,7 +154,7 @@ export default function CreateCalendarAddMember() {
                         return (
                            <Pressable
                               key={index}
-                              style={[Styles.itemSelectModal, { borderColor: colors.icon + '20' }]}
+                              style={[Styles.itemSelectModal]}
                               onPress={() => { onChoose(item.idUser, item.name, item.img) }}
                            >
                               <View style={[Styles.rowItemsCenter, Styles.w70]}>
@@ -168,7 +164,7 @@ export default function CreateCalendarAddMember() {
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} color={colors.text} />
+                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )

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

@@ -9,7 +9,6 @@ import Styles from "@/constants/Styles";
 import { setFormCreateCalendar } from "@/lib/calendarCreate";
 import { stringToDateTime } from "@/lib/fun_stringToDate";
 import { useHeaderHeight } from '@react-navigation/elements';
-import { useTheme } from "@/providers/ThemeProvider";
 import { Stack, router, useLocalSearchParams } from "expo-router";
 import { useState } from "react";
 import {
@@ -22,7 +21,6 @@ import {
 import { useDispatch, useSelector } from "react-redux";
 
 export default function CalendarDivisionCreate() {
-   const { colors } = useTheme();
    const { id } = useLocalSearchParams<{ id: string }>()
    const [choose, setChoose] = useState({ val: "", label: "" })
    const [isSelect, setSelect] = useState(false)
@@ -128,7 +126,7 @@ export default function CalendarDivisionCreate() {
    }
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => (
@@ -146,7 +144,7 @@ export default function CalendarDivisionCreate() {
                //       disable={Object.values(error).some((val) => val == true) || data.title == "" || data.dateStart == "" || data.timeStart == "" || data.timeEnd == "" || data.repeatEventType == ""}
                //    />
                // ),
-               header: () => (
+               header:()=>(
                   <AppHeader
                      title="Tambah Acara"
                      showBack={true}
@@ -175,7 +173,7 @@ export default function CalendarDivisionCreate() {
                      type="default"
                      placeholder="Nama Acara"
                      required
-                     bg={colors.card}
+                     bg="white"
                      value={data.title}
                      onChange={(val) => validationForm("title", val)}
                      error={error.title}
@@ -221,12 +219,12 @@ export default function CalendarDivisionCreate() {
                      label="Link Meet"
                      type="default"
                      placeholder="Link Meet"
-                     bg={colors.card}
+                     bg="white"
                      value={data.linkMeet}
                      onChange={(val) => validationForm("linkMeet", val)}
                   />
                   <SelectForm
-                     bg={colors.card}
+                     bg="white"
                      label="Ulangi Acara"
                      placeholder="Ulangi Acara"
                      value={choose.label}
@@ -238,7 +236,7 @@ export default function CalendarDivisionCreate() {
                      type="numeric"
                      placeholder="Jumlah Pengulangan"
                      required
-                     bg={colors.card}
+                     bg="white"
                      value={String(data.repeatValue)}
                      onChange={(val) => validationForm("repeatValue", val)}
                      error={error.repeatValue}
@@ -249,7 +247,7 @@ export default function CalendarDivisionCreate() {
                      label="Deskripsi"
                      type="default"
                      placeholder="Deskripsi"
-                     bg={colors.card}
+                     bg="white"
                      value={data.desc}
                      onChange={(val) => validationForm("desc", val)}
                      multiline

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

@@ -1,10 +1,10 @@
 import InputSearch from "@/components/inputSearch";
 import Skeleton from "@/components/skeleton";
 import Text from "@/components/Text";
+import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
 import { apiGetCalendarHistory } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
 import { FlatList, View, VirtualizedList } from "react-native";
@@ -15,7 +15,6 @@ type Props = {
    data: []
 }
 export default function CalendarHistory() {
-   const { colors, activeTheme } = useTheme();
    const { id } = useLocalSearchParams<{ id: string }>();
    const { token, decryptToken } = useAuthSession();
    const [data, setData] = useState<Props[]>([])
@@ -65,11 +64,11 @@ export default function CalendarHistory() {
    })
 
    return (
-      <View style={[Styles.p15, { flex: 1, backgroundColor: colors.background }]}>
+      <View style={[Styles.p15, { flex: 1 }]}>
          <View>
             <InputSearch onChange={(val) => setSearch(val)} />
          </View>
-         <View style={[{ flex: 2 }, Styles.mt10]}>
+         <View style={[{ flex: 2, }]}>
             {
                loading ?
                   arrSkeleton.map((item, index) => (
@@ -82,7 +81,7 @@ export default function CalendarHistory() {
                      getItem={getItem}
                      renderItem={({ item, index }: { item: Props, index: number }) => {
                         return (
-                           <View key={index} style={[{ flexDirection: 'row' }, Styles.mb05, Styles.borderAll, { backgroundColor: colors.card }, Styles.p10, Styles.round05, { borderColor: colors.icon + '20' }]}>
+                           <View key={index} style={[{ flexDirection: 'row' }, Styles.mv05, ColorsStatus.lightGreen, Styles.p10, Styles.round10]}>
                               <View style={[Styles.mr10, Styles.ph05]}>
                                  <Text style={[Styles.textSubtitle]}>{String(item.dateStart)}</Text>
                                  <Text style={[Styles.textDefault, { textAlign: 'center' }]}>{item.year}</Text>
@@ -90,7 +89,7 @@ export default function CalendarHistory() {
                               <View style={[{ flex: 1 }]}>
                                  <FlatList data={item.data}
                                     renderItem={({ item, index }: { item: { title: string, timeStart: string, timeEnd: string }, index: number }) => (
-                                       <View key={index} style={[Styles.mb05]}>
+                                       <View key={index} style={[Styles.mb05, Styles.w80]}>
                                           <Text style={[Styles.textDefaultSemiBold]} numberOfLines={1} ellipsizeMode="tail">{item.title}</Text>
                                           <Text style={[Styles.textDefault]}>{item.timeStart} | {item.timeEnd}</Text>
                                        </View>

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

@@ -1,5 +1,4 @@
 import AppHeader from "@/components/AppHeader";
-import GuideOverlay from "@/components/GuideOverlay";
 import HeaderRightCalendarList from "@/components/calendar/headerCalendarList";
 import ItemDateCalendar from "@/components/calendar/itemDateCalendar";
 import EventItem from "@/components/eventItem";
@@ -7,10 +6,7 @@ import Skeleton from "@/components/skeleton";
 import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
 import { apiGetCalendarByDateDivision, apiGetIndicatorCalendar } from "@/lib/api";
-import { GUIDE_DIVISION_CALENDAR } from "@/lib/guideSteps";
-import { useGuide } from "@/lib/useGuide";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { Feather } from "@expo/vector-icons";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import 'intl';
@@ -38,7 +34,6 @@ type Props = {
 };
 
 export default function CalendarDivision() {
-   const { colors, activeTheme } = useTheme();
    const [selected, setSelected] = useState<any>(new Date())
    const [data, setData] = useState<Props[]>([])
    const { token, decryptToken } = useAuthSession()
@@ -49,7 +44,6 @@ export default function CalendarDivision() {
    const [loading, setLoading] = useState(true)
    const [loadingBtn, setLoadingBtn] = useState(false)
    const [refreshing, setRefreshing] = useState(false)
-   const { visible: guideVisible, dismiss: dismissGuide } = useGuide('division-calendar')
 
 
    async function handleLoad(loading: boolean) {
@@ -123,15 +117,15 @@ export default function CalendarDivision() {
          );
       },
       IconNext: <Pressable onPress={() => !loadingBtn ? setMonth(month + 1) : null}>
-         <Feather name="chevron-right" size={20} color={loadingBtn ? 'gray' : colors.text} />
+         <Feather name="chevron-right" size={20} color={loadingBtn ? 'gray' : 'black'} />
       </Pressable>,
       IconPrev: <Pressable onPress={() => !loadingBtn ? setMonth(month - 1) : null}>
-         <Feather name="chevron-left" size={20} color={loadingBtn ? 'gray' : colors.text} />
+         <Feather name="chevron-left" size={20} color={loadingBtn ? 'gray' : 'black'} />
       </Pressable>,
    };
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => (
@@ -154,19 +148,17 @@ export default function CalendarDivision() {
                )
             }}
          />
-         <GuideOverlay visible={guideVisible} steps={GUIDE_DIVISION_CALENDAR} onDismiss={dismissGuide} />
          <ScrollView
             refreshControl={
                <RefreshControl
                   refreshing={refreshing}
                   onRefresh={handleRefresh}
-                  tintColor={colors.icon}
                />
             }
             style={[Styles.h100]}
          >
             <View style={[Styles.p15]}>
-               <View style={[Styles.wrapPaper, Styles.p10, { backgroundColor: colors.card, borderColor: colors.background }]}>
+               <View style={[Styles.wrapPaper, Styles.p10]}>
                   <Datepicker
                      components={components}
                      mode="single"
@@ -175,19 +167,19 @@ export default function CalendarDivision() {
                      onMonthChange={(month) => setMonth(month)}
                      styles={{
                         selected: Styles.selectedDate,
-                        month_label: { color: colors.text },
+                        month_label: Styles.cBlack,
-                        month_selector_label: { color: colors.text },
+                        month_selector_label: Styles.cBlack,
-                        year_label: { color: colors.text },
+                        year_label: Styles.cBlack,
-                        year_selector_label: { color: colors.text },
+                        year_selector_label: Styles.cBlack,
-                        day_label: { color: colors.text },
+                        day_label: Styles.cBlack,
-                        time_label: { color: colors.text },
+                        time_label: Styles.cBlack,
-                        weekday_label: { color: colors.text },
+                        weekday_label: Styles.cBlack,
                      }}
                   />
                </View>
                <View style={[Styles.mb15, Styles.mt15]}>
                   <Text style={[Styles.textDefaultSemiBold, Styles.mb05]}>Acara</Text>
-                  <View style={[Styles.wrapPaper, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                  <View style={[Styles.wrapPaper]}>
                      {
                         loading ?
                            <>
@@ -210,7 +202,7 @@ export default function CalendarDivision() {
                                  />
                               ))
                            ) : (
-                              <Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada acara</Text>
+                              <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada acara</Text>
                            )
                      }
                   </View>

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

@@ -1,45 +1,25 @@
 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";
+import LoadingOverlay from "@/components/loadingOverlay";
 import MenuItemRow from "@/components/menuItemRow";
 import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
 import { apiEditDiscussion, apiGetDiscussionOne } from "@/lib/api";
 import { setUpdateDiscussion } from "@/lib/discussionUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 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 { Pressable, SafeAreaView, ScrollView, View } from "react-native";
+import { 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 }>();
    const { token, decryptToken } = useAuthSession();
    const [data, setData] = useState("");
@@ -51,49 +31,30 @@ 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({ id: detail, user: hasil, cat: "data" });
+         const response = await apiGetDiscussionOne({
-         const response2 = await apiGetDiscussionOne({ id: detail, user: hasil, cat: "file" });
+            id: detail,
-         setData(response.data.desc);
+            user: hasil,
+            cat: "data",
+         });
+         const response2 = await apiGetDiscussionOne({
+            id: detail,
+            user: hasil,
+            cat: "file",
+         });
          setDataFile(response2.data);
+         setData(response.data.desc);
       } catch (error) {
          console.error(error);
       }
    }
 
-   useEffect(() => { handleLoad() }, []);
+   useEffect(() => {
-
+      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 {
@@ -101,29 +62,92 @@ 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}`, { uri: fileForm[i].uri, type: 'application/octet-stream', name: fileForm[i].name } as any);
+            fd.append(`file${i}`, {
+               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) {
+      } catch (error) {
          console.error(error);
-         Toast.show({ type: 'small', text1: error?.response?.data?.message || "Gagal mengubah data" })
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
       } finally {
          setLoading(false)
       }
    }
 
+   const pickDocumentAsync = async () => {
+      let result = await DocumentPicker.getDocumentAsync({
+         type: ["*/*"],
+         multiple: true
+      });
+      if (!result.canceled) {
+         for (let i = 0; i < result.assets?.length; i++) {
+            if (result.assets[i].uri) {
+               setFileForm((prev) => [...prev, result.assets[i]])
+            }
+         }
+      }
+   };
+
+
+
+   function deleteFile(index: number | 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={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <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"
@@ -133,16 +157,18 @@ export default function DiscussionDivisionEdit() {
                         <ButtonSaveHeader
                            disable={data == "" || loading}
                            category="update"
-                           onPress={() => handleUpdate()}
+                           onPress={() => {
+                              handleUpdate();
+                           }}
                         />
                      }
                   />
                )
             }}
          />
-         {loading && <LoadingCenter />}
+         <LoadingOverlay visible={loading} />
-         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100, Styles.flex1, { backgroundColor: colors.background }]}>
+         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100]}>
-            <View style={Styles.p15}>
+            <View style={[Styles.p15]}>
                <InputForm
                   label="Diskusi"
                   type="default"
@@ -151,90 +177,54 @@ export default function DiscussionDivisionEdit() {
                   value={data}
                   onChange={setData}
                   multiline
-                  bg={colors.card}
                />
 
-               {/* File */}
+               <ButtonSelect value="Upload File" onPress={pickDocumentAsync} />
-               <View style={[Styles.wrapPaper, Styles.mb15, Styles.sectionCard,
+               {
-                  { backgroundColor: colors.card, borderColor: colors.icon + '18' }]}>
+                  (fileForm.length > 0 || dataFile.filter((val) => !val.delete).length > 0)
-                  <Pressable
+                  &&
-                     onPress={pickDocumentAsync}
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
-                     style={[Styles.sectionActionRow, { marginBottom: totalFiles > 0 ? 12 : 0 }]}
+                     <Text style={[Styles.textDefaultSemiBold]}>File</Text>
-                  >
+                     {
-                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.icon + '15' }]}>
+                        dataFile.filter((val) => !val.delete).map((item, index) => (
-                        <MaterialCommunityIcons name="paperclip" size={18} color={colors.dimmed} />
+                           <BorderBottomItem
-                     </View>
+                              key={index}
-                     <View style={Styles.flex1}>
+                              borderType={(fileForm.length + dataFile.length) > 1 ? "bottom" : "none"}
-                        <Text style={[Styles.textDefaultSemiBold, { color: colors.text }]}>File</Text>
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
-                        {totalFiles === 0 && (
+                              title={item.name + '.' + item.extension}
-                           <Text style={[Styles.textMediumNormal, { color: colors.dimmed }]}>Opsional — ketuk untuk upload</Text>
+                              titleWeight="normal"
-                        )}
+                              onPress={() => { setIndexDelFile({ id: item.id, cat: "oldFile" }); setModalFile(true) }}
-                     </View>
+                           />
-                     {totalFiles > 0 && (
+                        ))
-                        <View style={[Styles.sectionBadge, { backgroundColor: colors.dimmed + '18' }]}>
+                     }
-                           <Text style={[Styles.textSmallSemiBold, { color: colors.dimmed }]}>{totalFiles} file</Text>
+                     {
-                        </View>
+                        fileForm.map((item, index) => (
-                     )}
+                           <BorderBottomItem
-                     <MaterialCommunityIcons name="chevron-right" size={18} color={colors.dimmed} />
+                              key={index}
-                  </Pressable>
+                              borderType={fileForm.length > 1 ? "bottom" : "none"}
-                  {totalFiles > 0 && (
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
-                     <View style={Styles.fileGrid}>
+                              title={item.name}
-                        {visibleOldFiles.map((item, index) => {
+                              titleWeight="normal"
-                           const ext = item.extension.toLowerCase()
+                              onPress={() => { setIndexDelFile({ id: index, cat: "newFile" }); setModalFile(true) }}
-                           const iconName = getFileIcon(ext)
+                           />
-                           const iconColor = getFileColor(ext)
+                        ))
-                           return (
+                     }
-                              <Pressable
+                  </View>
-                                 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} />
-                                 </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>
             </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} />}
+                  icon={<Ionicons name="trash" color="black" 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/[detail]/index.tsx

@@ -1,11 +1,13 @@
+import AlertKonfirmasi from "@/components/alertKonfirmasi";
 import AppHeader from "@/components/AppHeader";
+import BorderBottomItem from "@/components/borderBottomItem";
 import BorderBottomItem2 from "@/components/borderBottomItem2";
 import HeaderRightDiscussionDetail from "@/components/discussion/headerDiscussionDetail";
 import DrawerBottom from "@/components/drawerBottom";
 import ImageUser from "@/components/imageNew";
 import { InputForm } from "@/components/inputForm";
+import LabelStatus from "@/components/labelStatus";
 import MenuItemRow from "@/components/menuItemRow";
-import ModalConfirmation from "@/components/ModalConfirmation";
 import Skeleton from "@/components/skeleton";
 import SkeletonContent from "@/components/skeletonContent";
 import Text from "@/components/Text";
@@ -21,8 +23,7 @@ import {
 } from "@/lib/api";
 import { getDB } from "@/lib/firebaseDatabase";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
+import { Feather, Ionicons, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons";
-import { Feather, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons";
 import { ref } from "@react-native-firebase/database";
 import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack, useLocalSearchParams } from "expo-router";
@@ -63,7 +64,6 @@ type PropsFile = {
 }
 
 export default function DiscussionDetail() {
-   const { colors } = useTheme();
    const { id, detail } = useLocalSearchParams<{ id: string; detail: string }>();
    const [data, setData] = useState<Props>();
    const [dataComment, setDataComment] = useState<PropsComment[]>([]);
@@ -85,15 +85,23 @@ export default function DiscussionDetail() {
    const [detailMore, setDetailMore] = useState<any>([])
    const entities = useSelector((state: any) => state.entities)
    const [isVisible, setVisible] = useState(false)
-   const [selectKomentar, setSelectKomentar] = useState({ id: '', comment: '' })
+   const [selectKomentar, setSelectKomentar] = useState({
+      id: '',
+      comment: ''
+   })
    const [viewEdit, setViewEdit] = useState(false)
-   const [showDeleteModal, setShowDeleteModal] = useState(false)
+
+
 
    useEffect(() => {
       const onValueChange = reference.on('value', snapshot => {
-         if (snapshot.val() == null) { reference.set({ trigger: true }) }
+         if (snapshot.val() == null) {
+            reference.set({ trigger: true })
+         }
          handleLoadComment(false)
       });
+
+      // Stop listening for updates when no longer required
       return () => reference.off('value', onValueChange);
    }, []);
 
@@ -104,12 +112,23 @@ export default function DiscussionDetail() {
       });
    }
 
+
    async function handleLoad(loading: boolean) {
       try {
          setLoading(loading)
          const hasil = await decryptToken(String(token?.current));
-         const response = await apiGetDiscussionOne({ id: detail, user: hasil, cat: "data" });
+         const response = await apiGetDiscussionOne({
-         const responseFile = await apiGetDiscussionOne({ id: detail, user: hasil, cat: "file" });
+            id: detail,
+            user: hasil,
+            cat: "data",
+         });
+
+         const responseFile = await apiGetDiscussionOne({
+            id: detail,
+            user: hasil,
+            cat: "file",
+         });
+
          setData(response.data);
          setFileDiscussion(responseFile.data)
          setIsCreator(response.data.createdBy == hasil);
@@ -124,7 +143,11 @@ export default function DiscussionDetail() {
       try {
          setLoadingKomentar(loading)
          const hasil = await decryptToken(String(token?.current));
-         const response = await apiGetDiscussionOne({ id: detail, user: hasil, cat: "comment" });
+         const response = await apiGetDiscussionOne({
+            id: detail,
+            user: hasil,
+            cat: "comment",
+         });
          setDataComment(response.data);
       } catch (error) {
          console.error(error);
@@ -136,8 +159,17 @@ export default function DiscussionDetail() {
    async function handleCheckMember() {
       try {
          const hasil = await decryptToken(String(token?.current));
-         const response = await apiGetDivisionOneFeature({ id, user: hasil, cat: "check-member" });
+         const response = await apiGetDivisionOneFeature({
-         const response2 = await apiGetDivisionOneFeature({ id, user: hasil, cat: "check-admin" });
+            id,
+            user: hasil,
+            cat: "check-member",
+         });
+
+         const response2 = await apiGetDivisionOneFeature({
+            id,
+            user: hasil,
+            cat: "check-admin",
+         });
          setIsMemberDivision(response.data);
          setIsAdminDivision(response2.data);
       } catch (error) {
@@ -145,18 +177,30 @@ export default function DiscussionDetail() {
       }
    }
 
-   useEffect(() => { handleLoad(false); }, [update.data]);
+   useEffect(() => {
-   useEffect(() => { handleLoad(true); handleLoadComment(true); handleCheckMember(); }, []);
+      handleLoad(false);
+   }, [update.data]);
+
+   useEffect(() => {
+      handleLoad(true)
+      handleLoadComment(true);
+      handleCheckMember();
+   }, []);
 
    async function handleKomentar() {
       try {
          setLoadingSend(true);
          const hasil = await decryptToken(String(token?.current));
-         const response = await apiSendDiscussionCommentar({ id: detail, data: { comment: komentar, user: hasil } });
+         const response = await apiSendDiscussionCommentar({
-         if (response.success) { setKomentar(""); updateTrigger() }
+            id: detail,
-      } catch (error: any) {
+            data: { comment: komentar, user: hasil },
+         });
+         if (response.success) {
+            setKomentar("")
+            updateTrigger()
+         }
+      } catch (error) {
          console.error(error);
-         Toast.show({ type: 'small', text1: error?.response?.data?.message || "Gagal menambahkan komentar" })
       } finally {
          setLoadingSend(false);
       }
@@ -166,11 +210,17 @@ export default function DiscussionDetail() {
       try {
          setLoadingSend(true);
          const hasil = await decryptToken(String(token?.current));
-         const response = await apiEditDiscussionCommentar({ id: selectKomentar.id, data: { comment: selectKomentar.comment, user: hasil } });
+         const response = await apiEditDiscussionCommentar({
-         if (response.success) { updateTrigger() } else { Toast.show({ type: 'small', text1: response.message }) }
+            id: selectKomentar.id,
-      } catch (error: any) {
+            data: { comment: selectKomentar.comment, user: hasil },
+         });
+         if (response.success) {
+            updateTrigger()
+         } else {
+            Toast.show({ type: 'small', text1: response.message })
+         }
+      } catch (error) {
          console.error(error);
-         Toast.show({ type: 'small', text1: error?.response?.data?.message || "Gagal mengedit komentar" })
       } finally {
          setLoadingSend(false);
          handleViewEditKomentar()
@@ -181,11 +231,17 @@ export default function DiscussionDetail() {
       try {
          setLoadingSend(true);
          const hasil = await decryptToken(String(token?.current));
-         const response = await apiDeleteDiscussionCommentar({ id: selectKomentar.id, data: { user: hasil } });
+         const response = await apiDeleteDiscussionCommentar({
-         if (response.success) { updateTrigger() } else { Toast.show({ type: 'small', text1: response.message }) }
+            id: selectKomentar.id,
-      } catch (error: any) {
+            data: { user: hasil },
+         });
+         if (response.success) {
+            updateTrigger()
+         } else {
+            Toast.show({ type: 'small', text1: response.message })
+         }
+      } catch (error) {
          console.error(error);
-         Toast.show({ type: 'small', text1: error?.response?.data?.message || "Gagal menghapus komentar" })
       } finally {
          setLoadingSend(false)
          setVisible(false)
@@ -197,11 +253,13 @@ export default function DiscussionDetail() {
       setVisible(true)
    }
 
+
    function handleViewEditKomentar() {
       setVisible(false)
       setViewEdit(!viewEdit)
    }
 
+
    const handleRefresh = async () => {
       setRefreshing(true)
       handleLoad(false)
@@ -210,205 +268,288 @@ export default function DiscussionDetail() {
       setRefreshing(false)
    };
 
-   const canWrite = data?.status != 2 && data?.isActive && ((entityUser.role != "user" && entityUser.role != "coadmin") || isMemberDivision)
-   const isOpen = data?.status === 1
-
    return (
       <>
          <Stack.Screen
             options={{
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Diskusi",
                headerTitleAlign: "center",
+               // headerRight: () =>
+               //    (entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision || isCreator ?
+               //       <HeaderRightDiscussionDetail
+               //          id={detail}
+               //          status={data?.status}
+               //          isActive={data?.isActive}
+               //       /> : (<></>)
+               // ,
                header: () => (
                   <AppHeader
                      title="Diskusi"
                      showBack={true}
                      onPressLeft={() => router.back()}
                      right={
-                        ((entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision || isCreator) ?
+                        (entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision || isCreator ?
-                           <HeaderRightDiscussionDetail id={detail} status={data?.status} isActive={data?.isActive} /> : undefined
+                           <HeaderRightDiscussionDetail
+                              id={detail}
+                              status={data?.status}
+                              isActive={data?.isActive}
+                           /> : (<></>)
                      }
                   />
                )
             }}
          />
-         <View style={[Styles.flex1, { backgroundColor: colors.background }]}>
+         <View style={{ flex: 1 }}>
             <ScrollView
-               showsVerticalScrollIndicator={false}
+               refreshControl={
-               refreshControl={<RefreshControl refreshing={refreshing} onRefresh={handleRefresh} tintColor={colors.icon} />}
+                  <RefreshControl
+                     refreshing={refreshing}
+                     onRefresh={handleRefresh}
+                  />
+               }
             >
-               <View style={[Styles.p15]}>
+               <View style={[Styles.p15, Styles.mb100]}>
-                  {loading ? (
+                  {
-                     <SkeletonContent />
+                     loading ?
-                  ) : (
+                        <SkeletonContent />
-                     <BorderBottomItem2
+                        :
-                        dataFile={fileDiscussion}
+                        <BorderBottomItem2
-                        descEllipsize={false}
+                           dataFile={fileDiscussion}
-                        borderType="all"
+                           descEllipsize={false}
-                        bgColor="white"
+                           borderType="bottom"
-                        icon={
+                           icon={
-                           <ImageUser src={`${ConstEnv.url_storage}/files/${data?.user_img}`} size="sm" />
+                              <ImageUser
-                        }
+                                 src={`${ConstEnv.url_storage}/files/${data?.user_img}`}
-                        title={data?.username}
+                                 size="sm"
-                        titleShowAll={true}
+                              />
-                        subtitle={
+                           }
-                           <View style={[Styles.discussionStatusPill, {
+                           title={data?.username}
-                              borderColor: !data?.isActive ? '#F59E0B' : isOpen ? '#10B981' : colors.dimmed + '80',
+                           subtitle={
-                           }]}>
+                              data?.isActive ? (
-                              <Text style={[Styles.discussionStatusText, {
+                                 data?.status == 1 ? (
-                                 color: !data?.isActive ? '#F59E0B' : isOpen ? '#10B981' : colors.dimmed,
+                                    <LabelStatus category="success" text="BUKA" size="small" />
-                              }]}>
+                                 ) : (
-                                 {!data?.isActive ? 'Arsip' : isOpen ? 'Buka' : 'Tutup'}
+                                    <LabelStatus category="error" text="TUTUP" size="small" />
-                              </Text>
-                           </View>
-                        }
-                        desc={data?.desc}
-                        leftBottomInfo={
-                           <View style={Styles.rowItemsCenter}>
-                              <Feather name="message-square" size={14} color={colors.dimmed} style={Styles.mr05} />
-                              <Text style={[Styles.textInformation, { color: colors.dimmed }]}>{dataComment.length} Komentar</Text>
-                           </View>
-                        }
-                        rightBottomInfo={<Text style={[Styles.textInformation, { color: colors.dimmed }]}>{data?.createdAt}</Text>}
-                     />
-                  )}
-
-                  <View style={Styles.mt10}>
-                     {loadingKomentar ? (
-                        arrSkeleton.map((_, i) => (
-                           <Skeleton key={i} width={100} widthType="percent" height={40} borderRadius={5} />
-                        ))
-                     ) : (
-                        dataComment.map((item, i) => (
-                           <Pressable
-                              key={i}
-                              onPress={() => {
-                                 setDetailMore((prev: any) =>
-                                    prev.includes(item.id) ? prev.filter((id: string) => id !== item.id) : [...prev, item.id]
                                  )
-                              }}
+                              ) : (
-                              onLongPress={() => {
+                                 <LabelStatus category="secondary" text="ARSIP" size="small" />
-                                 item.idUser == entities.id && data?.status != 2 && data?.isActive && handleMenuKomentar(item.id, item.comment)
+                              )
-                              }}
+                           }
-                              style={({ pressed }) => [
+                           rightTopInfo={data?.createdAt}
-                                 Styles.discussionCommentCard,
+                           desc={data?.desc}
-                                 { backgroundColor: pressed ? colors.icon + '10' : colors.card, borderColor: colors.icon + '20' }
+                           leftBottomInfo={
-                              ]}
+                              <View style={[Styles.rowItemsCenter]}>
-                           >
+                                 <Ionicons
-                              <View style={Styles.flex1}>
+                                    name="chatbox-ellipses-outline"
-                                 <View style={[Styles.rowSpaceBetween, Styles.itemsCenter, Styles.mb05]}>
+                                    size={18}
-                                    <View style={[Styles.rowItemsCenter, { gap: 8, flex: 1, marginRight: 8 }]}>
+                                    color="grey"
-                                       <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="xs" />
+                                    style={Styles.mr05}
-                                       <Text style={[Styles.textMediumSemiBold, { color: colors.text }]} numberOfLines={1}>
+                                 />
-                                          {item.username}
+                                 <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]} >
-                                       </Text>
+                                    {dataComment.length} Komentar
-                                       {item.isEdited && (
-                                          <Text style={[Styles.discussionEditedText, { color: colors.dimmed }]}>diedit</Text>
-                                       )}
-                                    </View>
-                                    <Text style={[Styles.discussionDateText, { color: colors.dimmed, flexShrink: 0 }]}>
-                                       {item.createdAt}
-                                    </Text>
-                                 </View>
-                                 <Text style={[Styles.textDefault, { color: colors.text }]} numberOfLines={detailMore.includes(item.id) ? 0 : 3}>
-                                    {item.comment}
                                  </Text>
                               </View>
-                           </Pressable>
+                           }
-                        ))
+                        />
-                     )}
+                  }
+
+                  <View style={[Styles.p15]}>
+                     {
+                        loadingKomentar ?
+                           arrSkeleton.map((item, index) => (
+                              <Skeleton key={index} width={100} widthType="percent" height={40} borderRadius={5} />
+                           ))
+                           :
+                           dataComment.map((item, index) => (
+                              <BorderBottomItem
+                                 key={index}
+                                 borderType="bottom"
+                                 colorPress
+                                 icon={
+                                    <ImageUser
+                                       src={`${ConstEnv.url_storage}/files/${item.img}`}
+                                       size="xs"
+                                    />
+                                 }
+                                 title={item.username}
+                                 rightTopInfo={item.createdAt}
+                                 desc={item.comment}
+                                 rightBottomInfo={item.isEdited ? "Edited" : ""}
+                                 descEllipsize={detailMore.includes(item.id) ? false : true}
+                                 onPress={() => {
+                                    setDetailMore((prev: any) => {
+                                       if (prev.includes(item.id)) {
+                                          return prev.filter((id: string) => id !== item.id)
+                                       } else {
+                                          return [...prev, item.id]
+                                       }
+                                    })
+                                 }}
+                                 onLongPress={() => {
+                                    item.idUser == entities.id && data?.status != 2 && data?.isActive && handleMenuKomentar(item.id, item.comment)
+                                 }}
+                              />
+                           ))
+                     }
+
                   </View>
                </View>
             </ScrollView>
-
+            <KeyboardAvoidingView
-            <KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'padding' : undefined} keyboardVerticalOffset={headerHeight}>
+               behavior={Platform.OS === 'ios' ? 'padding' : undefined}
-               <View style={[Styles.contentItemCenter, Styles.w100, { backgroundColor: colors.background }, viewEdit && Styles.borderTop]}>
+               keyboardVerticalOffset={headerHeight}
-                  {viewEdit ? (
+            >
-                     <>
+               <View
-                        <View style={[Styles.w90, Styles.rowSpaceBetween, Styles.pv05]}>
+                  style={[
-                           <View style={Styles.rowItemsCenter}>
+                     Styles.contentItemCenter,
-                              <Feather name="edit-3" color={colors.text} size={22} style={Styles.mh05} />
+                     Styles.w100,
-                              <Text style={Styles.textMediumSemiBold}>Edit Komentar</Text>
+                     { backgroundColor: "#f4f4f4" },
-                           </View>
+                     viewEdit && Styles.borderTop
-                           <Pressable onPress={() => handleViewEditKomentar()}>
+                  ]}
-                              <MaterialIcons name="close" color={colors.text} size={22} />
+               >
-                           </Pressable>
+                  {
-                        </View>
+                     viewEdit ?
-                        <InputForm
+                        <>
-                           bg={colors.card}
+                           <View style={[Styles.w90, Styles.rowSpaceBetween, Styles.pv05]}>
-                           type="default" round multiline
+                              <View style={[Styles.rowItemsCenter]}>
-                           placeholder="Kirim Komentar"
+                                 <Feather name="edit-3" color="black" size={22} style={[Styles.mh05]} />
-                           onChange={(val: string) => setSelectKomentar({ ...selectKomentar, comment: val })}
+                                 <Text style={[Styles.textMediumSemiBold]}>Edit Komentar</Text>
-                           value={selectKomentar.comment}
+                              </View>
-                           itemRight={
+                              <Pressable onPress={() => handleViewEditKomentar()}>
-                              <Pressable
+                                 <MaterialIcons name="close" color="black" size={22} />
-                                 onPress={() => {
-                                    selectKomentar.comment != "" && !regexOnlySpacesOrEnter.test(selectKomentar.comment) && !loadingSend && data?.status != 2 && data?.isActive
-                                       && (((entityUser.role == "user" || entityUser.role == "coadmin") && isMemberDivision) || entityUser.role == "admin" || entityUser.role == "supadmin" || entityUser.role == "developer" || entityUser.role == "cosupadmin")
-                                       && handleEditKomentar();
-                                 }}
-                                 style={[Platform.OS == 'android' && Styles.mb12]}
-                              >
-                                 <MaterialIcons name="send" size={25}
-                                    style={[
-                                       selectKomentar.comment == "" || regexOnlySpacesOrEnter.test(selectKomentar.comment) || loadingSend || ((entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision)
-                                          ? { color: colors.dimmed } : { color: colors.tint },
-                                    ]}
-                                 />
                               </Pressable>
-                           }
+                           </View>
-                        />
+                           <InputForm
-                     </>
+                              bg="white"
-                  ) : canWrite ? (
+                              type="default"
-                     <InputForm
+                              round
-                        type="default" round multiline
+                              multiline
-                        placeholder="Kirim Komentar"
+                              placeholder="Kirim Komentar"
-                        onChange={setKomentar} value={komentar}
+                              onChange={(val: string) => setSelectKomentar({ ...selectKomentar, comment: val })}
-                        itemRight={
+                              value={selectKomentar.comment}
-                           <Pressable
+                              itemRight={
-                              onPress={() => {
+                                 <Pressable
-                                 komentar != "" && !regexOnlySpacesOrEnter.test(komentar) && !loadingSend && data?.status != 2 && data?.isActive
+                                    onPress={() => {
-                                    && (((entityUser.role == "user" || entityUser.role == "coadmin") && isMemberDivision) || entityUser.role == "admin" || entityUser.role == "supadmin" || entityUser.role == "developer" || entityUser.role == "cosupadmin")
+                                       selectKomentar.comment != "" &&
-                                    && handleKomentar();
+                                          !regexOnlySpacesOrEnter.test(selectKomentar.comment) &&
-                              }}
+                                          !loadingSend &&
-                              style={[Platform.OS == 'android' && Styles.mb12]}
+                                          data?.status != 2 &&
-                           >
+                                          data?.isActive &&
-                              <MaterialIcons name="send" size={25}
+                                          (((entityUser.role == "user" ||
-                                 style={[
+                                             entityUser.role == "coadmin") &&
-                                    komentar == "" || regexOnlySpacesOrEnter.test(komentar) || loadingSend || ((entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision)
+                                             isMemberDivision) ||
-                                       ? { color: colors.dimmed } : { color: colors.tint },
+                                             entityUser.role == "admin" ||
-                                 ]}
+                                             entityUser.role == "supadmin" ||
-                              />
+                                             entityUser.role == "developer" ||
-                           </Pressable>
+                                             entityUser.role == "cosupadmin") &&
-                        }
+                                          handleEditKomentar();
-                     />
+                                    }}
-                  ) : (
+                                    style={[
-                     <View style={[Styles.pv20, Styles.itemsCenter]}>
+                                       Platform.OS == 'android' && Styles.mb12,
-                        <Text style={[Styles.textInformation, { color: colors.dimmed }]}>
+                                    ]}
-                           {data?.status == 2 ? "Diskusi telah ditutup" : data?.isActive == false ? "Diskusi telah diarsipkan" : "Hanya anggota divisi yang dapat memberikan komentar"}
+                                 >
-                        </Text>
+                                    <MaterialIcons
-                     </View>
+                                       name="send"
-                  )}
+                                       size={25}
+                                       style={
+                                          [selectKomentar.comment == "" || regexOnlySpacesOrEnter.test(selectKomentar.comment) || loadingSend || ((entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision)
+                                             ? Styles.cGray
+                                             : Styles.cDefault,
+                                          ]
+                                       }
+                                    />
+                                 </Pressable>
+                              }
+                           />
+                        </>
+                        :
+                        data?.status != 2 && data?.isActive && ((entityUser.role != "user" && entityUser.role != "coadmin") ||
+                           isMemberDivision)
+                           ?
+                           <InputForm
+                              bg="white"
+                              type="default"
+                              round
+                              multiline
+                              placeholder="Kirim Komentar"
+                              onChange={setKomentar}
+                              value={komentar}
+                              itemRight={
+                                 <Pressable
+                                    onPress={() => {
+                                       komentar != "" &&
+                                          !regexOnlySpacesOrEnter.test(komentar) &&
+                                          !loadingSend &&
+                                          data?.status != 2 &&
+                                          data?.isActive &&
+                                          (((entityUser.role == "user" ||
+                                             entityUser.role == "coadmin") &&
+                                             isMemberDivision) ||
+                                             entityUser.role == "admin" ||
+                                             entityUser.role == "supadmin" ||
+                                             entityUser.role == "developer" ||
+                                             entityUser.role == "cosupadmin") &&
+                                          handleKomentar();
+                                    }}
+                                    style={[
+                                       Platform.OS == 'android' && Styles.mb12,
+                                    ]}
+                                 >
+                                    <MaterialIcons
+                                       name="send"
+                                       size={25}
+                                       style={
+                                          [komentar == "" || regexOnlySpacesOrEnter.test(komentar) || loadingSend || ((entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision)
+                                             ? Styles.cGray
+                                             : Styles.cDefault,
+                                          ]
+                                       }
+                                    />
+                                 </Pressable>
+                              }
+                           />
+                           :
+                           <View style={[Styles.pv20, { alignItems: 'center' }]}>
+                              <Text style={[Styles.textInformation, Styles.cGray]}>
+                                 {
+                                    data?.status == 2 ? "Diskusi telah ditutup" : data?.isActive == false ? "Diskusi telah diarsipkan" : "Hanya anggota divisi yang dapat memberikan komentar"
+                                 }
+                              </Text>
+                           </View>
+                  }
+
                </View>
             </KeyboardAvoidingView>
          </View>
-
          <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Komentar">
             <View style={Styles.rowItemsCenter}>
-               <MenuItemRow icon={<MaterialCommunityIcons name="pencil-outline" color={colors.text} size={25} />} title="Edit" onPress={() => handleViewEditKomentar()} />
+               <MenuItemRow
-               <MenuItemRow icon={<MaterialIcons name="delete-outline" color={colors.text} size={25} />} title="Hapus" onPress={() => { setVisible(false); setTimeout(() => setShowDeleteModal(true), 600) }} />
+                  icon={<MaterialCommunityIcons name="pencil-outline" color="black" size={25} />}
+                  title="Edit"
+                  onPress={() => { handleViewEditKomentar() }}
+               />
+               <MenuItemRow
+                  icon={<MaterialIcons name="delete" color="black" size={25} />}
+                  title="Hapus"
+                  onPress={() => {
+                     AlertKonfirmasi({
+                        title: 'Konfirmasi',
+                        desc: 'Apakah anda yakin ingin menghapus komentar?',
+                        onPress: () => {
+                           handleDeleteKomentar()
+                        }
+                     })
+                  }}
+               />
             </View>
          </DrawerBottom>
-
-         <ModalConfirmation
-            visible={showDeleteModal}
-            title="Konfirmasi"
-            message="Apakah anda yakin ingin menghapus komentar?"
-            onConfirm={() => { setShowDeleteModal(false); handleDeleteKomentar() }}
-            onCancel={() => setShowDeleteModal(false)}
-            confirmText="Hapus"
-            cancelText="Batal"
-         />
       </>
    );
 }

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

@@ -1,45 +1,26 @@
 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"
+import LoadingOverlay from "@/components/loadingOverlay"
 import MenuItemRow from "@/components/menuItemRow"
 import Text from "@/components/Text"
 import Styles from "@/constants/Styles"
 import { apiCreateDiscussion } from "@/lib/api"
 import { setUpdateDiscussion } from "@/lib/discussionUpdate"
 import { useAuthSession } from "@/providers/AuthProvider"
-import { useTheme } from "@/providers/ThemeProvider"
 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 { Pressable, SafeAreaView, ScrollView, View } from "react-native"
+import { 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();
    const { id } = useLocalSearchParams<{ id: string }>()
    const [desc, setDesc] = useState('')
    const { token, decryptToken } = useAuthSession()
@@ -51,55 +32,74 @@ export default function CreateDiscussionDivision() {
    const [indexDelFile, setIndexDelFile] = useState<number>(0)
 
    const pickDocumentAsync = async () => {
-      const result = await DocumentPicker.getDocumentAsync({ type: ["*/*"], multiple: true });
+      let result = await DocumentPicker.getDocumentAsync({
+         type: ["*/*"],
+         multiple: true
+      });
       if (!result.canceled) {
-         let skipped = 0
+         for (let i = 0; i < result.assets?.length; i++) {
-         for (const asset of result.assets) {
+            if (result.assets[i].uri) {
-            if (!asset.uri) continue
+               setFileForm((prev) => [...prev, result.assets[i]])
-            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((_, i) => i !== index))
+      setFileForm([...fileForm.filter((val, 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}`, { uri: fileForm[i].uri, type: 'application/octet-stream', name: fileForm[i].name } as any);
+            fd.append(`file${i}`, {
+               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) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         Toast.show({ type: 'small', text1: error?.response?.data?.message || "Gagal menambahkan data" })
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
       } finally {
          setLoading(false)
       }
    }
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <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"
@@ -109,15 +109,16 @@ export default function CreateDiscussionDivision() {
                         <ButtonSaveHeader
                            disable={desc == "" || loading}
                            category="create"
-                           onPress={() => handleCreate()}
+                           onPress={() => {
-                        />
+                              handleCreate()
+                           }} />
                      }
                   />
                )
             }}
          />
-         {loading && <LoadingCenter />}
+         <LoadingOverlay visible={loading} />
-         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100, Styles.flex1, { backgroundColor: colors.background }]}>
+         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100]}>
             <View style={[Styles.p15, Styles.mb100]}>
                <InputForm
                   label="Diskusi"
@@ -126,70 +127,39 @@ export default function CreateDiscussionDivision() {
                   required
                   onChange={setDesc}
                   multiline
-                  bg={colors.card}
                />
-
+               <ButtonSelect value="Upload File" onPress={pickDocumentAsync} />
-               {/* File */}
+               {
-               <View style={[Styles.wrapPaper, Styles.mb15, Styles.sectionCard,
+                  fileForm.length > 0
-                  { backgroundColor: colors.card, borderColor: colors.icon + '18' }]}>
+                  &&
-                  <Pressable
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
-                     onPress={pickDocumentAsync}
+                     <Text style={[Styles.textDefaultSemiBold]}>File</Text>
-                     style={[Styles.sectionActionRow, { marginBottom: fileForm.length > 0 ? 12 : 0 }]}
+                     {
-                  >
+                        fileForm.map((item, index) => (
-                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.icon + '15' }]}>
+                           <BorderBottomItem
-                        <MaterialCommunityIcons name="paperclip" size={18} color={colors.dimmed} />
+                              key={index}
-                     </View>
+                              borderType={fileForm.length > 1 ? "bottom" : "none"}
-                     <View style={Styles.flex1}>
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
-                        <Text style={[Styles.textDefaultSemiBold, { color: colors.text }]}>File</Text>
+                              title={item.name}
-                        {fileForm.length === 0 && (
+                              titleWeight="normal"
-                           <Text style={[Styles.textMediumNormal, { color: colors.dimmed }]}>Opsional — ketuk untuk upload</Text>
+                              onPress={() => { setIndexDelFile(index); setModalFile(true) }}
-                        )}
+                           />
-                     </View>
+                        ))
-                     {fileForm.length > 0 && (
+                     }
-                        <View style={[Styles.sectionBadge, { backgroundColor: colors.dimmed + '18' }]}>
+                  </View>
-                           <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>
 
          <DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
+                  icon={<Ionicons name="trash" color="black" size={25} />}
                   title="Hapus"
-                  onPress={() => deleteFile(indexDelFile)}
+                  onPress={() => { deleteFile(indexDelFile) }}
                />
             </View>
          </DrawerBottom>
       </SafeAreaView>
    )
-}
+}

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

@@ -1,23 +1,21 @@
-import GuideOverlay from "@/components/GuideOverlay";
+import BorderBottomItem from "@/components/borderBottomItem";
 import ButtonTab from "@/components/buttonTab";
 import ImageUser from "@/components/imageNew";
 import InputSearch from "@/components/inputSearch";
+import LabelStatus from "@/components/labelStatus";
 import SkeletonContent from "@/components/skeletonContent";
 import Text from "@/components/Text";
-import WrapTab from "@/components/wrapTab";
 import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiGetDiscussion, apiGetDivisionOneFeature } from "@/lib/api";
-import { GUIDE_DIVISION_DISCUSSION } from "@/lib/guideSteps";
-import { useGuide } from "@/lib/useGuide";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
+import { AntDesign, Feather, Ionicons } from "@expo/vector-icons";
-import { AntDesign, Feather } from "@expo/vector-icons";
 import { router, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { FlatList, Pressable, RefreshControl, View } from "react-native";
+import { RefreshControl, View, VirtualizedList } from "react-native";
 import { useSelector } from "react-redux";
 
+
 type Props = {
    id: string,
    title: string,
@@ -30,8 +28,8 @@ type Props = {
    isActive: boolean
 }
 
+
 export default function DiscussionDivision() {
-   const { colors } = useTheme();
    const { id, active } = useLocalSearchParams<{ id: string, active?: string }>()
    const [data, setData] = useState<Props[]>([])
    const { token, decryptToken } = useAuthSession()
@@ -46,13 +44,21 @@ export default function DiscussionDivision() {
    const [isMemberDivision, setIsMemberDivision] = useState(false)
    const [isAdminDivision, setIsAdminDivision] = useState(false)
    const entityUser = useSelector((state: any) => state.user)
-   const { visible: guideVisible, dismiss: dismissGuide } = useGuide('division-discussion')
 
    async function handleCheckMember() {
       try {
          const hasil = await decryptToken(String(token?.current));
-         const response = await apiGetDivisionOneFeature({ id, user: hasil, cat: "check-member" });
+         const response = await apiGetDivisionOneFeature({
-         const response2 = await apiGetDivisionOneFeature({ id, user: hasil, cat: "check-admin" });
+            id,
+            user: hasil,
+            cat: "check-member",
+         });
+
+         const response2 = await apiGetDivisionOneFeature({
+            id,
+            user: hasil,
+            cat: "check-admin",
+         });
          setIsMemberDivision(response.data);
          setIsAdminDivision(response2.data);
       } catch (error) {
@@ -71,6 +77,8 @@ export default function DiscussionDivision() {
             setData(response.data)
          } else if (thisPage > 1 && response.data.length > 0) {
             setData([...data, ...response.data])
+         } else {
+            return;
          }
       } catch (error) {
          console.error(error)
@@ -80,15 +88,26 @@ export default function DiscussionDivision() {
       }
    }
 
-   useEffect(() => { handleLoad(false, 1) }, [update.data])
+   useEffect(() => {
-   useEffect(() => { handleLoad(true, 1) }, [status, search])
+      handleLoad(false, 1)
-   useEffect(() => { handleCheckMember() }, [])
+   }, [update.data])
+
+
+   useEffect(() => {
+      handleLoad(true, 1)
+   }, [status, search])
 
    const loadMoreData = () => {
       if (waiting) return
-      setTimeout(() => { handleLoad(false, page + 1) }, 1000);
+      setTimeout(() => {
+         handleLoad(false, page + 1)
+      }, 1000);
    }
 
+   useEffect(() => {
+      handleCheckMember()
+   }, [])
+
    const handleRefresh = async () => {
       setRefreshing(true)
       handleLoad(false, 1)
@@ -96,115 +115,98 @@ export default function DiscussionDivision() {
       setRefreshing(false)
    };
 
-   const isOpen = (item: Props) => item.status === 1
+   const getItem = (_data: unknown, index: number): Props => ({
-
+      id: data[index].id,
-   const themed = {
+      title: data[index].title,
-      background:       { backgroundColor: colors.background },
+      desc: data[index].desc,
-      card:             { backgroundColor: colors.card, borderColor: colors.icon + '20' },
+      status: data[index].status,
-      cardPressed:      { backgroundColor: colors.icon + '10' },
+      user_name: data[index].user_name,
-      title:            { color: colors.text },
+      img: data[index].img,
-      dimmed:           { color: colors.dimmed },
+      total_komentar: data[index].total_komentar,
-      statusOpen:       { borderColor: '#10B981' as const },
+      createdAt: data[index].createdAt,
-      statusClosed:     { borderColor: colors.dimmed + '80' },
+      isActive: data[index].isActive,
-      statusTextOpen:   { color: '#10B981' as const },
+   })
-      statusTextClosed: { color: colors.dimmed },
-   }
 
    return (
-      <View style={[Styles.flex1, themed.background]}>
+      <View style={[Styles.p15, { flex: 1 }]}>
-         <GuideOverlay visible={guideVisible} steps={GUIDE_DIVISION_DISCUSSION} onDismiss={dismissGuide} />
+         {
-         {((entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision) && (
+            ((entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision) &&
-            <View style={[Styles.ph15, Styles.discussionHeaderPadding]}>
+            <View>
-               <WrapTab>
+               <View style={[Styles.wrapBtnTab]}>
                   <ButtonTab
                      active={status == "false" ? "false" : "true"}
                      value="true"
-                     onPress={() => setStatus("true")}
+                     onPress={() => { setStatus("true") }}
                      label="Aktif"
-                     icon={<Feather name="check-circle" color={status == "false" ? colors.dimmed : 'white'} size={20} />}
+                     icon={<Feather name="check-circle" color={status == "false" ? 'black' : 'white'} size={20} />}
-                     n={2}
+                     n={2} />
-                  />
                   <ButtonTab
                      active={status == "false" ? "false" : "true"}
                      value="false"
-                     onPress={() => setStatus("false")}
+                     onPress={() => { setStatus("false") }}
                      label="Arsip"
-                     icon={<AntDesign name="closecircleo" color={status == "true" ? colors.dimmed : 'white'} size={20} />}
+                     icon={<AntDesign name="closecircleo" color={status == "true" ? 'black' : 'white'} size={20} />}
-                     n={2}
+                     n={2} />
-                  />
+               </View>
-               </WrapTab>
                <InputSearch onChange={setSearch} />
             </View>
-         )}
+         }
 
-         <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, Styles.discussionEmptyText, themed.dimmed]}>
-                     Tidak ada diskusi
-                  </Text>
-               </View>
-            ) : (
-               <FlatList
-                  data={data}
-                  keyExtractor={(_, i) => String(i)}
-                  showsVerticalScrollIndicator={false}
-                  onEndReached={loadMoreData}
-                  onEndReachedThreshold={0.5}
-                  refreshControl={
-                     <RefreshControl refreshing={refreshing} onRefresh={handleRefresh} tintColor={colors.icon} />
-                  }
-                  ItemSeparatorComponent={() => <View style={Styles.discussionSeparator} />}
-                  renderItem={({ item }: { item: Props }) => (
-                     <Pressable
-                        onPress={() => router.push(`./discussion/${item.id}`)}
-                        style={({ pressed }) => [
-                           Styles.discussionCard,
-                           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, Styles.discussionTitleCol]}>
-                              <Text style={[Styles.textDefaultSemiBold, themed.title]} numberOfLines={1}>
-                                 {item.user_name}
-                              </Text>
-                              {status === "true" && (
-                                 <View style={[Styles.discussionStatusPill, isOpen(item) ? themed.statusOpen : themed.statusClosed]}>
-                                    <Text style={[Styles.discussionStatusText, isOpen(item) ? themed.statusTextOpen : themed.statusTextClosed]}>
-                                       {isOpen(item) ? 'Buka' : 'Tutup'}
-                                    </Text>
-                                 </View>
-                              )}
-                           </View>
-                        </View>
 
-                        {item.desc ? (
+         <View style={[{ flex: 2 }, Styles.mt05]}>
-                           <Text style={[Styles.textMediumNormal, Styles.discussionCardIndent, Styles.discussionDescMargin, themed.title]} numberOfLines={2}>
+            {
-                              {item.desc}
+               loading ?
-                           </Text>
+                  arrSkeleton.map((item: any, i: number) => {
-                        ) : null}
+                     return (
-
+                        <SkeletonContent key={i} />
-                        <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, themed.dimmed]}>
+                  data.length > 0 ?
-                                 {item.total_komentar} Komentar
+                     <VirtualizedList
-                              </Text>
+                        data={data}
-                           </View>
+                        getItemCount={() => data.length}
-                           <Text style={[Styles.discussionDateText, themed.dimmed]}>
+                        getItem={getItem}
-                              {item.createdAt}
+                        renderItem={({ item, index }: { item: Props, index: number }) => {
-                           </Text>
+                           return (
-                        </View>
+                              <BorderBottomItem
-                     </Pressable>
+                                 key={index}
-                  )}
+                                 onPress={() => { router.push(`./discussion/${item.id}`) }}
-               />
+                                 borderType="bottom"
-            )}
+                                 icon={
+                                    <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="sm" />
+                                 }
+                                 title={item.user_name}
+                                 subtitle={
+                                    status == "true" ? item.status == 1 ? <LabelStatus category='success' text='BUKA' size="small" /> : <LabelStatus category='error' text='TUTUP' size="small" /> : <></>
+                                 }
+                                 rightTopInfo={item.createdAt}
+                                 desc={item.desc}
+                                 leftBottomInfo={
+                                    <View style={[Styles.rowItemsCenter]}>
+                                       <Ionicons name="chatbox-ellipses-outline" size={18} color="grey" style={Styles.mr05} />
+                                       <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>Diskusikan</Text>
+                                    </View>
+                                 }
+                                 rightBottomInfo={item.total_komentar + ' Komentar'}
+                              />
+                           )
+                        }}
+                        keyExtractor={(item, index) => String(index)}
+                        onEndReached={loadMoreData}
+                        onEndReachedThreshold={0.5}
+                        showsVerticalScrollIndicator={false}
+                        refreshControl={
+                           <RefreshControl
+                              refreshing={refreshing}
+                              onRefresh={handleRefresh}
+                           />
+                        }
+                     />
+                     :
+                     (<Text style={[Styles.textDefault, Styles.cGray, Styles.mv10, { textAlign: "center" }]}>Tidak ada diskusi</Text>)
+            }
          </View>
       </View>
    );
-}
+}

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

@@ -1,5 +1,4 @@
-import GuideOverlay from "@/components/GuideOverlay";
+import AlertKonfirmasi from "@/components/alertKonfirmasi";
-import ModalConfirmation from "@/components/ModalConfirmation";
 import AppHeader from "@/components/AppHeader";
 import { ButtonHeader } from "@/components/buttonHeader";
 import HeaderRightDocument from "@/components/document/headerDocument";
@@ -13,6 +12,7 @@ import ModalLoading from "@/components/modalLoading";
 import ModalSelectMultiple from "@/components/modalSelectMultiple";
 import Skeleton from "@/components/skeleton";
 import Text from "@/components/Text";
+import { ColorsStatus } from "@/constants/ColorsStatus";
 import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import {
@@ -23,10 +23,7 @@ import {
    apiShareDocument,
 } from "@/lib/api";
 import { setUpdateDokumen } from "@/lib/dokumenUpdate";
-import { GUIDE_DIVISION_DOCUMENT } from "@/lib/guideSteps";
-import { useGuide } from "@/lib/useGuide";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import {
    AntDesign,
    MaterialCommunityIcons,
@@ -69,7 +66,6 @@ type PropsPath = {
 };
 
 export default function DocumentDivision() {
-   const { colors } = useTheme();
    const [loadingRename, setLoadingRename] = useState(false)
    const [isShare, setShare] = useState(false)
    const { token, decryptToken } = useAuthSession()
@@ -92,8 +88,6 @@ export default function DocumentDivision() {
    const [loadingOpen, setLoadingOpen] = useState(false)
    const [isMemberDivision, setIsMemberDivision] = useState(false)
    const entityUser = useSelector((state: any) => state.user)
-   const [showDeleteModal, setShowDeleteModal] = useState(false)
-   const { visible: guideVisible, dismiss: dismissGuide } = useGuide('division-document')
    const [bodyRename, setBodyRename] = useState({
       id: "",
       name: "",
@@ -239,11 +233,9 @@ export default function DocumentDivision() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error : any ) {
+      } catch (error) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal mengubah nama"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoadingRename(false)
          setRename(false)
@@ -264,11 +256,9 @@ export default function DocumentDivision() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error : any ) {
+      } catch (error) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal menghapus"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       }
    }
 
@@ -292,11 +282,9 @@ export default function DocumentDivision() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error : any ) {
+      } catch (error) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal membagikan"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setShare(false);
       }
@@ -346,7 +334,7 @@ export default function DocumentDivision() {
    }, [path]);
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView style={{ flex: 1 }}>
          <Stack.Screen
             options={{
                // headerLeft: () =>
@@ -392,7 +380,7 @@ export default function DocumentDivision() {
                      showBack={(selectedFiles.length > 0 || dariSelectAll) ? false : true}
                      left={
                         <ButtonHeader
-                           item={<MaterialIcons name="close" size={25} color="white" />}
+                           item={<MaterialIcons name="close" size={20} color="white" />}
                            onPress={() => {
                               handleBatal();
                            }}
@@ -405,7 +393,7 @@ export default function DocumentDivision() {
                         selectedFiles.length > 0 || dariSelectAll ? (
                            <ButtonHeader
                               item={
-                                 <MaterialIcons name="checklist-rtl" size={25} color="white" />
+                                 <MaterialIcons name="checklist-rtl" size={20} color="white" />
                               }
                               onPress={() => {
                                  handleSelectAll();
@@ -419,14 +407,12 @@ export default function DocumentDivision() {
                )
             }}
          />
-         <GuideOverlay visible={guideVisible} steps={GUIDE_DIVISION_DOCUMENT} onDismiss={dismissGuide} />
          <ModalLoading isVisible={loadingOpen} setVisible={setLoadingOpen} />
          <ScrollView
             refreshControl={
                <RefreshControl
                   refreshing={refreshing}
                   onRefresh={handleRefresh}
-                  tintColor={colors.icon}
                />
             }>
             <View style={[Styles.p15, Styles.mb100]}>
@@ -441,9 +427,9 @@ export default function DocumentDivision() {
                            }}
                         >
                            {item.id != "home" && (
-                              <AntDesign name="right" style={[Styles.mh05, Styles.mt02]} color={colors.text} />
+                              <AntDesign name="right" style={[Styles.mh05, Styles.mt02]} color="black" />
                            )}
-                           <Text style={{ color: colors.text }}> {item.name} </Text>
+                           <Text> {item.name} </Text>
                         </Pressable>
                      ))
                   }
@@ -492,7 +478,14 @@ export default function DocumentDivision() {
                               );
                            })
                         ) : (
-                           <Text style={[Styles.textDefault, Styles.mt15, { textAlign: "center", color: colors.dimmed }]} >
+                           <Text
+                              style={[
+                                 Styles.textDefault,
+                                 Styles.cGray,
+                                 Styles.mt15,
+                                 { textAlign: "center" },
+                              ]}
+                           >
                               Tidak ada dokumen
                            </Text>
                         )}
@@ -500,7 +493,7 @@ export default function DocumentDivision() {
             </View>
          </ScrollView>
          {(selectedFiles.length > 0 || dariSelectAll) && (
-            <View style={[Styles.bottomMenuSelectDocument, { backgroundColor: colors.header }]}>
+            <View style={[ColorsStatus.primary, Styles.bottomMenuSelectDocument]}>
                <View style={[Styles.rowItemsCenter, { justifyContent: "center" }]}>
                   <MenuItemRow
                      icon={
@@ -512,7 +505,13 @@ export default function DocumentDivision() {
                      }
                      title="Hapus"
                      onPress={() => {
-                        setShowDeleteModal(true)
+                        AlertKonfirmasi({
+                           title: "Konfirmasi",
+                           desc: "Apakah anda yakin ingin menghapus dokumen?",
+                           onPress: () => {
+                              handleDelete();
+                           },
+                        });
                      }}
                      column="many"
                      color="white"
@@ -619,19 +618,6 @@ export default function DocumentDivision() {
             value={id}
             item={selectedFiles[0]?.id}
          />
-
-         <ModalConfirmation
-            visible={showDeleteModal}
-            title="Konfirmasi"
-            message="Apakah anda yakin ingin menghapus dokumen?"
-            onConfirm={() => {
-               setShowDeleteModal(false)
-               handleDelete()
-            }}
-            onCancel={() => setShowDeleteModal(false)}
-            confirmText="Hapus"
-            cancelText="Batal"
-         />
       </SafeAreaView>
    );
 }

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

@@ -9,7 +9,6 @@ import Styles from "@/constants/Styles";
 import { apiAddFileTask, apiCheckFileTask } from "@/lib/api";
 import { setUpdateTask } from "@/lib/taskUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
 import * as DocumentPicker from "expo-document-picker";
 import { router, Stack, useLocalSearchParams } from "expo-router";
@@ -24,7 +23,6 @@ import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function TaskDivisionAddFile() {
-   const { colors } = useTheme();
    const { id, detail } = useLocalSearchParams<{ id: string; detail: string }>();
    const [fileForm, setFileForm] = useState<any[]>([]);
    const [listFile, setListFile] = useState<any[]>([]);
@@ -120,18 +118,16 @@ export default function TaskDivisionAddFile() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error : any ) {
+      } catch (error) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal menambahkan file"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
    }
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => (
@@ -173,13 +169,13 @@ export default function TaskDivisionAddFile() {
                   listFile.length > 0 && (
                      <View style={[Styles.mb15]}>
                         <Text style={[Styles.textDefaultSemiBold, Styles.mv05]}>File</Text>
-                        <View style={[Styles.wrapPaper, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                        <View style={[Styles.wrapPaper]}>
                            {
                               listFile.map((item, index) => (
                                  <BorderBottomItem
                                     key={index}
                                     borderType="all"
-                                    icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
+                                    icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
                                     title={item}
                                     titleWeight="normal"
                                     onPress={() => { setIndexDelFile(index); setModal(true) }}
@@ -201,7 +197,7 @@ export default function TaskDivisionAddFile() {
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
+                  icon={<Ionicons name="trash" color="black" size={25} />}
                   title="Hapus"
                   onPress={() => { deleteFile(indexDelFile) }}
                />

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

@@ -9,7 +9,6 @@ import Styles from "@/constants/Styles";
 import { apiAddMemberTask, apiGetDivisionMember, apiGetTaskOne } from "@/lib/api";
 import { setUpdateTask } from "@/lib/taskUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { AntDesign } from "@expo/vector-icons";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
@@ -24,7 +23,6 @@ type Props = {
 }
 
 export default function AddMemberTask() {
-   const { colors } = useTheme();
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.projectUpdate)
    const { token, decryptToken } = useAuthSession()
@@ -86,11 +84,9 @@ export default function AddMemberTask() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error : any ) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         const message = error?.response?.data?.message || "Gagal menambahkan anggota"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
@@ -131,7 +127,7 @@ export default function AddMemberTask() {
                )
             }}
          />
-         <View style={[Styles.p15, { flex: 1, backgroundColor: colors.background }]}>
+         <View style={[Styles.p15, { flex: 1 }]}>
             <InputSearch onChange={(val) => setSearch(val)} value={search} />
 
             {
@@ -153,7 +149,7 @@ export default function AddMemberTask() {
                   </View>
 
                   :
-                  <Text style={[Styles.textDefault, Styles.pv05, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada member yang dipilih</Text>
+                  <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
             }
             <ScrollView
                showsVerticalScrollIndicator={false}
@@ -166,22 +162,22 @@ export default function AddMemberTask() {
                         return (
                            <Pressable
                               key={index}
-                              style={[Styles.itemSelectModal, { borderColor: colors.icon + '20' }]}
+                              style={[Styles.itemSelectModal]}
                               onPress={() => {
                                  !found && onChoose(item.idUser, item.name, item.img)
                               }}
                            >
-                              <View style={[Styles.rowItemsCenter, Styles.w80,]}>
+                              <View style={[Styles.rowItemsCenter, Styles.w80]}>
                                  <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]} numberOfLines={1}>{item.name}</Text>
                                     {
-                                       found && <Text style={[Styles.textInformation, { color: colors.dimmed }]}>sudah menjadi anggota</Text>
+                                       found && <Text style={[Styles.textInformation, Styles.cGray]}>sudah menjadi anggota</Text>
                                     }
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} color={colors.text} />
+                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )

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

@@ -1,6 +1,5 @@
 import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
-import ButtonSelect from "@/components/buttonSelect";
 import { InputForm } from "@/components/inputForm";
 import ModalAddDetailTugasTask from "@/components/task/modalAddDetailTugasTask";
 import Text from "@/components/Text";
@@ -10,7 +9,6 @@ import { formatDateOnly } from "@/lib/fun_formatDateOnly";
 import { getDatesInRange } from "@/lib/fun_getDatesInRange";
 import { setUpdateTask } from "@/lib/taskUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import 'intl';
@@ -18,8 +16,7 @@ import 'intl/locale-data/jsonp/id';
 import moment from "moment";
 import { useEffect, useState } from "react";
 import {
-   KeyboardAvoidingView, Platform,
+   KeyboardAvoidingView, Platform, Pressable, SafeAreaView,
-   SafeAreaView,
    ScrollView,
    View
 } from "react-native";
@@ -28,7 +25,6 @@ import DateTimePicker, { DateType } from "react-native-ui-datepicker";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function TaskDivisionAddTask() {
-   const { colors } = useTheme();
    const { token, decryptToken } = useAuthSession();
    const dispatch = useDispatch();
    const update = useSelector((state: any) => state.taskUpdate);
@@ -133,18 +129,16 @@ export default function TaskDivisionAddTask() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error : any ) {
+      } catch (error) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal menambahkan data"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
    }
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => (
@@ -189,7 +183,7 @@ export default function TaskDivisionAddTask() {
          >
             <ScrollView>
                <View style={[Styles.p15, Styles.mb100]}>
-                  <View style={[Styles.wrapPaper, Styles.p10, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                  <View style={[Styles.wrapPaper, Styles.p10]}>
                      <DateTimePicker
                         mode="range"
                         startDate={range.startDate}
@@ -199,15 +193,13 @@ export default function TaskDivisionAddTask() {
                            selected: Styles.selectedDate,
                            selected_label: Styles.cWhite,
                            range_fill: Styles.selectRangeDate,
-                           month_label: { color: colors.text },
+                           month_label: Styles.cBlack,
-                           month_selector_label: { color: colors.text },
+                           month_selector_label: Styles.cBlack,
-                           year_label: { color: colors.text },
+                           year_label: Styles.cBlack,
-                           year_selector_label: { color: colors.text },
+                           year_selector_label: Styles.cBlack,
-                           day_label: { color: colors.text },
+                           day_label: Styles.cBlack,
-                           time_label: { color: colors.text },
+                           time_label: Styles.cBlack,
-                           weekday_label: { color: colors.text },
+                           weekday_label: Styles.cBlack,
-                           button_next_image: { tintColor: colors.text },
-                           button_prev_image: { tintColor: colors.text },
                         }}
                      />
                   </View>
@@ -215,39 +207,38 @@ export default function TaskDivisionAddTask() {
                      <View style={[Styles.rowSpaceBetween]}>
                         <View style={[{ width: "48%" }]}>
                            <Text style={[Styles.mb05]}>
-                              Tanggal Mulai <Text style={{ color: colors.error }}>*</Text>
+                              Tanggal Mulai <Text style={Styles.cError}>*</Text>
                            </Text>
-                           <View style={[Styles.wrapPaper, Styles.noShadow, Styles.borderAll, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+                           <View style={[Styles.wrapPaper, Styles.p10]}>
                               <Text style={{ textAlign: "center" }}>{from}</Text>
                            </View>
                         </View>
                         <View style={[{ width: "48%" }]}>
                            <Text style={[Styles.mb05]}>
-                              Tanggal Berakhir <Text style={{ color: colors.error }}>*</Text>
+                              Tanggal Berakhir <Text style={Styles.cError}>*</Text>
                            </Text>
-                           <View style={[Styles.wrapPaper, Styles.noShadow, Styles.borderAll, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+                           <View style={[Styles.wrapPaper, Styles.p10]}>
                               <Text style={{ textAlign: "center" }}>{to}</Text>
                            </View>
                         </View>
                      </View>
                      {
-                        (error.endDate || error.startDate) && <Text style={[Styles.textInformation, { color: colors.error }, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
+                        (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
                      }
-                     {/* <Pressable
+                     <Pressable
                         style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
                         disabled={dsbButton}
                         onPress={() => { setModalDetail(true) }}
                      >
                         <Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
-                     </Pressable> */}
+                     </Pressable>
-                     <ButtonSelect value="Detail" onPress={() => { setModalDetail(true) }} disabled={from == "" || to == ""} />
                   </View>
                   <InputForm
                      label="Judul Tugas"
                      type="default"
                      placeholder="Judul Tugas"
                      required
-                     bg={colors.card}
+                     bg="white"
                      value={title}
                      error={error.title}
                      errorText="Judul tidak boleh kosong"

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

@@ -5,7 +5,6 @@ import Styles from "@/constants/Styles";
 import { apiCancelTask } from "@/lib/api";
 import { setUpdateTask } from "@/lib/taskUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
 import { SafeAreaView, ScrollView, View } from "react-native";
@@ -13,7 +12,6 @@ import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function TaskDivisionCancel() {
-   const { colors } = useTheme();
    const { id, detail } = useLocalSearchParams<{ id: string; detail: string }>();
    const { token, decryptToken } = useAuthSession();
    const dispatch = useDispatch();
@@ -62,18 +60,16 @@ export default function TaskDivisionCancel() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error : any ) {
+      } catch (error) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal membatalkan kegiatan"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
    }
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => (
@@ -119,7 +115,7 @@ export default function TaskDivisionCancel() {
                   type="default"
                   placeholder="Alasan Pembatalan"
                   required
-                  bg={colors.card}
+                  bg="white"
                   error={error}
                   errorText="Alasan pembatalan harus diisi"
                   onChange={(val) => onValidation(val)}

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

@@ -5,7 +5,6 @@ import Styles from "@/constants/Styles";
 import { apiEditTask, apiGetTaskOne } from "@/lib/api";
 import { setUpdateTask } from "@/lib/taskUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
 import { SafeAreaView, ScrollView, View } from "react-native";
@@ -13,7 +12,6 @@ import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function TaskDivisionEdit() {
-   const { colors } = useTheme();
    const { id, detail } = useLocalSearchParams<{ id: string; detail: string }>();
    const { token, decryptToken } = useAuthSession();
    const [judul, setJudul] = useState("");
@@ -80,18 +78,16 @@ export default function TaskDivisionEdit() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error : any ) {
+      } catch (error) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal mengubah data"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
    }
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => (
@@ -132,7 +128,7 @@ export default function TaskDivisionEdit() {
                   type="default"
                   placeholder="Judul Kegiatan"
                   required
-                  bg={colors.card}
+                  bg="white"
                   value={judul}
                   onChange={(val) => { onValidation(val) }}
                   error={error}

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

@@ -1,5 +1,4 @@
 import AppHeader from "@/components/AppHeader";
-import GuideOverlay from "@/components/GuideOverlay";
 import SectionCancel from "@/components/sectionCancel";
 import SectionProgress from "@/components/sectionProgress";
 import HeaderRightTaskDetail from "@/components/task/headerTaskDetail";
@@ -10,10 +9,7 @@ import SectionReportTask from "@/components/task/sectionReportTask";
 import SectionTanggalTugasTask from "@/components/task/sectionTanggalTugasTask";
 import Styles from "@/constants/Styles";
 import { apiGetDivisionOneFeature, apiGetTaskOne } from "@/lib/api";
-import { GUIDE_PROJECT_DETAIL } from "@/lib/guideSteps";
-import { useGuide } from "@/lib/useGuide";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
 import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
@@ -26,21 +22,17 @@ type Props = {
    reason: string
    status: number
    isActive: boolean
-   idGroup: string
 }
 
 export default function DetailTaskDivision() {
-   const { colors } = useTheme();
    const { id, detail } = useLocalSearchParams<{ id: string, detail: string }>();
    const { token, decryptToken } = useAuthSession()
    const [data, setData] = useState<Props>()
    const [loading, setLoading] = useState(true)
    const [progress, setProgress] = useState(0)
-   const [taskStats, setTaskStats] = useState<{ done: number, total: number } | undefined>()
    const update = useSelector((state: any) => state.taskUpdate)
    const [refreshing, setRefreshing] = useState(false)
    const [isMemberDivision, setIsMemberDivision] = useState(false);
-   const { visible: guideVisible, dismiss: dismissGuide } = useGuide('division-task-detail')
    const [isAdminDivision, setIsAdminDivision] = useState(false);
    const entityUser = useSelector((state: any) => state.user);
 
@@ -71,17 +63,6 @@ export default function DetailTaskDivision() {
    }, [])
 
 
-   async function handleLoadTaskStats() {
-      try {
-         const hasil = await decryptToken(String(token?.current))
-         const response = await apiGetTaskOne({ id: detail, user: hasil, cat: 'task' })
-         const tasks: { status: number }[] = response.data
-         setTaskStats({ done: tasks.filter(t => t.status === 1).length, total: tasks.length })
-      } catch (error) {
-         console.error(error)
-      }
-   }
-
    async function handleLoad(cat: 'data' | 'progress') {
       try {
          if (cat == 'data') setLoading(true)
@@ -107,21 +88,16 @@ export default function DetailTaskDivision() {
       handleLoad('progress')
    }, [update.progress])
 
-   useEffect(() => {
-      handleLoadTaskStats()
-   }, [update.task])
-
    const handleRefresh = async () => {
       setRefreshing(true)
       await handleLoad('data')
       await handleLoad('progress')
-      await handleLoadTaskStats()
       await new Promise(resolve => setTimeout(resolve, 2000));
       setRefreshing(false)
    };
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -144,13 +120,11 @@ export default function DetailTaskDivision() {
                )
             }}
          />
-         <GuideOverlay visible={guideVisible} steps={GUIDE_PROJECT_DETAIL} onDismiss={dismissGuide} />
          <ScrollView
             refreshControl={
                <RefreshControl
                   refreshing={refreshing}
                   onRefresh={handleRefresh}
-                  tintColor={colors.icon}
                />
             }
          >
@@ -158,9 +132,9 @@ export default function DetailTaskDivision() {
                {
                   data?.reason != null && data?.reason != "" && <SectionCancel text={data?.reason} />
                }
-               <SectionProgress progress={progress} doneCount={taskStats?.done} totalCount={taskStats?.total} />
+               <SectionProgress text={`Kemajuan Kegiatan ${progress}%`} progress={progress} />
                <SectionReportTask refreshing={refreshing} />
-               <SectionTanggalTugasTask refreshing={refreshing} isMemberDivision={isMemberDivision} isAdminDivision={isAdminDivision} status={data?.status} idGroup={data?.idGroup ?? ''} />
+               <SectionTanggalTugasTask refreshing={refreshing} isMemberDivision={isMemberDivision} />
                <SectionFileTask refreshing={refreshing} isMemberDivision={isMemberDivision} />
                <SectionLinkTask refreshing={refreshing} isMemberDivision={isMemberDivision} />
                <SectionMemberTask refreshing={refreshing} isAdminDivision={isAdminDivision} />

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

@@ -5,7 +5,6 @@ import Styles from "@/constants/Styles";
 import { apiGetTaskOne, apiReportTask } from "@/lib/api";
 import { setUpdateTask } from "@/lib/taskUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
 import { SafeAreaView, ScrollView, View } from "react-native";
@@ -13,7 +12,6 @@ import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function TaskDivisionReport() {
-   const { colors } = useTheme();
    const { id, detail } = useLocalSearchParams<{ id: string; detail: string }>();
    const { token, decryptToken } = useAuthSession();
    const [laporan, setLaporan] = useState("");
@@ -80,18 +78,16 @@ export default function TaskDivisionReport() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error : any ) {
+      } catch (error) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal mengubah data"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
    }
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => (
@@ -132,7 +128,7 @@ export default function TaskDivisionReport() {
                   type="default"
                   placeholder="Laporan Kegiatan"
                   required
-                  bg={colors.card}
+                  bg="white"
                   value={laporan}
                   onChange={(val) => { onValidation(val) }}
                   error={error}

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

@@ -1,382 +0,0 @@
-import AppHeader from "@/components/AppHeader";
-import BorderBottomItem from "@/components/borderBottomItem";
-import { ButtonForm } from "@/components/buttonForm";
-import ButtonSelect from "@/components/buttonSelect";
-import DrawerBottom from "@/components/drawerBottom";
-import ModalConfirmation from "@/components/ModalConfirmation";
-import ModalLoading from "@/components/modalLoading";
-import MenuItemRow from "@/components/menuItemRow";
-import Skeleton from "@/components/skeleton";
-import Text from "@/components/Text";
-import { ConstEnv } from "@/constants/ConstEnv";
-import Styles from "@/constants/Styles";
-import {
-   apiAddTugasTaskFile,
-   apiDeleteTugasTaskFile,
-   apiGetTaskOne,
-   apiGetTugasTaskFile,
-   apiLinkTugasTaskFile,
-} from "@/lib/api";
-import { setUpdateTask } from "@/lib/taskUpdate";
-import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
-import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
-import * as DocumentPicker from "expo-document-picker";
-import * as FileSystem from "expo-file-system";
-import { startActivityAsync } from "expo-intent-launcher";
-import { router, Stack, useLocalSearchParams } from "expo-router";
-import * as Sharing from "expo-sharing";
-import { useEffect, useState } from "react";
-import {
-   ActivityIndicator,
-   Alert,
-   Platform,
-   SafeAreaView,
-   ScrollView,
-   View,
-} from "react-native";
-import * as mime from "react-native-mime-types";
-import Toast from "react-native-toast-message";
-import { useDispatch, useSelector } from "react-redux";
-
-type FileItem = {
-   id: string;      // DivisionProjectTaskFile.id
-   idFile: string;  // DivisionProjectFile.id
-   name: string;
-   extension: string;
-   idStorage: string;
-};
-
-type ProjectFile = {
-   id: string;
-   name: string;
-   extension: string;
-   idStorage: string;
-};
-
-export default function TugasFileScreen() {
-   const { colors } = useTheme();
-   const { id, detail, taskId, member: memberParam } = useLocalSearchParams<{
-      id: string;
-      detail: string;
-      taskId: string;
-      member: string;
-   }>();
-   const { token, decryptToken } = useAuthSession();
-   const dispatch = useDispatch();
-   const update = useSelector((state: any) => state.taskUpdate);
-   const entityUser = useSelector((state: any) => state.user);
-   const isMember = memberParam === "true";
-   const canEdit = isMember || (entityUser.role !== "user" && entityUser.role !== "coadmin");
-
-   const [data, setData] = useState<FileItem[]>([]);
-   const [loading, setLoading] = useState(true);
-   const [loadingOpen, setLoadingOpen] = useState(false);
-   const [loadingUpload, setLoadingUpload] = useState(false);
-   const [loadingLink, setLoadingLink] = useState(false);
-
-   const [selectFile, setSelectFile] = useState<FileItem | null>(null);
-   const [isMenuModal, setMenuModal] = useState(false);
-   const [showDeleteModal, setShowDeleteModal] = useState(false);
-
-   const [projectFiles, setProjectFiles] = useState<ProjectFile[]>([]);
-   const [isPickerModal, setPickerModal] = useState(false);
-   const [loadingProjectFiles, setLoadingProjectFiles] = useState(false);
-   const [selectedProjectFiles, setSelectedProjectFiles] = useState<string[]>([]);
-
-   const arrSkeleton = Array.from({ length: 4 });
-
-   async function loadFiles() {
-      try {
-         setLoading(true);
-         const hasil = await decryptToken(String(token?.current));
-         const response = await apiGetTugasTaskFile({ user: hasil, id: taskId });
-         setData(response.data ?? []);
-      } catch (error) {
-         console.error(error);
-      } finally {
-         setLoading(false);
-      }
-   }
-
-   async function loadProjectFiles() {
-      try {
-         setLoadingProjectFiles(true);
-         const hasil = await decryptToken(String(token?.current));
-         const response = await apiGetTaskOne({ id: detail, user: hasil, cat: "file" });
-         setProjectFiles(response.data ?? []);
-      } catch (error) {
-         console.error(error);
-      } finally {
-         setLoadingProjectFiles(false);
-      }
-   }
-
-   useEffect(() => {
-      loadFiles();
-   }, []);
-
-   const openFile = () => {
-      setMenuModal(false);
-      setLoadingOpen(true);
-      const remoteUrl = ConstEnv.url_storage + "/files/" + selectFile?.idStorage;
-      const fileName = selectFile?.name + "." + selectFile?.extension;
-      const localPath = `${FileSystem.documentDirectory}/${fileName}`;
-      const mimeType = mime.lookup(fileName);
-
-      FileSystem.downloadAsync(remoteUrl, localPath).then(async ({ uri }) => {
-         const contentURL = await FileSystem.getContentUriAsync(uri);
-         try {
-            if (Platform.OS === "android") {
-               await startActivityAsync("android.intent.action.VIEW", {
-                  data: contentURL,
-                  flags: 1,
-                  type: mimeType as string,
-               });
-            } else {
-               Sharing.shareAsync(localPath);
-            }
-         } catch {
-            Alert.alert("INFO", "Gagal membuka file, tidak ada aplikasi yang dapat membuka file ini");
-         } finally {
-            setLoadingOpen(false);
-         }
-      });
-   };
-
-   async function handleDelete() {
-      try {
-         const hasil = await decryptToken(String(token?.current));
-         const response = await apiDeleteTugasTaskFile({ user: hasil }, String(selectFile?.id));
-         if (response.success) {
-            Toast.show({ type: "small", text1: "Berhasil menghapus file" });
-            dispatch(setUpdateTask({ ...update, task: !update.task }));
-            loadFiles();
-         } else {
-            Toast.show({ type: "small", text1: response.message });
-         }
-      } catch (error: any) {
-         const message = error?.response?.data?.message || "Gagal menghapus file";
-         Toast.show({ type: "small", text1: message });
-      } finally {
-         setMenuModal(false);
-      }
-   }
-
-   async function handleUpload() {
-      const result = await DocumentPicker.getDocumentAsync({ type: ["*/*"], multiple: true });
-      if (result.canceled) return;
-
-      try {
-         setLoadingUpload(true);
-         const hasil = await decryptToken(String(token?.current));
-         const fd = new FormData();
-
-         for (let i = 0; i < result.assets.length; i++) {
-            fd.append(`file${i}`, {
-               uri: result.assets[i].uri,
-               type: "application/octet-stream",
-               name: result.assets[i].name,
-            } as any);
-         }
-         fd.append("data", JSON.stringify({ user: hasil }));
-
-         const response = await apiAddTugasTaskFile({ data: fd, id: taskId });
-         if (response.success) {
-            Toast.show({ type: "small", text1: "Berhasil menambahkan file" });
-            dispatch(setUpdateTask({ ...update, task: !update.task }));
-            loadFiles();
-         } else {
-            Toast.show({ type: "small", text1: response.message });
-         }
-      } catch (error: any) {
-         const message = error?.response?.data?.message || "Gagal menambahkan file";
-         Toast.show({ type: "small", text1: message });
-      } finally {
-         setLoadingUpload(false);
-      }
-   }
-
-   function toggleProjectFileSelect(id: string) {
-      setSelectedProjectFiles((prev) =>
-         prev.includes(id) ? prev.filter((v) => v !== id) : [...prev, id]
-      );
-   }
-
-   async function handleLinkFiles() {
-      if (selectedProjectFiles.length === 0) return;
-      try {
-         setLoadingLink(true);
-         const hasil = await decryptToken(String(token?.current));
-         for (const idFile of selectedProjectFiles) {
-            await apiLinkTugasTaskFile({ user: hasil, idFile, id: taskId });
-         }
-         Toast.show({ type: "small", text1: "Berhasil menambahkan file" });
-         dispatch(setUpdateTask({ ...update, task: !update.task }));
-         setPickerModal(false);
-         setSelectedProjectFiles([]);
-         loadFiles();
-      } catch (error: any) {
-         const message = error?.response?.data?.message || "Gagal menambahkan file";
-         Toast.show({ type: "small", text1: message });
-      } finally {
-         setLoadingLink(false);
-      }
-   }
-
-   const attachedFileIds = new Set(data.map((f) => f.idFile));
-
-   return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
-         <Stack.Screen
-            options={{
-               header: () => (
-                  <AppHeader
-                     title="File Tugas"
-                     showBack={true}
-                     onPressLeft={() => router.back()}
-                  />
-               ),
-            }}
-         />
-         <ModalLoading isVisible={loadingOpen} setVisible={setLoadingOpen} />
-
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
-               {canEdit && (
-                  <>
-                     <ButtonSelect
-                        value="Upload dari Perangkat"
-                        onPress={handleUpload}
-                        disabled={loadingUpload}
-                     />
-                     <ButtonSelect
-                        value="Pilih dari File Kegiatan ini"
-                        onPress={() => {
-                           setSelectedProjectFiles([]);
-                           setPickerModal(true);
-                           loadProjectFiles();
-                        }}
-                     />
-                  </>
-               )}
-
-               {loadingUpload && <ActivityIndicator size="small" style={Styles.mv05} />}
-
-               <View style={[Styles.mb15, Styles.mt10]}>
-                  <Text style={[Styles.textDefaultSemiBold, Styles.mv05]}>File Terlampir</Text>
-                  <View style={[Styles.wrapPaper, { backgroundColor: colors.card, borderColor: colors.background }]}>
-                     {loading ? (
-                        arrSkeleton.map((_, index) => (
-                           <Skeleton key={index} width={100} height={40} widthType="percent" borderRadius={10} />
-                        ))
-                     ) : data.length > 0 ? (
-                        data.map((item, index) => (
-                           <BorderBottomItem
-                              key={index}
-                              borderType="all"
-                              icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
-                              title={item.name + "." + item.extension}
-                              titleWeight="normal"
-                              onPress={() => {
-                                 setSelectFile(item);
-                                 setMenuModal(true);
-                              }}
-                           />
-                        ))
-                     ) : (
-                        <Text style={[Styles.textDefault, { textAlign: "center", color: colors.dimmed }]}>
-                           Tidak ada file
-                        </Text>
-                     )}
-                  </View>
-               </View>
-            </View>
-         </ScrollView>
-
-         {/* Menu per file */}
-         <DrawerBottom animation="slide" isVisible={isMenuModal} setVisible={setMenuModal} title="Menu">
-            <View style={Styles.rowItemsCenter}>
-               <MenuItemRow
-                  icon={<MaterialCommunityIcons name="file-eye" color={colors.text} size={25} />}
-                  title="Lihat / Share"
-                  onPress={openFile}
-               />
-               {canEdit && (
-                  <MenuItemRow
-                     icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
-                     title="Hapus"
-                     onPress={() => {
-                        setMenuModal(false);
-                        setTimeout(() => setShowDeleteModal(true), 600);
-                     }}
-                  />
-               )}
-            </View>
-         </DrawerBottom>
-
-         <ModalConfirmation
-            visible={showDeleteModal}
-            title="Konfirmasi"
-            message="Apakah Anda yakin ingin menghapus file ini?"
-            onConfirm={() => {
-               setShowDeleteModal(false);
-               handleDelete();
-            }}
-            onCancel={() => setShowDeleteModal(false)}
-            confirmText="Hapus"
-            cancelText="Batal"
-         />
-
-         {/* Picker file dari proyek */}
-         <DrawerBottom
-            animation="slide"
-            isVisible={isPickerModal}
-            setVisible={setPickerModal}
-            title="Pilih File Proyek"
-            height={60}
-         >
-            <ScrollView>
-               {loadingProjectFiles ? (
-                  <ActivityIndicator size="small" />
-               ) : projectFiles.length > 0 ? (
-                  projectFiles.map((item, index) => {
-                     const isAttached = attachedFileIds.has(item.id);
-                     const isSelected = selectedProjectFiles.includes(item.id);
-                     return (
-                        <View key={index} style={isAttached ? { opacity: 0.4 } : undefined}>
-                           <BorderBottomItem
-                              borderType="bottom"
-                              icon={
-                                 isAttached || isSelected ? (
-                                    <Ionicons name="checkmark-circle" size={25} color={colors.primary} />
-                                 ) : (
-                                    <MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />
-                                 )
-                              }
-                              title={item.name + "." + item.extension}
-                              titleWeight="normal"
-                              onPress={() => !isAttached && toggleProjectFileSelect(item.id)}
-                              bgColor="transparent"
-                           />
-                        </View>
-                     );
-                  })
-               ) : (
-                  <Text style={[Styles.textDefault, { textAlign: "center", color: colors.dimmed }]}>
-                     Tidak ada file tersedia
-                  </Text>
-               )}
-            </ScrollView>
-            {projectFiles.length > 0 && (
-               <View>
-                  <ButtonForm
-                     text={loadingLink ? "Menyimpan..." : `Tambahkan (${selectedProjectFiles.length})`}
-                     disabled={selectedProjectFiles.length === 0 || loadingLink}
-                     onPress={handleLinkFiles} />
-               </View>
-            )}
-         </DrawerBottom>
-      </SafeAreaView>
-   );
-}

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

@@ -1,5 +1,7 @@
 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";
@@ -14,38 +16,16 @@ import { setMemberChoose } from "@/lib/memberChoose";
 import { setTaskCreate } from "@/lib/taskCreate";
 import { setUpdateTask } from "@/lib/taskUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 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 { Pressable, SafeAreaView, ScrollView, View } from "react-native";
+import { 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 CreateTaskDivision() {
-   const { colors } = useTheme();
    const { id } = useLocalSearchParams();
    const { token, decryptToken } = useAuthSession();
    const dispatch = useDispatch();
@@ -123,11 +103,9 @@ export default function CreateTaskDivision() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error : any ) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         const message = error?.response?.data?.message || "Gagal menambahkan data"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
@@ -135,7 +113,7 @@ export default function CreateTaskDivision() {
 
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => (
@@ -183,134 +161,61 @@ export default function CreateTaskDivision() {
                      val == "" || val == "null" ? setError(true) : setError(false);
                   }}
                   error={error}
-                  bg={colors.card}
                   errorText="Judul Tugas tidak boleh kosong"
                />
-
+               <ButtonSelect value="Tambah Tanggal & Tugas" onPress={() => { router.push(`/division/${id}/task/create/task`); }} />
-               {/* Tanggal & Tugas */}
+               <ButtonSelect value="Upload File" onPress={pickDocumentAsync} />
-               <View style={[
+               <ButtonSelect value="Tambah Anggota" onPress={() => { router.push(`/division/${id}/task/create/member`); }} />
-                  Styles.wrapPaper, Styles.mb15, Styles.sectionCard,
+               <SectionListAddTask />
-                  { backgroundColor: colors.card, borderColor: colors.icon + '18' }
+               {
-               ]}>
+                  fileForm.length > 0 && (
-                  <Pressable
+                     <View style={[Styles.mb15]}>
-                     onPress={() => router.push(`/division/${id}/task/create/task`)}
+                        <Text style={[Styles.textDefaultSemiBold, Styles.mv05]}>File</Text>
-                     style={[Styles.sectionActionRow, { marginBottom: taskCreate.length > 0 ? 12 : 0 }]}
+                        <View style={[Styles.wrapPaper]}>
-                  >
+                           {
-                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.tabActive + '18' }]}>
+                              fileForm.map((item, index) => (
-                        <MaterialCommunityIcons name="calendar-check-outline" size={18} color={colors.tabActive} />
+                                 <BorderBottomItem
+                                    key={index}
+                                    borderType="all"
+                                    icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
+                                    title={item.name}
+                                    titleWeight="normal"
+                                    onPress={() => { setIndexDelFile(index); setModal(true) }}
+                                 />
+                              ))
+                           }
+                        </View>
                      </View>
-                     <View style={Styles.flex1}>
+                  )
-                        <Text style={[Styles.textDefaultSemiBold, { color: colors.text }]}>Tanggal & Tugas</Text>
+               }
-                        {taskCreate.length === 0 && (
+               {entitiesMember.length > 0 && (
-                           <Text style={[Styles.textMediumNormal, { color: colors.dimmed }]}>Belum ada tugas ditambahkan</Text>
+                  <View>
+                     <View style={[Styles.rowSpaceBetween, Styles.mv05]}>
+                        <Text>Anggota</Text>
+                        <Text>Total {entitiesMember.length} Anggota</Text>
+                     </View>
+
+                     <View style={[Styles.borderAll, Styles.round10, Styles.p10]}>
+                        {entitiesMember.map(
+                           (item: { img: any; name: any }, index: any) => {
+                              return (
+                                 <BorderBottomItem
+                                    key={index}
+                                    borderType="bottom"
+                                    icon={
+                                       <ImageUser
+                                          src={`${ConstEnv.url_storage}/files/${item.img}`}
+                                          size="sm"
+                                       />
+                                    }
+                                    title={item.name}
+                                 />
+                              );
+                           }
                         )}
                      </View>
-                     {taskCreate.length > 0 && (
+                  </View>
-                        <View style={[Styles.sectionBadge, { backgroundColor: colors.tabActive + '18' }]}>
+               )}
-                           <Text style={[Styles.textSmallSemiBold, { color: colors.tabActive }]}>{taskCreate.length} tugas</Text>
-                        </View>
-                     )}
-                     <MaterialCommunityIcons name="chevron-right" size={18} color={colors.dimmed} />
-                  </Pressable>
-                  {taskCreate.length > 0 && <SectionListAddTask showTitle={false} />}
-               </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); setModal(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>
-
-               {/* Anggota */}
-               <View style={[
-                  Styles.wrapPaper, Styles.mb15, Styles.sectionCard,
-                  { backgroundColor: colors.card, borderColor: colors.icon + '18' }
-               ]}>
-                  <Pressable
-                     onPress={() => router.push(`/division/${id}/task/create/member`)}
-                     style={[Styles.sectionActionRow, { marginBottom: entitiesMember.length > 0 ? 12 : 0 }]}
-                  >
-                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.tabActive + '18' }]}>
-                        <MaterialCommunityIcons name="account-group-outline" 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} orang</Text>
-                        </View>
-                     )}
-                     <MaterialCommunityIcons name="chevron-right" size={18} color={colors.dimmed} />
-                  </Pressable>
-                  {entitiesMember.length > 0 && (
-                     <View style={{ gap: 6 }}>
-                        {entitiesMember.map((item: { img: any; name: any; position?: string }, index: any) => (
-                           <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>
-                              {item.position && (
-                                 <View style={[Styles.positionBadge, { backgroundColor: colors.dimmed + '15' }]}>
-                                    <Text style={[Styles.textSmallSemiBold, { color: colors.dimmed }]} numberOfLines={1}>{item.position}</Text>
-                                 </View>
-                              )}
-                           </View>
-                        ))}
-                     </View>
-                  )}
-               </View>
 
             </View>
          </ScrollView>
@@ -318,7 +223,7 @@ export default function CreateTaskDivision() {
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
+                  icon={<Ionicons name="trash" color="black" size={25} />}
                   title="Hapus"
                   onPress={() => { deleteFile(indexDelFile) }}
                />

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

@@ -9,7 +9,6 @@ import Styles from "@/constants/Styles";
 import { apiGetDivisionMember } from "@/lib/api";
 import { setMemberChoose } from "@/lib/memberChoose";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { AntDesign } from "@expo/vector-icons";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
@@ -24,7 +23,6 @@ type Props = {
 }
 
 export default function AddMemberCreateTask() {
-   const { colors } = useTheme();
    const dispatch = useDispatch()
    const { token, decryptToken } = useAuthSession()
    const { id } = useLocalSearchParams<{ id: string, detail: string }>()
@@ -99,7 +97,7 @@ export default function AddMemberCreateTask() {
                )
             }}
          />
-         <View style={[Styles.p15, { flex: 1, backgroundColor: colors.background }]}>
+         <View style={[Styles.p15, { flex: 1 }]}>
             <InputSearch onChange={(val) => setSearch(val)} value={search} />
 
             {
@@ -121,7 +119,7 @@ export default function AddMemberCreateTask() {
                   </View>
 
                   :
-                  <Text style={[Styles.textDefault, Styles.pv05, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada member yang dipilih</Text>
+                  <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
             }
             <ScrollView
                showsVerticalScrollIndicator={false}
@@ -133,7 +131,7 @@ export default function AddMemberCreateTask() {
                         return (
                            <Pressable
                               key={index}
-                              style={[Styles.itemSelectModal, { borderColor: colors.icon + '20' }]}
+                              style={[Styles.itemSelectModal]}
                               onPress={() => {
                                  onChoose(item.idUser, item.name, item.img)
                               }}
@@ -145,7 +143,7 @@ export default function AddMemberCreateTask() {
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} color={colors.text} />
+                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )

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

@@ -1,6 +1,5 @@
 import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
-import ButtonSelect from "@/components/buttonSelect";
 import { InputForm } from "@/components/inputForm";
 import ModalAddDetailTugasTask from "@/components/task/modalAddDetailTugasTask";
 import Text from "@/components/Text";
@@ -8,7 +7,6 @@ import Styles from "@/constants/Styles";
 import { formatDateOnly } from "@/lib/fun_formatDateOnly";
 import { getDatesInRange } from "@/lib/fun_getDatesInRange";
 import { setTaskCreate } from "@/lib/taskCreate";
-import { useTheme } from "@/providers/ThemeProvider";
 import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack } from "expo-router";
 import 'intl';
@@ -18,6 +16,7 @@ import { useEffect, useState } from "react";
 import {
    KeyboardAvoidingView,
    Platform,
+   Pressable,
    SafeAreaView,
    ScrollView,
    View
@@ -28,7 +27,6 @@ import DateTimePicker, {
 import { useDispatch, useSelector } from "react-redux";
 
 export default function CreateTaskAddTugas() {
-   const { colors } = useTheme();
    const headerHeight = useHeaderHeight();
    const dispatch = useDispatch()
    const [disable, setDisable] = useState(true);
@@ -120,7 +118,7 @@ export default function CreateTaskAddTugas() {
    }
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => (
@@ -160,7 +158,7 @@ export default function CreateTaskAddTugas() {
          >
             <ScrollView>
                <View style={[Styles.p15, Styles.mb100]}>
-                  <View style={[Styles.wrapPaper, Styles.p10, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                  <View style={[Styles.wrapPaper, Styles.p10]}>
                      <DateTimePicker
                         mode="range"
                         startDate={range.startDate}
@@ -170,15 +168,13 @@ export default function CreateTaskAddTugas() {
                            selected: Styles.selectedDate,
                            selected_label: Styles.cWhite,
                            range_fill: Styles.selectRangeDate,
-                           month_label: { color: colors.text },
+                           month_label: Styles.cBlack,
-                           month_selector_label: { color: colors.text },
+                           month_selector_label: Styles.cBlack,
-                           year_label: { color: colors.text },
+                           year_label: Styles.cBlack,
-                           year_selector_label: { color: colors.text },
+                           year_selector_label: Styles.cBlack,
-                           day_label: { color: colors.text },
+                           day_label: Styles.cBlack,
-                           time_label: { color: colors.text },
+                           time_label: Styles.cBlack,
-                           weekday_label: { color: colors.text },
+                           weekday_label: Styles.cBlack,
-                           button_next_image: { tintColor: colors.text },
-                           button_prev_image: { tintColor: colors.text },
                         }}
                      />
                   </View>
@@ -186,39 +182,38 @@ export default function CreateTaskAddTugas() {
                      <View style={[Styles.rowSpaceBetween]}>
                         <View style={[{ width: "48%" }]}>
                            <Text style={[Styles.mb05]}>
-                              Tanggal Mulai <Text style={{ color: colors.error }}>*</Text>
+                              Tanggal Mulai <Text style={Styles.cError}>*</Text>
                            </Text>
-                           <View style={[Styles.wrapPaper, Styles.noShadow, Styles.borderAll, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+                           <View style={[Styles.wrapPaper, Styles.p10]}>
                               <Text style={{ textAlign: "center" }}>{from}</Text>
                            </View>
                         </View>
                         <View style={[{ width: "48%" }]}>
                            <Text style={[Styles.mb05]}>
-                              Tanggal Berakhir <Text style={{ color: colors.error }}>*</Text>
+                              Tanggal Berakhir <Text style={Styles.cError}>*</Text>
                            </Text>
-                           <View style={[Styles.wrapPaper, Styles.noShadow, Styles.borderAll, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+                           <View style={[Styles.wrapPaper, Styles.p10]}>
                               <Text style={{ textAlign: "center" }}>{to}</Text>
                            </View>
                         </View>
                      </View>
                      {
-                        (error.endDate || error.startDate) && <Text style={[Styles.textInformation, { color: colors.error }, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
+                        (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
                      }
-                     {/* <Pressable
+                     <Pressable
                         style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
                         disabled={dsbButton}
                         onPress={() => { setModalDetail(true) }}
                      >
                         <Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
-                     </Pressable> */}
+                     </Pressable>
-                     <ButtonSelect value="Detail" onPress={() => { setModalDetail(true) }} disabled={from == "" || to == ""} />
                   </View>
                   <InputForm
                      label="Judul Tugas"
                      type="default"
                      placeholder="Judul Tugas"
                      required
-                     bg={colors.card}
+                     bg="white"
                      value={title}
                      error={error.title}
                      errorText="Judul tidak boleh kosong"

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

@@ -11,7 +11,6 @@ import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
 import { apiGetTask } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import {
    AntDesign,
    Ionicons,
@@ -21,7 +20,6 @@ import { router, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
 import { Pressable, RefreshControl, ScrollView, View, VirtualizedList } from "react-native";
 import { useSelector } from "react-redux";
-import AsyncStorage from "@react-native-async-storage/async-storage";
 
 type Props = {
    id: string;
@@ -33,22 +31,9 @@ type Props = {
 };
 
 export default function ListTask() {
-   const { colors } = useTheme()
    const { id, status, year } = useLocalSearchParams<{ id: string; status: string; year: string }>()
    const [isList, setList] = useState(false)
    const { token, decryptToken } = useAuthSession()
-
-   useEffect(() => {
-      AsyncStorage.getItem('division_view_mode').then((val) => {
-         if (val !== null) setList(val === 'list')
-      })
-   }, [])
-
-   function toggleView() {
-      const next = !isList
-      setList(next)
-      AsyncStorage.setItem('division_view_mode', next ? 'list' : 'grid')
-   }
    const [data, setData] = useState<Props[]>([])
    const [search, setSearch] = useState("")
    const update = useSelector((state: any) => state.taskUpdate)
@@ -125,7 +110,7 @@ export default function ListTask() {
    })
 
    return (
-      <View style={[Styles.p15, Styles.flex1, { backgroundColor: colors.background }]}>
+      <View style={[Styles.p15, { flex: 1 }]}>
          <View>
             <ScrollView horizontal style={[Styles.mb10]} showsHorizontalScrollIndicator={false}>
                <ButtonTab
@@ -136,7 +121,7 @@ export default function ListTask() {
                   icon={
                      <MaterialCommunityIcons
                         name="clock-alert-outline"
-                        color={statusFix == "0" ? "white" : colors.dimmed}
+                        color={statusFix == "0" ? "white" : "black"}
                         size={20}
                      />
                   }
@@ -150,7 +135,7 @@ export default function ListTask() {
                   icon={
                      <MaterialCommunityIcons
                         name="progress-check"
-                        color={statusFix == "1" ? "white" : colors.dimmed}
+                        color={statusFix == "1" ? "white" : "black"}
                         size={20}
                      />
                   }
@@ -164,7 +149,7 @@ export default function ListTask() {
                   icon={
                      <Ionicons
                         name="checkmark-done-circle-outline"
-                        color={statusFix == "2" ? "white" : colors.dimmed}
+                        color={statusFix == "2" ? "white" : "black"}
                         size={20}
                      />
                   }
@@ -178,19 +163,23 @@ export default function ListTask() {
                   icon={
                      <AntDesign
                         name="closecircleo"
-                        color={statusFix == "3" ? "white" : colors.dimmed}
+                        color={statusFix == "3" ? "white" : "black"}
                         size={20}
                      />
                   }
                   n={4}
                />
             </ScrollView>
-            <View style={[Styles.rowSpaceBetween, { alignItems: 'center' }]}>
+            <View style={[Styles.rowSpaceBetween]}>
                <InputSearch width={68} onChange={setSearch} />
-               <Pressable onPress={toggleView}>
+               <Pressable
+                  onPress={() => {
+                     setList(!isList);
+                  }}
+               >
                   <MaterialCommunityIcons
                      name={isList ? "format-list-bulleted" : "view-grid"}
-                     color={colors.text}
+                     color={"black"}
                      size={30}
                   />
                </Pressable>
@@ -199,7 +188,7 @@ export default function ListTask() {
          <View style={[Styles.mv05]}>
             <View style={[Styles.rowOnly]}>
                <Text style={[Styles.mr05]}>Filter :</Text>
-               <LabelStatus size="small" category="secondary" text={isYear} style={[Styles.mr05]} />
+               <LabelStatus size="small" category="secondary" text={isYear} style={{ marginRight: 5 }} />
             </View>
          </View>
          <View style={[{ flex: 2 }]}>
@@ -228,10 +217,9 @@ export default function ListTask() {
                                        router.push(`./task/${item.id}`);
                                     }}
                                     borderType="bottom"
-                                    bgColor="transparent"
                                     icon={
-                                       <View style={[Styles.iconContent]}>
+                                       <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                                          <AntDesign name="areachart" size={25} color={"black"} />
+                                          <AntDesign name="areachart" size={25} color={"#384288"} />
                                        </View>
                                     }
                                     title={item.title}
@@ -245,7 +233,6 @@ export default function ListTask() {
                                  <RefreshControl
                                     refreshing={refreshing}
                                     onRefresh={handleRefresh}
-                                    tintColor={colors.icon}
                                  />
                               }
                            />
@@ -287,11 +274,11 @@ export default function ListTask() {
                                        <LabelStatus
                                           size="default"
                                           category={
-                                             item.status === 0 ? 'secondary' :
+                                             item.status === 0 ? 'primary' :
                                                 item.status === 1 ? 'warning' :
                                                    item.status === 2 ? 'success' :
                                                       item.status === 3 ? 'error' :
-                                                         'secondary'
+                                                         'primary'
                                           }
                                           text={
                                              item.status === 0 ? 'SEGERA' :
@@ -312,7 +299,6 @@ export default function ListTask() {
                                  <RefreshControl
                                     refreshing={refreshing}
                                     onRefresh={handleRefresh}
-                                    tintColor={colors.icon}
                                  />
                               }
                            />
@@ -352,13 +338,13 @@ export default function ListTask() {
                         </View>
                      )
                   ) : (
-                     <Text style={[Styles.textDefault, Styles.textCenter]} >
+                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: "center" },]} >
                         Tidak ada data
                      </Text>
                   )
 
             }
-         </View >
+         </View>
-      </View >
+      </View>
    );
 }

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

@@ -1,6 +1,5 @@
 import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
-import ButtonSelect from "@/components/buttonSelect";
 import { InputForm } from "@/components/inputForm";
 import ModalAddDetailTugasTask from "@/components/task/modalAddDetailTugasTask";
 import Text from "@/components/Text";
@@ -10,7 +9,6 @@ import { formatDateOnly } from "@/lib/fun_formatDateOnly";
 import { getDatesInRange } from "@/lib/fun_getDatesInRange";
 import { setUpdateTask } from "@/lib/taskUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import 'intl';
@@ -20,6 +18,7 @@ import { useEffect, useState } from "react";
 import {
    KeyboardAvoidingView,
    Platform,
+   Pressable,
    SafeAreaView,
    ScrollView,
    View
@@ -29,7 +28,6 @@ import DateTimePicker, { DateType } from "react-native-ui-datepicker";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function UpdateProjectTaskDivision() {
-   const { colors } = useTheme();
    const headerHeight = useHeaderHeight();
    const { detail } = useLocalSearchParams<{ detail: string }>();
    const dispatch = useDispatch();
@@ -125,11 +123,9 @@ export default function UpdateProjectTaskDivision() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error : any ) {
+      } catch (error) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal mengubah data"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoadingSubmit(false)
       }
@@ -190,7 +186,7 @@ export default function UpdateProjectTaskDivision() {
    }, [range])
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => (
@@ -235,7 +231,7 @@ export default function UpdateProjectTaskDivision() {
          >
             <ScrollView>
                <View style={[Styles.p15, Styles.mb100]}>
-                  <View style={[Styles.wrapPaper, Styles.p10, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                  <View style={[Styles.wrapPaper, Styles.p10]}>
                      {!loading && (
                         <DateTimePicker
                            mode="range"
@@ -248,15 +244,13 @@ export default function UpdateProjectTaskDivision() {
                               selected: Styles.selectedDate,
                               selected_label: Styles.cWhite,
                               range_fill: Styles.selectRangeDate,
-                              month_label: { color: colors.text },
+                              month_label: Styles.cBlack,
-                              month_selector_label: { color: colors.text },
+                              month_selector_label: Styles.cBlack,
-                              year_label: { color: colors.text },
+                              year_label: Styles.cBlack,
-                              year_selector_label: { color: colors.text },
+                              year_selector_label: Styles.cBlack,
-                              day_label: { color: colors.text },
+                              day_label: Styles.cBlack,
-                              time_label: { color: colors.text },
+                              time_label: Styles.cBlack,
-                              weekday_label: { color: colors.text },
+                              weekday_label: Styles.cBlack,
-                              button_next_image: { tintColor: colors.text },
-                              button_prev_image: { tintColor: colors.text },
                            }}
                         />
                      )}
@@ -265,41 +259,40 @@ export default function UpdateProjectTaskDivision() {
                      <View style={[Styles.rowSpaceBetween]}>
                         <View style={[{ width: "48%" }]}>
                            <Text style={[Styles.mb05]}>
-                              Tanggal Mulai <Text style={{ color: colors.error }}>*</Text>
+                              Tanggal Mulai <Text style={Styles.cError}>*</Text>
                            </Text>
-                           <View style={[Styles.wrapPaper, Styles.noShadow, Styles.borderAll, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+                           <View style={[Styles.wrapPaper, Styles.p10]}>
                               <Text style={{ textAlign: "center" }}>{from}</Text>
                            </View>
                         </View>
                         <View style={[{ width: "48%" }]}>
                            <Text style={[Styles.mb05]}>
-                              Tanggal Berakhir <Text style={{ color: colors.error }}>*</Text>
+                              Tanggal Berakhir <Text style={Styles.cError}>*</Text>
                            </Text>
-                           <View style={[Styles.wrapPaper, Styles.noShadow, Styles.borderAll, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+                           <View style={[Styles.wrapPaper, Styles.p10]}>
                               <Text style={{ textAlign: "center" }}>{to}</Text>
                            </View>
                         </View>
                      </View>
                      {(error.endDate || error.startDate) && (
-                        <Text style={[Styles.textInformation, { color: colors.error }, Styles.mt05]} >
+                        <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]} >
                            Tanggal tidak boleh kosong
                         </Text>
                      )}
-                     {/* <Pressable
+                     <Pressable
                         style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
                         disabled={dsbButton}
                         onPress={() => { setModalDetail(true) }}
                      >
                         <Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
-                     </Pressable> */}
+                     </Pressable>
-                     <ButtonSelect value="Detail" onPress={() => { setModalDetail(true) }} disabled={from == "" || to == ""} />
                   </View>
                   <InputForm
                      label="Judul Tugas"
                      type="default"
                      placeholder="Judul Tugas"
                      required
-                     bg={colors.card}
+                     bg="white"
                      value={title}
                      error={error.title}
                      errorText="Judul tidak boleh kosong"

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

@@ -8,7 +8,6 @@ import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiAddMemberDivision, apiGetDivisionOneDetail, apiGetUser } from "@/lib/api";
 import { setUpdateDivision } from "@/lib/divisionUpdate";
-import { useTheme } from "@/providers/ThemeProvider";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign } from "@expo/vector-icons";
 import { router, Stack, useLocalSearchParams } from "expo-router";
@@ -24,7 +23,6 @@ type Props = {
 }
 
 export default function AddMemberDivision() {
-   const { colors } = useTheme();
    const { token, decryptToken } = useAuthSession()
    const { id } = useLocalSearchParams<{ id: string }>()
    const [dataOld, setDataOld] = useState<Props[]>([])
@@ -89,11 +87,9 @@ export default function AddMemberDivision() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error: any) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         const message = error?.response?.data?.message || "Gagal menambahkan anggota"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
@@ -134,7 +130,7 @@ export default function AddMemberDivision() {
                )
             }}
          />
-         <View style={[Styles.p15, { flex: 1, backgroundColor: colors.background }]}>
+         <View style={[Styles.p15, { flex: 1 }]}>
             <InputSearch onChange={(val) => handleSearch(val)} value={search} />
 
             {
@@ -156,7 +152,7 @@ export default function AddMemberDivision() {
                   </View>
 
                   :
-                  <Text style={[Styles.textDefault, Styles.pv05, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada member yang dipilih</Text>
+                  <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
             }
             <ScrollView
                showsVerticalScrollIndicator={false}
@@ -169,7 +165,7 @@ export default function AddMemberDivision() {
                         return (
                            <Pressable
                               key={index}
-                              style={[Styles.itemSelectModal, { borderBottomColor: colors.icon + '20' }]}
+                              style={[Styles.itemSelectModal]}
                               onPress={() => {
                                  !found && onChoose(item.id, item.name, item.img)
                               }}
@@ -179,12 +175,12 @@ export default function AddMemberDivision() {
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode="tail">{item.name}</Text>
                                     {
-                                       found && <Text style={[Styles.textInformation, { color: colors.dimmed }]}>sudah menjadi anggota</Text>
+                                       found && <Text style={[Styles.textInformation, Styles.cGray]}>sudah menjadi anggota</Text>
                                     }
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={colors.text} />
+                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )

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

@@ -5,7 +5,6 @@ import Styles from "@/constants/Styles";
 import { apiEditDivision, apiGetDivisionOneDetail } from "@/lib/api";
 import { setUpdateDivision } from "@/lib/divisionUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
 import { SafeAreaView, ScrollView, View } from "react-native";
@@ -13,7 +12,6 @@ import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function EditDivision() {
-   const { colors } = useTheme();
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.divisionUpdate)
    const { token, decryptToken } = useAuthSession();
@@ -56,18 +54,16 @@ export default function EditDivision() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error: any) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         const message = error?.response?.data?.message || "Gagal mengubah data"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
    }
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => (
@@ -102,7 +98,7 @@ export default function EditDivision() {
                )
             }}
          />
-         <ScrollView style={{ backgroundColor: colors.background }}>
+         <ScrollView>
             <View style={[Styles.p15, Styles.mb100]}>
                <InputForm
                   label="Nama Divisi"

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

@@ -8,7 +8,6 @@ import CaraouselHome from "@/components/home/carouselHome"
 import Styles from "@/constants/Styles"
 import { apiGetDivisionOneDetail } from "@/lib/api"
 import { useAuthSession } from "@/providers/AuthProvider"
-import { useTheme } from "@/providers/ThemeProvider"
 import { router, Stack, useLocalSearchParams } from "expo-router"
 import { useEffect, useState } from "react"
 import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native"
@@ -23,7 +22,6 @@ type Props = {
 }
 
 export default function DetailDivisionFitur() {
-   const { colors } = useTheme()
    const { token, decryptToken } = useAuthSession()
    const { id } = useLocalSearchParams<{ id: string }>()
    const [data, setData] = useState<Props>()
@@ -56,7 +54,7 @@ export default function DetailDivisionFitur() {
    };
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -78,7 +76,6 @@ export default function DetailDivisionFitur() {
                <RefreshControl
                   refreshing={refreshing}
                   onRefresh={handleRefresh}
-                  tintColor={colors.icon}
                />
             }
             showsVerticalScrollIndicator={false}

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

@@ -1,17 +1,19 @@
+import AlertKonfirmasi from "@/components/alertKonfirmasi"
 import AppHeader from "@/components/AppHeader"
-import DrawerBottom from "@/components/drawerBottom"
+import BorderBottomItem from "@/components/borderBottomItem"
 import HeaderRightDivisionInfo from "@/components/division/headerDivisionInfo"
+import DrawerBottom from "@/components/drawerBottom"
 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"
@@ -37,7 +39,6 @@ type PropsMember = {
 }
 
 export default function InformationDivision() {
-   const { colors } = useTheme()
    const [refreshing, setRefreshing] = useState(false)
    const entityUser = useSelector((state: any) => state.user)
    const { id } = useLocalSearchParams<{ id: string }>()
@@ -47,8 +48,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({
@@ -56,13 +57,14 @@ export default function InformationDivision() {
       name: '',
       isAdmin: false
    })
-   const [showDeleteModal, setShowDeleteModal] = useState(false)
 
    function handleMemberOut() {
       setModal(false)
-      setTimeout(() => {
+      AlertKonfirmasi({
-         setShowDeleteModal(true)
+         title: 'Konfirmasi',
-      }, 600)
+         desc: 'Apakah anda yakin ingin mengeluarkan anggota?',
+         onPress: () => { memberOut() }
+      })
    }
 
    async function memberOut() {
@@ -75,11 +77,9 @@ export default function InformationDivision() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error: any) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         const message = error?.response?.data?.message || "Gagal mengeluarkan anggota"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setModal(false)
       }
@@ -95,11 +95,9 @@ export default function InformationDivision() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error: any) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         const message = error?.response?.data?.message || "Gagal mengubah status admin"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setModal(false)
       }
@@ -163,7 +161,7 @@ export default function InformationDivision() {
    }
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -183,138 +181,110 @@ export default function InformationDivision() {
             }}
          />
          <ScrollView
-            showsVerticalScrollIndicator={false}
+            refreshControl={
-            refreshControl={<RefreshControl refreshing={refreshing} onRefresh={handleRefresh} tintColor={colors.icon} />}
+               <RefreshControl
-            style={[Styles.h100, { backgroundColor: colors.background }]}
+                  refreshing={refreshing}
+                  onRefresh={handleRefresh}
+               />
+            }
+            style={[Styles.h100]}
          >
-            <View style={[Styles.p15, Styles.mb100]}>
+            <View style={[Styles.p15]}>
-
+               {
-               {dataDetail?.isActive === false && <SectionCancel title="Divisi nonaktif" />}
+                  dataDetail?.isActive == false && (
-
+                     <SectionCancel title={'Divisi nonaktif'} />
-               {/* Deskripsi */}
+                  )
-               <View style={[Styles.wrapPaper, Styles.sectionCard, Styles.noShadow, Styles.mb15,
+               }
-                  { backgroundColor: colors.card, borderColor: colors.icon + '18' }]}>
+               <View style={[Styles.mb15]}>
-                  <View style={[Styles.sectionActionRow, { marginBottom: 12 }]}>
+                  <Text style={[Styles.textDefaultSemiBold, Styles.mb05]}>Deskripsi Divisi</Text>
-                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.dimmed + '18' }]}>
+                  <View style={[Styles.wrapPaper]}>
-                        <MaterialIcons name="info-outline" size={18} color={colors.dimmed} />
+                     {loading ?
-                     </View>
+                        arrSkeleton.map((item, index) => {
-                     <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 (
-                              <Pressable
+                              <Skeleton key={index} width={100} height={10} widthType="percent" borderRadius={10} />
-                                 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]}>
+                     {
+                        ((entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision) &&
+                        dataDetail?.isActive && (
+                           <BorderBottomItem
+                              onPress={() => { router.push(`/division/${id}/add-member`) }}
+                              borderType="none"
+                              icon={
+                                 <View style={[Styles.iconContent, ColorsStatus.gray]}>
+                                    <Feather name="user-plus" size={25} color={'#384288'} />
+                                 </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 style={Styles.rowItemsCenter}>
+            <View>
-               <MenuItemRow
+               <Pressable style={[Styles.wrapItemBorderBottom]} onPress={() => { handleMemberAdmin() }}>
-                  icon={<MaterialIcons name="verified-user" color={colors.text} size={25} />}
+                  <View style={[Styles.rowItemsCenter]}>
-                  title={dataMemberChoose.isAdmin ? 'Berhentikan admin' : 'Jadikan admin'}
+                     <View style={[Styles.iconContent, ColorsStatus.info]}>
-                  onPress={handleMemberAdmin}
+                        <MaterialIcons name="verified-user" size={25} color='#19345E' />
-               />
+                     </View>
-               <MenuItemRow
+                     <View style={[Styles.rowSpaceBetween, { width: '88%' }]}>
-                  icon={<MaterialCommunityIcons name="account-remove" color={colors.text} size={25} />}
+                        <View style={[Styles.ml10]}>
-                  title="Keluarkan"
+                           <Text style={[Styles.textDefault]}>{dataMemberChoose.isAdmin ? 'Memberhentikan sebagai admin' : 'Jadikan admin'}</Text>
-                  onPress={handleMemberOut}
+                        </View>
-               />
+                     </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='#19345E' />
+                     </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>
-
-         <ModalConfirmation
-            visible={showDeleteModal}
-            title="Konfirmasi"
-            message="Apakah anda yakin ingin mengeluarkan anggota?"
-            onConfirm={() => {
-               setShowDeleteModal(false)
-               memberOut()
-            }}
-            onCancel={() => setShowDeleteModal(false)}
-            confirmText="Keluar"
-            cancelText="Batal"
-         />
       </SafeAreaView>
    )
 }

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

@@ -6,7 +6,6 @@ import { InputDate } from "@/components/inputDate"
 import Styles from "@/constants/Styles"
 import { apiGetDivisionReport } from "@/lib/api"
 import { stringToDate } from "@/lib/fun_stringToDate"
-import { useTheme } from "@/providers/ThemeProvider"
 import { useAuthSession } from "@/providers/AuthProvider"
 import dayjs from "dayjs"
 import { router, Stack, useLocalSearchParams } from "expo-router"
@@ -15,7 +14,6 @@ import { SafeAreaView, ScrollView, View } from "react-native"
 import Toast from "react-native-toast-message"
 
 export default function ReportDivision() {
-   const { colors } = useTheme();
    const { id } = useLocalSearchParams<{ id: string }>()
    const { token, decryptToken } = useAuthSession();
    const [showReport, setShowReport] = useState(false);
@@ -94,11 +92,8 @@ export default function ReportDivision() {
          } else {
             Toast.show({ type: 'small', text1: response.message, });
          }
-      } catch (error: any) {
+      } catch (error) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal mengambil data"
-
-         Toast.show({ type: 'small', text1: message })
       }
    }
 
@@ -109,7 +104,7 @@ export default function ReportDivision() {
    }, [showReport]);
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -124,7 +119,7 @@ export default function ReportDivision() {
                )
             }}
          />
-         <ScrollView style={{ backgroundColor: colors.background }}>
+         <ScrollView>
             <View style={[Styles.p15, Styles.mb100]}>
                <InputDate
                   onChange={(val) => validationForm("date", val)}

app/(application)/division/create.tsx

@@ -1,4 +1,4 @@
-import ModalConfirmation from "@/components/ModalConfirmation";
+import AlertKonfirmasi from "@/components/alertKonfirmasi";
 import AppHeader from "@/components/AppHeader";
 import ButtonNextHeader from "@/components/buttonNextHeader";
 import { InputForm } from "@/components/inputForm";
@@ -8,7 +8,6 @@ import Styles from "@/constants/Styles";
 import { apiCheckDivisionName } from "@/lib/api";
 import { setFormCreateDivision } from "@/lib/divisionCreate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { router, Stack } from "expo-router";
 import { useEffect, useState } from "react";
 import { SafeAreaView, ScrollView, View } from "react-native";
@@ -16,7 +15,6 @@ import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function CreateDivision() {
-   const { colors } = useTheme();
    const { token, decryptToken } = useAuthSession()
    const [isSelect, setSelect] = useState(false)
    const [chooseGroup, setChooseGroup] = useState({ val: "", label: "" })
@@ -25,7 +23,6 @@ export default function CreateDivision() {
    const entityUser = useSelector((state: any) => state.user)
    const userLogin = useSelector((state: any) => state.entities)
    const [loadingBtn, setLoadingBtn] = useState(false)
-   const [showWarningModal, setShowWarningModal] = useState(false)
    const [error, setError] = useState({
       idGroup: false,
       name: false,
@@ -70,18 +67,21 @@ export default function CreateDivision() {
          const response = await apiCheckDivisionName({ data: { ...dataForm }, user: hasil })
          if (response.success) {
             if (!response.available) {
-               setShowWarningModal(true)
+               AlertKonfirmasi({
+                  title: 'Peringatan',
+                  category: 'warning',
+                  desc: 'Nama divisi sudah ada. Tidak dapat membuat divisi dengan nama yang sama',
+                  onPress: () => { }
+               })
             } else {
                handleSetData()
             }
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error: any) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         const message = error?.response?.data?.message || "Gagal menambahkan data"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoadingBtn(false)
       }
@@ -99,7 +99,7 @@ export default function CreateDivision() {
    }, []);
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => (
@@ -131,7 +131,7 @@ export default function CreateDivision() {
          />
          <ScrollView
             showsVerticalScrollIndicator={false}
-            style={[Styles.h100, { backgroundColor: colors.background }]}
+            style={[Styles.h100]}
          >
             <View style={[Styles.p15]}>
                {
@@ -179,15 +179,6 @@ export default function CreateDivision() {
             open={isSelect}
             valChoose={chooseGroup.val}
          />
-
-         <ModalConfirmation
-            visible={showWarningModal}
-            title="Peringatan"
-            message="Nama divisi sudah ada. Tidak dapat membuat divisi dengan nama yang sama"
-            onConfirm={() => setShowWarningModal(false)}
-            onCancel={() => setShowWarningModal(false)}
-            confirmText="Oke"
-         />
       </SafeAreaView>
    );
 }

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

@@ -8,7 +8,6 @@ import { apiCreateDivision } from "@/lib/api";
 import { setFormCreateDivision } from "@/lib/divisionCreate";
 import { setUpdateDivision } from "@/lib/divisionUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { AntDesign } from "@expo/vector-icons";
 import { StackActions, useNavigation } from "@react-navigation/native";
 import { router, Stack, useLocalSearchParams } from "expo-router";
@@ -24,7 +23,6 @@ type Props = {
 }
 
 export default function CreateDivisionAddAdmin() {
-   const { colors } = useTheme();
    const { token, decryptToken } = useAuthSession()
    const navigation = useNavigation()
    const { id } = useLocalSearchParams<{ id: string }>()
@@ -66,11 +64,9 @@ export default function CreateDivisionAddAdmin() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error : any ) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         const message = error?.response?.data?.message || "Gagal menambahkan data"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
@@ -108,7 +104,7 @@ export default function CreateDivisionAddAdmin() {
                )
             }}
          />
-         <View style={[Styles.p15, { flex: 1, backgroundColor: colors.background }]}>
+         <View style={[Styles.p15, { flex: 1 }]}>
             <ScrollView>
                {
                   data.length > 0 ?
@@ -117,7 +113,7 @@ export default function CreateDivisionAddAdmin() {
                         return (
                            <Pressable
                               key={index}
-                              style={[Styles.itemSelectModal, { borderBottomColor: colors.icon + '20' }]}
+                              style={[Styles.itemSelectModal]}
                               onPress={() => {
                                  !found && onChoose(item.idUser)
                               }}
@@ -127,12 +123,12 @@ export default function CreateDivisionAddAdmin() {
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode="tail">{item.name}</Text>
                                     {
-                                       found && <Text style={[Styles.textInformation, { color: colors.dimmed }]}>sudah menjadi anggota</Text>
+                                       found && <Text style={[Styles.textInformation, Styles.cGray]}>sudah menjadi anggota</Text>
                                     }
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i == item.idUser) && <AntDesign name="check" size={20} color={colors.text} />
+                                 selectMember.some((i: any) => i == item.idUser) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )

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

@@ -10,7 +10,6 @@ import { apiGetUser } from "@/lib/api";
 import { setFormCreateDivision } from "@/lib/divisionCreate";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign } from "@expo/vector-icons";
-import { useTheme } from "@/providers/ThemeProvider";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
 import { Pressable, ScrollView, View } from "react-native";
@@ -23,7 +22,6 @@ type Props = {
 }
 
 export default function CreateDivisionAddMember() {
-   const { colors } = useTheme();
    const { token, decryptToken } = useAuthSession()
    const { id } = useLocalSearchParams<{ id: string }>()
    const [dataOld, setDataOld] = useState<Props[]>([])
@@ -86,7 +84,7 @@ export default function CreateDivisionAddMember() {
                )
             }}
          />
-         <View style={[Styles.p15, { flex: 1, backgroundColor: colors.background }]}>
+         <View style={[Styles.p15, { flex: 1 }]}>
             <InputSearch onChange={(val) => setSearch(val)} value={search} />
 
             {
@@ -108,7 +106,7 @@ export default function CreateDivisionAddMember() {
                   </View>
 
                   :
-                  <Text style={[Styles.textDefault, Styles.pv05, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada member yang dipilih</Text>
+                  <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
             }
             <ScrollView
                showsVerticalScrollIndicator={false}
@@ -121,7 +119,7 @@ export default function CreateDivisionAddMember() {
                         return (
                            <Pressable
                               key={index}
-                              style={[Styles.itemSelectModal, { borderBottomColor: colors.icon + '20' }]}
+                              style={[Styles.itemSelectModal]}
                               onPress={() => {
                                  !found && onChoose(item.id, item.name, item.img)
                               }}
@@ -131,12 +129,12 @@ export default function CreateDivisionAddMember() {
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode="tail">{item.name}</Text>
                                     {
-                                       found && <Text style={[Styles.textInformation, { color: colors.dimmed }]}>sudah menjadi anggota</Text>
+                                       found && <Text style={[Styles.textInformation, Styles.cGray]}>sudah menjadi anggota</Text>
                                     }
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={colors.text} />
+                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )

app/(application)/division/index.tsx

@@ -6,21 +6,19 @@ import PaperGridContent from "@/components/paperGridContent";
 import Skeleton from "@/components/skeleton";
 import SkeletonTwoItem from "@/components/skeletonTwoItem";
 import Text from "@/components/Text";
-import WrapTab from "@/components/wrapTab";
+import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
 import { apiGetDivision } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import {
    AntDesign,
    Feather,
    Ionicons,
-   MaterialCommunityIcons
+   MaterialCommunityIcons,
+   MaterialIcons,
 } from "@expo/vector-icons";
-import AsyncStorage from "@react-native-async-storage/async-storage";
-import { useInfiniteQuery, useQueryClient } from "@tanstack/react-query";
 import { router, useLocalSearchParams } from "expo-router";
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useState } from "react";
 import { Pressable, RefreshControl, View, VirtualizedList } from "react-native";
 import { useSelector } from "react-redux";
 
@@ -38,39 +36,25 @@ export default function ListDivision() {
       cat?: string;
    }>();
    const [isList, setList] = useState(false);
-
-   useEffect(() => {
-      AsyncStorage.getItem('division_view_mode').then((val) => {
-         if (val !== null) setList(val === 'list')
-      })
-   }, [])
-
-   function toggleView() {
-      const next = !isList
-      setList(next)
-      AsyncStorage.setItem('division_view_mode', next ? 'list' : 'grid')
-   }
    const entityUser = useSelector((state: any) => state.user)
    const { token, decryptToken } = useAuthSession()
-   const { colors } = useTheme();
    const [search, setSearch] = useState("")
-   const queryClient = useQueryClient()
+   const [nameGroup, setNameGroup] = useState("")
-   const [status, setStatus] = useState<'true' | 'false'>(active == 'false' ? 'false' : 'true')
+   const [data, setData] = useState<Props[]>([])
-   const [category, setCategory] = useState<'divisi-saya' | 'semua'>(cat == 'semua' ? 'semua' : 'divisi-saya')
    const update = useSelector((state: any) => state.divisionUpdate)
+   const arrSkeleton = Array.from({ length: 3 }, (_, index) => index)
+   const [loading, setLoading] = useState(false)
+   const [status, setStatus] = useState<'true' | 'false'>('true')
+   const [category, setCategory] = useState<'divisi-saya' | 'semua'>('divisi-saya')
+   const [page, setPage] = useState(1)
+   const [waiting, setWaiting] = useState(false)
    const [refreshing, setRefreshing] = useState(false)
 
-   // TanStack Query for Divisions with Infinite Scroll
+   async function handleLoad(loading: boolean, thisPage: number) {
-   const {
+      try {
-      data,
+         setWaiting(true)
-      fetchNextPage,
+         setLoading(loading)
-      hasNextPage,
+         setPage(thisPage)
-      isFetchingNextPage,
-      isLoading,
-      refetch
-   } = useInfiniteQuery({
-      queryKey: ['divisions', { status, search, group, category }],
-      queryFn: async ({ pageParam = 1 }) => {
          const hasil = await decryptToken(String(token?.current));
          const response = await apiGetDivision({
             user: hasil,
@@ -78,61 +62,63 @@ export default function ListDivision() {
             search: search,
             group: String(group),
             kategori: category,
-            page: pageParam
+            page: thisPage
          });
-         return response;
-      },
-      initialPageParam: 1,
-      getNextPageParam: (lastPage, allPages) => {
-         return lastPage.data.length > 0 ? allPages.length + 1 : undefined;
-      },
-      enabled: !!token?.current,
-      staleTime: 0,
-   })
 
-   // Refetch when manual update state changes
+         if (response.success) {
+            if (thisPage == 1) {
+               setData(response.data);
+            } else if (thisPage > 1 && response.data.length > 0) {
+               setData([...data, ...response.data]);
+            } else {
+               return;
+            }
+            setNameGroup(response.filter.name);
+         }
+      } catch (error) {
+         console.error(error);
+      } finally {
+         setLoading(false)
+         setWaiting(false)
+      }
+   }
+
    useEffect(() => {
-      refetch()
+      handleLoad(false, 1);
-   }, [update, refetch])
+   }, [update]);
 
-   // Flatten pages into a single data array
+   useEffect(() => {
-   const flatData = useMemo(() => {
+      handleLoad(true, 1);
-      return data?.pages.flatMap(page => page.data) || [];
+   }, [status, search, group, category]);
-   }, [data])
 
-   // Get nameGroup from the first available page
+   const loadMoreData = () => {
-   const nameGroup = useMemo(() => {
+      if (waiting) return
-      return data?.pages[0]?.filter?.name || "";
+      setTimeout(() => {
-   }, [data])
+         handleLoad(false, page + 1)
+      }, 1000);
+   };
 
    const handleRefresh = async () => {
       setRefreshing(true)
-      await queryClient.invalidateQueries({ queryKey: ['divisions'] })
+      handleLoad(false, 1)
+      await new Promise(resolve => setTimeout(resolve, 2000));
       setRefreshing(false)
    };
 
-   const loadMoreData = () => {
-      if (hasNextPage && !isFetchingNextPage) {
-         fetchNextPage()
-      }
-   };
-
-   const arrSkeleton = [0, 1, 2]
-
    const getItem = (_data: unknown, index: number): Props => ({
-      id: flatData[index]?.id,
+      id: data[index].id,
-      name: flatData[index]?.name,
+      name: data[index].name,
-      desc: flatData[index]?.desc,
+      desc: data[index].desc,
-      jumlah_member: flatData[index]?.jumlah_member,
+      jumlah_member: data[index].jumlah_member,
    })
 
 
    return (
-      <View style={[Styles.p15, { flex: 1, backgroundColor: colors.background }]}>
+      <View style={[Styles.p15, { flex: 1 }]}>
          <View>
             {
                entityUser.role != "user" && entityUser.role != "coadmin" ?
-                  <WrapTab>
+                  <View style={[Styles.wrapBtnTab]}>
                      <ButtonTab
                         active={status == "false" ? "false" : "true"}
                         value="true"
@@ -141,7 +127,7 @@ export default function ListDivision() {
                         icon={
                            <Feather
                               name="check-circle"
-                              color={status == "false" ? colors.dimmed : "white"}
+                              color={status == "false" ? "black" : "white"}
                               size={20}
                            />
                         }
@@ -155,15 +141,15 @@ export default function ListDivision() {
                         icon={
                            <AntDesign
                               name="closecircleo"
-                              color={status == "true" ? colors.dimmed : "white"}
+                              color={status == "true" ? "black" : "white"}
                               size={20}
                            />
                         }
                         n={2}
                      />
-                  </WrapTab>
+                  </View>
                   :
-                  <WrapTab>
+                  <View style={[Styles.wrapBtnTab]}>
                      <ButtonTab
                         active={category == "semua" ? "false" : "true"}
                         value="true"
@@ -172,7 +158,7 @@ export default function ListDivision() {
                         icon={
                            <Ionicons
                               name="file-tray-outline"
-                              color={category == "semua" ? colors.dimmed : "white"}
+                              color={category == "semua" ? "black" : "white"}
                               size={20}
                            />
                         }
@@ -186,35 +172,39 @@ export default function ListDivision() {
                         icon={
                            <Ionicons
                               name="file-tray-stacked-outline"
-                              color={category == "semua" ? "white" : colors.dimmed}
+                              color={category == "semua" ? "white" : "black"}
                               size={20}
                            />
                         }
                         n={2}
                      />
-                  </WrapTab>
+                  </View>
             }
 
             <View style={[Styles.rowSpaceBetween, { alignItems: 'center' }]}>
                <InputSearch width={68} onChange={setSearch} />
-               <Pressable onPress={toggleView}>
+               <Pressable
+                  onPress={() => {
+                     setList(!isList);
+                  }}
+               >
                   <MaterialCommunityIcons
                      name={isList ? "format-list-bulleted" : "view-grid"}
-                     color={colors.text}
+                     color={"black"}
                      size={30}
                   />
                </Pressable>
             </View>
             {(entityUser.role == "supadmin" || entityUser.role == "developer") && (
-               <View style={[Styles.mt10, Styles.rowOnly]}>
+               <View style={[Styles.mv05, Styles.rowOnly]}>
                   <Text>Filter :</Text>
                   <LabelStatus size="small" category="secondary" text={nameGroup} style={[Styles.mh05]} />
                </View>
             )}
          </View>
-         <View style={[{ flex: 2 }, Styles.mt10]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
-               isLoading ?
+               loading ?
                   isList ?
                      arrSkeleton.map((item, index) => (
                         <SkeletonTwoItem key={index} />
@@ -224,17 +214,17 @@ export default function ListDivision() {
                         <Skeleton key={index} width={100} height={180} widthType="percent" borderRadius={10} />
                      ))
                   :
-                  flatData.length == 0 ? (
+                  data.length == 0 ? (
                      <View style={[Styles.mt15]}>
-                        <Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada data</Text>
+                        <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
                      </View>
                   ) : (
                      isList ? (
                         <View style={[Styles.h100]}>
                            <VirtualizedList
-                              data={flatData}
+                              data={data}
                               style={[{ paddingBottom: 100 }]}
-                              getItemCount={() => flatData.length}
+                              getItemCount={() => data.length}
                               getItem={getItem}
                               renderItem={({ item, index }: { item: Props, index: number }) => {
                                  return (
@@ -242,13 +232,13 @@ export default function ListDivision() {
                                        key={index}
                                        onPress={() => { router.push(`/division/${item.id}`) }}
                                        borderType="bottom"
-                                       bgColor="transparent"
                                        icon={
-                                          <View style={[Styles.iconContent]}>
+                                          <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                                             <Feather name="users" size={25} color={'black'} />
+                                             <MaterialIcons name="group" size={25} color={"#384288"} />
                                           </View>
                                        }
                                        title={item.name}
+                                       titleWeight="normal"
                                     />
                                  )
                               }}
@@ -260,7 +250,6 @@ export default function ListDivision() {
                                  <RefreshControl
                                     refreshing={refreshing}
                                     onRefresh={handleRefresh}
-                                    tintColor={colors.icon}
                                  />
                               }
                            />
@@ -268,9 +257,9 @@ export default function ListDivision() {
                      ) : (
                         <View style={[Styles.h100]}>
                            <VirtualizedList
-                              data={flatData}
+                              data={data}
                               style={[{ paddingBottom: 100 }]}
-                              getItemCount={() => flatData.length}
+                              getItemCount={() => data.length}
                               getItem={getItem}
                               renderItem={({ item, index }: { item: Props, index: number }) => {
                                  return (
@@ -296,7 +285,6 @@ export default function ListDivision() {
                                  <RefreshControl
                                     refreshing={refreshing}
                                     onRefresh={handleRefresh}
-                                    tintColor={colors.icon}
                                  />
                               }
                            />

app/(application)/division/report.tsx

@@ -9,7 +9,6 @@ import Styles from "@/constants/Styles";
 import { apiGetDivisionReport } from "@/lib/api";
 import { stringToDate } from "@/lib/fun_stringToDate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import dayjs from "dayjs";
 import { router, Stack } from "expo-router";
 import { useEffect, useState } from "react";
@@ -17,7 +16,6 @@ import { SafeAreaView, ScrollView, View } from "react-native";
 import Toast from "react-native-toast-message";
 
 export default function Report() {
-   const { colors } = useTheme();
    const { token, decryptToken } = useAuthSession();
    const [chooseGroup, setChooseGroup] = useState({ val: "", label: "" });
    const [showReport, setShowReport] = useState(false);
@@ -112,11 +110,8 @@ export default function Report() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error: any) {
+      } catch (error) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal mengambil data"
-
-         Toast.show({ type: 'small', text1: message })
       }
    }
 
@@ -127,7 +122,7 @@ export default function Report() {
    }, [showReport]);
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => (
@@ -149,11 +144,11 @@ export default function Report() {
          />
          <ScrollView
             showsVerticalScrollIndicator={false}
-            style={[Styles.h100, { backgroundColor: colors.background }]}
+            style={[Styles.h100]}
          >
             <View style={[Styles.p15, Styles.mb50]}>
                <SelectForm
-                  bg={colors.card}
+                  bg="white"
                   label="Lembaga Desa"
                   placeholder="Pilih Lembaga Desa"
                   value={chooseGroup.label}

app/(application)/edit-profile.tsx

@@ -1,4 +1,4 @@
-import AppHeader from "@/components/AppHeader";
+import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
 import ModalSelect from "@/components/modalSelect";
@@ -10,7 +10,6 @@ import { apiEditProfile, apiGetProfile } from "@/lib/api";
 import { setEntities } from "@/lib/entitiesSlice";
 import { validateName } from "@/lib/fun_validateName";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { MaterialCommunityIcons } from "@expo/vector-icons";
 import { useHeaderHeight } from "@react-navigation/elements";
 import * as ImagePicker from "expo-image-picker";
@@ -44,11 +43,9 @@ type Props = {
 export default function EditProfile() {
    const headerHeight = useHeaderHeight()
    const dispatch = useDispatch()
-   const { colors } = useTheme();
    const entities = useSelector((state: any) => state.entities)
    const { token, decryptToken } = useAuthSession()
    const [errorImg, setErrorImg] = useState(false)
-   // ... keeping state same ...
    const [selectedImage, setSelectedImage] = useState<string | undefined | { uri: string }>(undefined);
    const [choosePosition, setChoosePosition] = useState({ val: entities.idPosition, label: entities.position });
    const [chooseGender, setChooseGender] = useState({ val: entities.gender, label: entities.gender == "F" ? 'Perempuan' : 'Laki-laki' });
@@ -188,14 +185,9 @@ export default function EditProfile() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error: any) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         const message = error?.response?.data?.message || "Gagal mengupdate data"
+         Toast.show({ type: 'small', text1: 'Gagal mengupdate data', })
-
-         Toast.show({
-            type: 'small',
-            text1: message
-         })
       } finally {
          setLoading(false)
       }
@@ -221,43 +213,27 @@ export default function EditProfile() {
    };
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
-               // headerLeft: () => (
+               headerLeft: () => (
-               //    <ButtonBackHeader
+                  <ButtonBackHeader
-               //       onPress={() => {
+                     onPress={() => {
-               //          router.back();
+                        router.back();
-               //       }}
+                     }}
-               //    />
+                  />
-               // ),
+               ),
                headerTitle: "Edit Profile",
                headerTitleAlign: "center",
-               header: () => (
+               headerRight: () => (
-                  <AppHeader
+                  <ButtonSaveHeader
-                     title="Edit Profile"
+                     disable={disableBtn || loading ? true : false}
-                     showBack={true}
+                     category="update"
-                     onPressLeft={() => router.back()}
+                     onPress={() => {
-                     right={
+                        handleEdit()
-                        <ButtonSaveHeader
+                     }}
-                           disable={disableBtn || loading ? true : false}
-                           category="update"
-                           onPress={() => {
-                              handleEdit()
-                           }}
-                        />
-                     }
                   />
-               )
+               ),
-               // headerRight: () => (
-               //    <ButtonSaveHeader
-               //       disable={disableBtn || loading ? true : false}
-               //       category="update"
-               //       onPress={() => {
-               //          handleEdit()
-               //       }}
-               //    />
-               // ),
             }}
          />
          <KeyboardAvoidingView
@@ -267,7 +243,7 @@ export default function EditProfile() {
          >
             <ScrollView showsVerticalScrollIndicator={false}>
                <View style={[Styles.p15]}>
-                  <View style={[Styles.contentItemCenter]}>
+                  <View style={{ justifyContent: "center", alignItems: "center" }}>
                      {
                         selectedImage != undefined ? (
                            <Pressable onPress={pickImageAsync}>

app/(application)/feature.tsx

@@ -1,18 +1,16 @@
 import AppHeader from "@/components/AppHeader";
 import { ButtonFiturMenu } from "@/components/buttonFiturMenu";
 import Styles from "@/constants/Styles";
-import { useTheme } from "@/providers/ThemeProvider";
+import { AntDesign, Entypo, Ionicons, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons";
-import { AntDesign, Entypo, Feather, Ionicons, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons";
 import { router, Stack } from "expo-router";
 import { SafeAreaView, View } from "react-native";
 import { useSelector } from "react-redux";
 
 export default function Feature() {
    const entityUser = useSelector((state: any) => state.user)
-   const { colors } = useTheme();
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                headerTitle: 'Fitur',
@@ -23,25 +21,33 @@ export default function Feature() {
             }}
          />
          <View style={[Styles.p15]}>
-            <View style={{ flexDirection: 'row', flexWrap: 'wrap', rowGap: 20 }}>
+            <View style={[Styles.rowSpaceBetween, Styles.mb15]}>
-               <ButtonFiturMenu icon={<Feather name="users" size={30} color={colors.icon} />} text="Divisi" onPress={() => { router.push('/division?active=true') }} />
+               <ButtonFiturMenu icon={<MaterialIcons name="group" size={35} color="black" />} text="Divisi" onPress={() => { router.push('/division?active=true') }} />
-               <ButtonFiturMenu icon={<Feather name="bar-chart" size={30} color={colors.icon} />} text="Kegiatan" onPress={() => { router.push('/project?status=0') }} />
+               <ButtonFiturMenu icon={<AntDesign name="areachart" size={35} color="black" />} text="Kegiatan" onPress={() => { router.push('/project?status=0') }} />
-               <ButtonFiturMenu icon={<Ionicons name="megaphone-outline" size={30} color={colors.icon} />} text="Pengumuman" onPress={() => { router.push('/announcement') }} />
+               <ButtonFiturMenu icon={<MaterialIcons name="campaign" size={35} color="black" />} text="Pengumuman" onPress={() => { router.push('/announcement') }} />
-               <ButtonFiturMenu icon={<Ionicons name="chatbubbles-outline" size={30} color={colors.icon} />} text="Diskusi" onPress={() => { router.push('/discussion?active=true') }} />
+               <ButtonFiturMenu icon={<Ionicons name="chatbubbles-sharp" size={35} color="black" />} text="Diskusi" onPress={() => { router.push('/discussion?active=true') }} />
-               <ButtonFiturMenu icon={<Feather name="calendar" size={30} color={colors.icon} />} text="Kalender" onPress={() => { router.push('/village-calendar') }} />
+            </View>
-               <ButtonFiturMenu icon={<MaterialCommunityIcons name="account-group-outline" size={30} color={colors.icon} />} text="Anggota" onPress={() => { router.push('/member') }} />
+            <View style={[Styles.rowSpaceBetween, Styles.mb15, (entityUser.role == 'cosupadmin' ? Styles.w70 : entityUser.role == 'supadmin' || entityUser.role == 'developer' ? Styles.w100 : Styles.w40)]}>
-               <ButtonFiturMenu icon={<MaterialCommunityIcons name="account-tie-outline" size={30} color={colors.icon} />} text="Jabatan" onPress={() => { router.push('/position') }} />
+               <ButtonFiturMenu icon={<MaterialIcons name="groups" size={35} color="black" />} text="Anggota" onPress={() => { router.push('/member') }} />
+               <ButtonFiturMenu icon={<MaterialCommunityIcons name="account-tie" size={35} color="black" />} text="Jabatan" onPress={() => { router.push('/position') }} />
                {
-                  entityUser.role == "cosupadmin" && <ButtonFiturMenu icon={<Ionicons name="images-outline" size={30} color={colors.icon} />} text="Banner" onPress={() => { router.push('/banner') }} />
+                  entityUser.role == "cosupadmin" && <ButtonFiturMenu icon={<Entypo name="image-inverted" size={35} color="black" />} text="Banner" onPress={() => { router.push('/banner') }} />
                }
                {
                   (entityUser.role == "supadmin" || entityUser.role == "developer") &&
                   <>
-                     <ButtonFiturMenu icon={<Ionicons name="bookmarks-outline" size={30} color={colors.icon} />} text="Lembaga Desa" onPress={() => { router.push('/group') }} />
+                     <ButtonFiturMenu icon={<AntDesign name="tags" size={35} color="black" />} text="Lembaga Desa" onPress={() => { router.push('/group') }} />
-                     <ButtonFiturMenu icon={<Ionicons name="images-outline" size={30} color={colors.icon} />} text="Banner" onPress={() => { router.push('/banner') }} />
+                     {/* <ButtonFiturMenu icon={<Ionicons name="color-palette-sharp" size={35} color="black" />} text="Tema" onPress={() => { }} /> */}
+                     <ButtonFiturMenu icon={<Entypo name="image-inverted" size={35} color="black" />} text="Banner" onPress={() => { router.push('/banner') }} />
                   </>
                }
             </View>
+            {/* {
+               (entityUser.role == "supadmin" || entityUser.role == "developer") &&
+               <View style={[Styles.rowSpaceBetween, Styles.mb15]}>
+                  <ButtonFiturMenu icon={<Entypo name="image-inverted" size={35} color="black" />} text="Banner" onPress={() => { router.push('/banner') }} />
+               </View>
+            } */}
          </View>
       </SafeAreaView>
    )

app/(application)/group/index.tsx

@@ -1,5 +1,4 @@
-import GuideOverlay from "@/components/GuideOverlay";
+import AlertKonfirmasi from "@/components/alertKonfirmasi";
-import ModalConfirmation from "@/components/ModalConfirmation";
 import BorderBottomItem from "@/components/borderBottomItem";
 import { ButtonForm } from "@/components/buttonForm";
 import ButtonTab from "@/components/buttonTab";
@@ -9,17 +8,13 @@ import InputSearch from "@/components/inputSearch";
 import MenuItemRow from "@/components/menuItemRow";
 import SkeletonTwoItem from "@/components/skeletonTwoItem";
 import Text from "@/components/Text";
-import WrapTab from "@/components/wrapTab";
+import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
 import { apiDeleteGroup, apiEditGroup, apiGetGroup } from "@/lib/api";
 import { setUpdateGroup } from "@/lib/groupSlice";
-import { GUIDE_GROUP } from "@/lib/guideSteps";
-import { useGuide } from "@/lib/useGuide";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
+import { AntDesign, Feather, MaterialCommunityIcons } from "@expo/vector-icons";
-import { AntDesign, Feather, Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
+import { useEffect, useState } from "react";
-import { useQuery, useQueryClient } from "@tanstack/react-query";
-import { useEffect, useMemo, useState } from "react";
 import { RefreshControl, View, VirtualizedList } from "react-native";
 import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
@@ -32,19 +27,18 @@ type Props = {
 
 export default function Index() {
    const { token, decryptToken } = useAuthSession()
-   const { colors } = useTheme();
    const [isModal, setModal] = useState(false)
    const [isVisibleEdit, setVisibleEdit] = useState(false)
+   const [data, setData] = useState<Props[]>([])
    const [search, setSearch] = useState('')
-   const [showDeleteModal, setShowDeleteModal] = useState(false)
+   const arrSkeleton = Array.from({ length: 5 }, (_, index) => index)
+   const [loading, setLoading] = useState(true)
    const [status, setStatus] = useState<'true' | 'false'>('true')
    const [loadingSubmit, setLoadingSubmit] = useState(false)
    const [idChoose, setIdChoose] = useState('')
    const [activeChoose, setActiveChoose] = useState(true)
    const [titleChoose, setTitleChoose] = useState('')
-   const queryClient = useQueryClient()
    const [refreshing, setRefreshing] = useState(false)
-   const { visible: guideVisible, dismiss: dismissGuide } = useGuide('group')
 
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.groupUpdate)
@@ -52,38 +46,12 @@ export default function Index() {
       title: false,
    });
 
-   // TanStack Query for Groups
-   const {
-      data: queryData,
-      isLoading,
-      refetch
-   } = useQuery({
-      queryKey: ['groups', { status, search }],
-      queryFn: async () => {
-         const hasil = await decryptToken(String(token?.current))
-         const response = await apiGetGroup({ 
-            user: hasil, 
-            active: status, 
-            search: search 
-         })
-         return response;
-      },
-      enabled: !!token?.current,
-      staleTime: 0,
-   })
-
-   const data = useMemo(() => queryData?.data || [], [queryData])
-
-   useEffect(() => {
-      refetch()
-   }, [update, refetch])
 
    async function handleEdit() {
       try {
          setLoadingSubmit(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiEditGroup({ user: hasil, name: titleChoose }, idChoose)
-         await queryClient.invalidateQueries({ queryKey: ['groups'] })
          dispatch(setUpdateGroup(!update))
       } catch (error) {
          console.error(error)
@@ -100,7 +68,6 @@ export default function Index() {
       try {
          const hasil = await decryptToken(String(token?.current))
          const response = await apiDeleteGroup({ user: hasil, isActive: activeChoose }, idChoose)
-         await queryClient.invalidateQueries({ queryKey: ['groups'] })
          dispatch(setUpdateGroup(!update))
       } catch (error) {
          console.error(error)
@@ -110,9 +77,32 @@ export default function Index() {
       }
    }
 
+   async function handleLoad(loading: boolean) {
+      try {
+         setLoading(loading)
+         const hasil = await decryptToken(String(token?.current))
+         const response = await apiGetGroup({ user: hasil, active: status, search: search })
+         setData(response.data)
+      } catch (error) {
+         console.error(error)
+      } finally {
+         setLoading(false)
+
+      }
+   }
+
+   useEffect(() => {
+      handleLoad(false)
+   }, [update])
+
+   useEffect(() => {
+      handleLoad(true)
+   }, [status, search])
+
    const handleRefresh = async () => {
       setRefreshing(true)
-      await queryClient.invalidateQueries({ queryKey: ['groups'] })
+      handleLoad(false)
+      await new Promise(resolve => setTimeout(resolve, 2000));
       setRefreshing(false)
    };
 
@@ -136,33 +126,30 @@ export default function Index() {
 
 
 
-   const arrSkeleton = [0, 1, 2, 3, 4]
-
    return (
-      <View style={[Styles.p15, { flex: 1, backgroundColor: colors.background }]}>
+      <View style={[Styles.p15, { flex: 1 }]}>
-         <GuideOverlay visible={guideVisible} steps={GUIDE_GROUP} onDismiss={dismissGuide} />
          <View style={[Styles.mb10]}>
-            <WrapTab>
+            <View style={[Styles.wrapBtnTab]}>
                <ButtonTab
                   active={status == "false" ? "false" : "true"}
                   value="true"
                   onPress={() => { setStatus("true") }}
                   label="Aktif"
-                  icon={<Feather name="check-circle" color={status == "true" ? 'white' : colors.dimmed} size={20} />}
+                  icon={<Feather name="check-circle" color={status == "true" ? 'white' : 'black'} size={20} />}
                   n={2} />
                <ButtonTab
                   active={status == "false" ? "false" : "true"}
                   value="false"
                   onPress={() => { setStatus("false") }}
                   label="Tidak Aktif"
-                  icon={<AntDesign name="closecircleo" color={status == "false" ? 'white' : colors.dimmed} size={20} />}
+                  icon={<AntDesign name="closecircleo" color={status == "false" ? 'white' : 'black'} size={20} />}
                   n={2} />
-            </WrapTab>
+            </View>
             <InputSearch onChange={setSearch} />
          </View>
-         <View style={[{ flex: 2 }, Styles.mt10]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
-               isLoading ?
+               loading ?
                   arrSkeleton.map((item, index) => {
                      return (
                         <SkeletonTwoItem key={index} />
@@ -186,8 +173,8 @@ export default function Index() {
                                  }}
                                  borderType="all"
                                  icon={
-                                    <View style={[Styles.iconContent]}>
+                                    <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                                       <Ionicons name="bookmark-outline" size={25} color={'black'} />
+                                       <MaterialCommunityIcons name="office-building-outline" size={25} color={'#384288'} />
                                     </View>
                                  }
                                  title={item.name}
@@ -200,29 +187,30 @@ export default function Index() {
                            <RefreshControl
                               refreshing={refreshing}
                               onRefresh={handleRefresh}
-                              tintColor={colors.icon}
                            />
                         }
                      />
                      :
-                     <Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada data</Text>
+                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
             }
          </View>
 
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={() => setModal(false)} title={titleChoose}>
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<MaterialCommunityIcons name="toggle-switch-off-outline" color={colors.text} size={25} />}
+                  icon={<MaterialCommunityIcons name="toggle-switch-off-outline" color="black" size={25} />}
                   title={activeChoose ? "Non Aktifkan" : "Aktifkan"}
                   onPress={() => {
                      setModal(false)
-                     setTimeout(() => {
+                     AlertKonfirmasi({
-                        setShowDeleteModal(true)
+                        title: 'Konfirmasi',
-                     }, 600)
+                        desc: activeChoose ? 'Apakah anda yakin ingin menonaktifkan data?' : 'Apakah anda yakin ingin mengaktifkan data?',
+                        onPress: () => { handleDelete() }
+                     })
                   }}
                />
                <MenuItemRow
-                  icon={<MaterialCommunityIcons name="pencil-outline" color={colors.text} size={25} />}
+                  icon={<MaterialCommunityIcons name="pencil-outline" color="black" size={25} />}
                   title="Edit"
                   onPress={() => {
                      setModal(false)
@@ -244,7 +232,6 @@ export default function Index() {
                      label="Lembaga Desa"
                      value={titleChoose}
                      error={error.title}
-                     bg={"transparent"}
                      errorText="Lembaga Desa tidak boleh kosong & minimal 3 karakter"
                      onChange={(val) => { validationForm(val, 'title') }} />
                </View>
@@ -253,19 +240,6 @@ export default function Index() {
                </View>
             </View>
          </DrawerBottom>
-
-         <ModalConfirmation
-            visible={showDeleteModal}
-            title="Konfirmasi"
-            message={activeChoose ? 'Apakah anda yakin ingin menonaktifkan data?' : 'Apakah anda yakin ingin mengaktifkan data?'}
-            onConfirm={() => {
-               setShowDeleteModal(false)
-               handleDelete()
-            }}
-            onCancel={() => setShowDeleteModal(false)}
-            confirmText={activeChoose ? "Nonaktifkan" : "Aktifkan"}
-            cancelText="Batal"
-         />
       </View >
 
    )

app/(application)/home.tsx

@@ -1,9 +1,10 @@
-import CaraouselHome2 from "@/components/home/carouselHome2";
+import CaraouselHome from "@/components/home/carouselHome";
 import ChartDokumenHome from "@/components/home/chartDokumenHome";
 import ChartProgresHome from "@/components/home/chartProgresHome";
 import DisccussionHome from "@/components/home/discussionHome";
 import DivisionHome from "@/components/home/divisionHome";
 import EventHome from "@/components/home/eventHome";
+import FiturHome from "@/components/home/fiturHome";
 import { HeaderRightHome } from "@/components/home/headerRightHome";
 import ProjectHome from "@/components/home/projectHome";
 import Text from "@/components/Text";
@@ -11,12 +12,9 @@ import Styles from "@/constants/Styles";
 import { apiGetProfile } from "@/lib/api";
 import { setEntities } from "@/lib/entitiesSlice";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
-import { useQuery, useQueryClient } from "@tanstack/react-query";
-import { LinearGradient } from "expo-linear-gradient";
 import { Stack } from "expo-router";
 import { useEffect, useState } from "react";
-import { Alert, Dimensions, Platform, RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
+import { Platform, RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useDispatch, useSelector } from "react-redux";
 
@@ -24,77 +22,38 @@ import { useDispatch, useSelector } from "react-redux";
 export default function Home() {
    const entities = useSelector((state: any) => state.entities)
    const dispatch = useDispatch()
-   const queryClient = useQueryClient()
    const { token, decryptToken, signOut } = useAuthSession()
-   const { colors } = useTheme();
    const insets = useSafeAreaInsets()
    const [refreshing, setRefreshing] = useState(false)
 
-   const { data: profile, isError } = useQuery({
-      queryKey: ['profile'],
-      queryFn: async () => {
-         const hasil = await decryptToken(String(token?.current))
-         const data = await apiGetProfile({ id: hasil })
-         return data.data
-      },
-      enabled: !!token?.current,
-      staleTime: 0, // Ensure it refetches every time the component mounts
-   })
-
-   // Sync to Redux for global usage
    useEffect(() => {
-      if (profile) {
+      handleUserLogin()
-         dispatch(setEntities(profile))
+   }, [dispatch]);
-      }
-   }, [profile, dispatch])
 
-   // Auto Sign Out if profile fetch fails (e.g. invalid/expired token)
+   async function handleUserLogin() {
-   useEffect(() => {
+      const hasil = await decryptToken(String(token?.current))
-      if (isError) {
+      apiGetProfile({ id: hasil })
-         signOut()
+         .then((data) => dispatch(setEntities(data.data)))
-      }
+         .catch((error) => {
-   }, [isError, signOut])
+            signOut()
-
+         });
-   useEffect(() => {
+   }
-      if (profile && profile.isActive === false) {
-         Alert.alert(
-            'Akun Dinonaktifkan',
-            'Akun kamu telah dinonaktifkan. Silahkan hubungi admin untuk informasi lebih lanjut.',
-            [{ text: 'OK', onPress: signOut }]
-         )
-      }
-   }, [profile, signOut])
-
-   useEffect(() => {
-      if (profile && profile.villageIsActive === false) {
-         Alert.alert(
-            'Desa Dinonaktifkan',
-            'Desa kamu saat ini telah dinonaktifkan. Silahkan hubungi pengelola sistem untuk informasi lebih lanjut.',
-            [{ text: 'OK', onPress: signOut }]
-         )
-      }
-   }, [profile, signOut])
 
    const handleRefresh = async () => {
       setRefreshing(true)
-      // Invalidate all queries related to the home screen
+      handleUserLogin()
-      await queryClient.invalidateQueries({ queryKey: ['profile'] })
+      await new Promise(resolve => setTimeout(resolve, 2000));
-      await queryClient.invalidateQueries({ queryKey: ['banners'] })
-      await queryClient.invalidateQueries({ queryKey: ['homeData'] })
-
-      // Artificial delay to show refresh indicator if sync is too fast
-      await new Promise(resolve => setTimeout(resolve, 1000));
       setRefreshing(false)
    };
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                title: 'Home',
                headerTitle: entities.village,
                header: () => (
-                  <View style={[Styles.rowItemsCenter, Styles.ph20, Platform.OS === 'ios' ? Styles.pb07 : Styles.pb13, { backgroundColor: colors.header, paddingTop: Platform.OS === 'ios' ? insets.top : 10 }]}>
+                  <View style={[Styles.rowItemsCenter, Styles.ph20, Platform.OS === 'ios' ? Styles.pb07 : Styles.pb13, { backgroundColor: '#19345E', paddingTop: Platform.OS === 'ios' ? insets.top : 10 }]}>
                      <Text style={Styles.textHeaderHome}>{entities.village}</Text>
                      <HeaderRightHome />
                   </View>
@@ -106,36 +65,19 @@ export default function Home() {
                <RefreshControl
                   refreshing={refreshing}
                   onRefresh={handleRefresh}
-                  tintColor={colors.icon}
                />
             }
             showsVerticalScrollIndicator={false}
-            style={[Styles.h100, { backgroundColor: colors.background }]}
          >
-            <LinearGradient
+            <CaraouselHome refreshing={refreshing}/>
-               colors={[colors.header, colors.header, colors.header, colors.header, colors.homeGradient]}
+            <View style={[Styles.ph15, Styles.mb100]}>
-               style={[
+               <FiturHome />
-                  Styles.posAbsolute,
+               <ProjectHome refreshing={refreshing}/>
-                  Styles.zIndexMinus1,
+               <DivisionHome refreshing={refreshing}/>
-                  {
+               <ChartProgresHome refreshing={refreshing}/>
-                     width: Dimensions.get('window').width * 1.5,
+               <ChartDokumenHome refreshing={refreshing}/>
-                     height: Dimensions.get('window').width * 1.5,
+               <EventHome refreshing={refreshing}/>
-                     borderRadius: Dimensions.get('window').width * 0.5,
+               <DisccussionHome refreshing={refreshing}/>
-                     top: -Dimensions.get('window').width * 1, // Positioned to show the bottom part of the circle as an arc
-                     left: -Dimensions.get('window').width * 0.25,
-                  }
-               ]}
-            />
-            {/* <CaraouselHome refreshing={refreshing} /> */}
-            <View style={[Styles.ph15]}>
-               <CaraouselHome2 refreshing={refreshing} />
-               {/* <FiturHome /> */}
-               <ProjectHome refreshing={refreshing} />
-               <DivisionHome refreshing={refreshing} />
-               <ChartProgresHome refreshing={refreshing} />
-               <ChartDokumenHome refreshing={refreshing} />
-               <EventHome refreshing={refreshing} />
-               <DisccussionHome refreshing={refreshing} />
             </View>
          </ScrollView>
       </SafeAreaView>

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

@@ -1,5 +1,6 @@
 import AppHeader from "@/components/AppHeader";
 import ImageUser from "@/components/imageNew";
+import ItemDetailMember from "@/components/itemDetailMember";
 import LabelStatus from "@/components/labelStatus";
 import HeaderRightMemberDetail from "@/components/member/headerMemberDetail";
 import Skeleton from "@/components/skeleton";
@@ -9,9 +10,6 @@ import { ConstEnv } from "@/constants/ConstEnv";
 import { valueRoleUser } from "@/constants/RoleUser";
 import Styles from "@/constants/Styles";
 import { apiGetProfile } from "@/lib/api";
-import { useTheme } from "@/providers/ThemeProvider";
-import { AntDesign, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons";
-import { LinearGradient } from "expo-linear-gradient";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import React, { useEffect, useState } from "react";
 import { Pressable, RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
@@ -30,13 +28,11 @@ type Props = {
    group: string,
    img: string,
    isActive: boolean,
-   isApprover: boolean,
    role: string
 }
 
 export default function MemberDetail() {
    const { id } = useLocalSearchParams<{ id: string }>();
-   const { colors } = useTheme();
    const [data, setData] = useState<Props>()
    const [errorImg, setErrorImg] = useState(false)
    const entityUser = useSelector((state: any) => state.user)
@@ -56,11 +52,9 @@ export default function MemberDetail() {
          } else {
             Toast.show({ type: 'small', text1: response.message })
          }
-      } catch (error : any ) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         const message = error?.response?.data?.message || "Gagal mengambil data"
+         Toast.show({ type: 'small', text1: 'Gagal mengambil data' })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
@@ -80,101 +74,79 @@ export default function MemberDetail() {
    };
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Anggota',
                headerTitleAlign: 'center',
+               // headerRight: () => (entityUser.role != "user") && isEdit ? <HeaderRightMemberDetail active={data?.isActive} id={id} /> : <></>,
                header: () => (
                   <AppHeader title="Anggota"
                      showBack={true}
                      onPressLeft={() => router.back()}
                      right={
-                        (entityUser.role != "user") && isEdit ? <HeaderRightMemberDetail active={data?.isActive} id={id} isApprover={data?.isApprover ?? false} /> : <></>
+                        (entityUser.role != "user") && isEdit ? <HeaderRightMemberDetail active={data?.isActive} id={id} /> : <></>
                      }
                   />
                )
             }}
          />
          <ScrollView
-            style={[Styles.h100, { backgroundColor: colors.background }]}
+            style={[Styles.h100]}
             refreshControl={
                <RefreshControl
                   refreshing={refreshing}
                   onRefresh={handleRefresh}
-                  tintColor={colors.icon}
                />
             }
          >
-            <LinearGradient
+            <View style={[Styles.wrapHeadViewMember]}>
-               colors={[colors.header, colors.homeGradient]}
+               {
-               style={[Styles.wrapHeadViewMember]}
+                  loading ?
-            >
+                     <>
-               {loading ? (
+                        <Skeleton width={100} height={100} borderRadius={100} />
-                  <>
+                        <Skeleton width={200} height={10} borderRadius={5} />
-                     <Skeleton width={100} height={100} borderRadius={100} />
+                        <Skeleton width={150} height={10} borderRadius={5} />
-                     <Skeleton width={200} height={10} borderRadius={5} />
+                     </>
-                     <Skeleton width={150} height={10} borderRadius={5} />
+                     :
-                  </>
+                     <>
-               ) : (
+                        <Pressable onPress={() => setPreview(true)}>
-                  <>
-                     <Pressable onPress={() => setPreview(true)}>
-                        <View style={[Styles.memberAvatarRing]}>
                            <ImageUser src={`${ConstEnv.url_storage}/files/${data?.img}`} size="lg" onError={setErrorImg} />
-                        </View>
+                        </Pressable>
-                     </Pressable>
+                        <Text style={[Styles.textSubtitle, Styles.cWhite, Styles.mt10, { textAlign: 'center' }]}>{data?.name}</Text>
-                     <Text style={[Styles.textSubtitle, Styles.cWhite, Styles.mt10, Styles.textCenter]}>{data?.name}</Text>
+                        <Text style={[Styles.textMediumNormal, Styles.cWhite]}>{data?.role}</Text>
-                     <Text style={[Styles.textMediumNormal, Styles.cWhiteDimmed]}>{data?.role}</Text>
+                     </>
-                     <View style={[Styles.memberBadgeRow]}>
-                        {data?.isApprover && (
-                           <View style={[Styles.memberBadgeApprover]}>
-                              <Text style={[Styles.textSmallSemiBold, Styles.cWhite]}>APPROVER</Text>
-                           </View>
-                        )}
-                        <View style={[Styles.memberBadgePill, { backgroundColor: data?.isActive ? colors.success : colors.error }]}>
-                           <Text style={[Styles.textSmallSemiBold, Styles.cWhite]}>{data?.isActive ? 'AKTIF' : 'TIDAK AKTIF'}</Text>
-                        </View>
-                     </View>
-                  </>
-               )}
-            </LinearGradient>
 
+               }
+            </View>
             <View style={[Styles.p15]}>
-               <Text style={[Styles.textDefaultSemiBold, Styles.mb08, { color: colors.dimmed }]}>Informasi</Text>
+               <View style={[Styles.rowSpaceBetween]}>
-               <View>
+                  <Text style={[Styles.textDefaultSemiBold]}>Informasi</Text>
-                  {loading ? (
+                  <LabelStatus
-                     arrSkeleton.map((_, index) => (
+                     size="small"
-                        <View key={index} style={[Styles.pv14, { borderBottomWidth: index < arrSkeleton.length - 1 ? 1 : 0, borderBottomColor: `${colors.dimmed}30` }]}>
+                     category={data?.isActive ? 'success' : 'error'}
-                           <Skeleton width={80} height={8} borderRadius={4} />
+                     text={data?.isActive ? 'AKTIF' : 'TIDAK AKTIF'}
-                           <View style={[Styles.mt05]}>
+                  />
-                              <Skeleton width={60} widthType="percent" height={10} borderRadius={4} />
-                           </View>
-                        </View>
-                     ))
-                  ) : (
-                     [
-                        { icon: <MaterialCommunityIcons name="card-account-details" size={20} color={colors.icon} />, label: 'NIK', value: data?.nik },
-                        { icon: <MaterialCommunityIcons name="office-building-outline" size={20} color={colors.icon} />, label: 'Lembaga Desa', value: data?.group },
-                        { icon: <MaterialCommunityIcons name="account-tie" size={20} color={colors.icon} />, label: 'Jabatan', value: data?.position },
-                        { icon: <MaterialIcons name="phone" size={20} color={colors.icon} />, label: 'No Telepon', value: `+62${data?.phone}` },
-                        { icon: <MaterialIcons name="email" size={20} color={colors.icon} />, label: 'Email', value: data?.email },
-                        { icon: <MaterialCommunityIcons name="gender-male-female" size={20} color={colors.icon} />, label: 'Jenis Kelamin', value: data?.gender == "F" ? "Perempuan" : "Laki-Laki" },
-                     ].map((item, index, arr) => (
-                        <View
-                           key={index}
-                           style={[Styles.memberInfoRow, { borderBottomWidth: index < arr.length - 1 ? 1 : 0, borderBottomColor: `${colors.dimmed}30` }]}
-                        >
-                           <View style={[Styles.memberInfoIcon]}>
-                              {item.icon}
-                           </View>
-                           <View style={[Styles.memberInfoContent]}>
-                              <Text style={[Styles.textInformation, { color: colors.dimmed }]}>{item.label}</Text>
-                              <Text style={[Styles.textDefault, Styles.mt02, { color: colors.text }]} numberOfLines={1}>{item.value ?? '-'}</Text>
-                           </View>
-                        </View>
-                     ))
-                  )}
                </View>
+               {
+                  loading ?
+                     arrSkeleton.map((item, index) => {
+                        return (
+                           <Skeleton key={index} width={100} widthType="percent" height={25} borderRadius={5} />
+                        )
+                     })
+                     :
+                     <>
+                        <ItemDetailMember category="nik" value={data?.nik} />
+                        <ItemDetailMember category="group" value={data?.group} />
+                        <ItemDetailMember category="position" value={data?.position} />
+                        <ItemDetailMember category="phone" value={`+62${data?.phone}`} />
+                        <ItemDetailMember category="email" value={data?.email} />
+                        <ItemDetailMember category="gender" value={data?.gender == "F" ? "Perempuan" : "Laki-Laki"} />
+                     </>
+               }
+
             </View>
          </ScrollView>
 

app/(application)/member/create.tsx

@@ -1,7 +1,6 @@
 import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
-import LoadingCenter from "@/components/loadingCenter";
 import ModalSelect from "@/components/modalSelect";
 import SelectForm from "@/components/selectForm";
 import Text from "@/components/Text";
@@ -11,7 +10,6 @@ import { apiCreateUser } from "@/lib/api";
 import { validateName } from "@/lib/fun_validateName";
 import { setUpdateMember } from "@/lib/memberSlice";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { MaterialCommunityIcons } from "@expo/vector-icons";
 import { useHeaderHeight } from '@react-navigation/elements';
 import * as ImagePicker from "expo-image-picker";
@@ -34,7 +32,6 @@ export default function CreateMember() {
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.memberUpdate)
    const { token, decryptToken } = useAuthSession()
-   const { colors } = useTheme();
    const [valSelect, setValSelect] = useState<"group" | "position" | "role" | "gender">("group");
    const [chooseGroup, setChooseGroup] = useState({ val: "", label: "" });
    const [choosePosition, setChoosePosition] = useState({ val: "", label: "" });
@@ -185,11 +182,9 @@ export default function CreateMember() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error : any ) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         const message = error?.response?.data?.message || "Gagal menambahkan data"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
@@ -211,11 +206,25 @@ export default function CreateMember() {
    };
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Tambah Anggota",
                headerTitleAlign: "center",
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       disable={disableBtn || loading}
+               //       category="create"
+               //       onPress={() => { handleCreate() }}
+               //    />
+               // ),
                header: () => (
                   <AppHeader title="Anggota"
                      showBack={true}
@@ -231,15 +240,14 @@ export default function CreateMember() {
                )
             }}
          />
-         {loading && <LoadingCenter />}
          <KeyboardAvoidingView
-            style={[Styles.h100, { backgroundColor: colors.background }]}
+            style={[Styles.h100]}
             behavior={Platform.OS === 'ios' ? 'padding' : undefined}
             keyboardVerticalOffset={headerHeight}
          >
             <ScrollView showsVerticalScrollIndicator={false}>
                <View style={[Styles.p15]}>
-                  <View style={[Styles.contentItemCenter]}>
+                  <View style={{ justifyContent: "center", alignItems: "center" }}>
                      {selectedImage != undefined ? (
                         <Pressable onPress={pickImageAsync}>
                            <Image src={selectedImage} style={[Styles.userProfileBig]} />
@@ -263,7 +271,6 @@ export default function CreateMember() {
                            placeholder="Pilih Lembaga Desa"
                            value={chooseGroup.label}
                            required
-                           bg={colors.card}
                            onPress={() => {
                               setValChoose(chooseGroup.val);
                               setValSelect("group");
@@ -278,7 +285,6 @@ export default function CreateMember() {
                      placeholder="Pilih Jabatan"
                      value={choosePosition.label}
                      required
-                     bg={colors.card}
                      onPress={() => {
                         setValChoose(choosePosition.val);
                         setValSelect("position");
@@ -292,7 +298,6 @@ export default function CreateMember() {
                      placeholder="Pilih Role"
                      value={chooseRole.label}
                      required
-                     bg={colors.card}
                      onPress={() => {
                         setValChoose(chooseRole.val);
                         setValSelect("role");
@@ -306,7 +311,6 @@ export default function CreateMember() {
                      type="numeric"
                      placeholder="NIK"
                      required
-                     bg={colors.card}
                      error={error.nik}
                      errorText="NIK Harus 16 Karakter"
                      onChange={val => {
@@ -318,7 +322,6 @@ export default function CreateMember() {
                      type="default"
                      placeholder="Nama"
                      required
-                     bg={colors.card}
                      error={error.name}
                      errorText="Nama harus 3–50 karakter (huruf, angka, spasi, dan simbol ringan (. , ' _ -))"
                      onChange={val => {
@@ -330,7 +333,6 @@ export default function CreateMember() {
                      type="default"
                      placeholder="Email"
                      required
-                     bg={colors.card}
                      error={error.email}
                      errorText="Email tidak valid"
                      onChange={val => {
@@ -342,8 +344,7 @@ export default function CreateMember() {
                      type="numeric"
                      placeholder="8XX-XXX-XXX"
                      required
-                     bg={colors.card}
+                     itemLeft={<Text style={[Platform.OS === 'ios' && Styles.mt02]}>+62</Text>}
-                     itemLeft={<Text style={[Platform.OS === 'ios' && Styles.mt02, { color: colors.text }]}>+62</Text>}
                      error={error.phone}
                      errorText="Nomor Telepon tidak valid"
                      onChange={val => {
@@ -355,7 +356,6 @@ export default function CreateMember() {
                      placeholder="Pilih Jenis Kelamin"
                      value={chooseGender.label}
                      required
-                     bg={colors.card}
                      onPress={() => {
                         setValChoose(chooseGender.val);
                         setValSelect("gender");

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

@@ -1,7 +1,6 @@
 import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
-import LoadingCenter from "@/components/loadingCenter";
 import ModalSelect from "@/components/modalSelect";
 import SelectForm from "@/components/selectForm";
 import Text from "@/components/Text";
@@ -11,7 +10,6 @@ import { apiEditUser, apiGetProfile } from "@/lib/api";
 import { validateName } from "@/lib/fun_validateName";
 import { setUpdateMember } from "@/lib/memberSlice";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { MaterialCommunityIcons } from "@expo/vector-icons";
 import { useHeaderHeight } from '@react-navigation/elements';
 import * as ImagePicker from "expo-image-picker";
@@ -49,7 +47,6 @@ export default function EditMember() {
    const update = useSelector((state: any) => state.memberUpdate)
    const { token, decryptToken } = useAuthSession()
    const { id } = useLocalSearchParams<{ id: string }>();
-   const { colors } = useTheme();
    const [errorImg, setErrorImg] = useState(false)
    const [selectedImage, setSelectedImage] = useState<string | undefined | { uri: string }>(undefined);
    const [choosePosition, setChoosePosition] = useState({ val: "", label: "" });
@@ -171,9 +168,11 @@ export default function EditMember() {
    }
 
    function checkForm() {
-      const requiredFields: (keyof Props)[] = ["idPosition", "idUserRole", "nik", "name", "email", "phone", "gender"];
+      if (Object.values(error).some((v) => v == true) || Object.values(data).some((v) => v == "")) {
-      const hasEmpty = requiredFields.some((key) => data[key] === "");
+         setDisableBtn(true)
-      setDisableBtn(Object.values(error).some((v) => v === true) || hasEmpty);
+      } else {
+         setDisableBtn(false)
+      }
    }
 
    useEffect(() => {
@@ -209,11 +208,9 @@ export default function EditMember() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error : any ) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         const message = error?.response?.data?.message || "Gagal menambahkan data"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
@@ -239,11 +236,27 @@ export default function EditMember() {
    };
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Edit Anggota",
                headerTitleAlign: "center",
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       disable={disableBtn || loading}
+               //       category="update"
+               //       onPress={() => {
+               //          handleEdit()
+               //       }}
+               //    />
+               // ),
                header: () => (
                   <AppHeader
                      title="Edit Anggota"
@@ -262,15 +275,15 @@ export default function EditMember() {
                )
             }}
          />
-         {loading && <LoadingCenter />}
+
          <KeyboardAvoidingView
-            style={[Styles.h100, { backgroundColor: colors.background }]}
+            style={[Styles.h100]}
             behavior={Platform.OS === 'ios' ? 'padding' : undefined}
             keyboardVerticalOffset={headerHeight}
          >
             <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100]}>
                <View style={[Styles.p15]}>
-                  <View style={[Styles.contentItemCenter]}>
+                  <View style={{ justifyContent: "center", alignItems: "center" }}>
                      {
                         errorImg ?
                            <Pressable onPress={pickImageAsync}>
@@ -312,7 +325,6 @@ export default function EditMember() {
                      placeholder="Pilih Jabatan"
                      value={choosePosition.label}
                      required
-                     bg={colors.card}
                      onPress={() => {
                         setValChoose(choosePosition.val);
                         setValSelect("position");
@@ -326,7 +338,6 @@ export default function EditMember() {
                      placeholder="Pilih Role"
                      value={chooseRole.label}
                      required
-                     bg={colors.card}
                      onPress={() => {
                         setValChoose(chooseRole.val);
                         setValSelect("role");
@@ -341,7 +352,6 @@ export default function EditMember() {
                      placeholder="NIK"
                      required
                      value={data?.nik}
-                     bg={colors.card}
                      error={error.nik}
                      errorText="NIK Harus 16 Karakter"
                      onChange={val => {
@@ -354,7 +364,6 @@ export default function EditMember() {
                      placeholder="Nama"
                      required
                      value={data?.name}
-                     bg={colors.card}
                      error={error.name}
                      errorText="Nama harus 3–50 karakter (huruf, angka, spasi, dan simbol ringan (. , ' _ -))"
                      onChange={val => {
@@ -367,7 +376,6 @@ export default function EditMember() {
                      placeholder="Email"
                      required
                      value={data?.email}
-                     bg={colors.card}
                      error={error.email}
                      errorText="Email tidak valid"
                      onChange={val => {
@@ -379,9 +387,8 @@ export default function EditMember() {
                      type="numeric"
                      placeholder="8XX-XXX-XXX"
                      required
-                     itemLeft={<Text style={[Platform.OS === 'ios' && Styles.mt02, { color: colors.text }]}>+62</Text>}
+                     itemLeft={<Text style={[Platform.OS === 'ios' && Styles.mt02]}>+62</Text>}
                      value={data?.phone}
-                     bg={colors.card}
                      error={error.phone}
                      errorText="Nomor Telepon tidak valid"
                      onChange={val => {
@@ -393,7 +400,6 @@ export default function EditMember() {
                      placeholder="Pilih Jenis Kelamin"
                      value={chooseGender.label}
                      required
-                     bg={colors.card}
                      onPress={() => {
                         setValChoose(chooseGender.val);
                         setValSelect("gender");

app/(application)/member/index.tsx

@@ -1,4 +1,3 @@
-import GuideOverlay from "@/components/GuideOverlay";
 import BorderBottomItem from "@/components/borderBottomItem";
 import ButtonTab from "@/components/buttonTab";
 import ImageUser from "@/components/imageNew";
@@ -6,18 +5,13 @@ import InputSearch from "@/components/inputSearch";
 import LabelStatus from "@/components/labelStatus";
 import SkeletonTwoItem from "@/components/skeletonTwoItem";
 import Text from "@/components/Text";
-import WrapTab from "@/components/wrapTab";
 import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiGetUser } from "@/lib/api";
-import { GUIDE_MEMBER } from "@/lib/guideSteps";
-import { useGuide } from "@/lib/useGuide";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { AntDesign, Feather } from "@expo/vector-icons";
-import { useInfiniteQuery, useQueryClient } from "@tanstack/react-query";
 import { router, useLocalSearchParams } from "expo-router";
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useState } from "react";
 import { RefreshControl, View, VirtualizedList } from "react-native";
 import { useSelector } from "react-redux";
 
@@ -39,129 +33,118 @@ export default function Index() {
    const { active, group } = useLocalSearchParams<{ active?: string, group?: string }>()
    const { token, decryptToken } = useAuthSession()
    const entityUser = useSelector((state: any) => state.user)
-   const { colors } = useTheme();
    const [search, setSearch] = useState('')
+   const [nameGroup, setNameGroup] = useState('')
+   const [data, setData] = useState<Props[]>([])
    const update = useSelector((state: any) => state.memberUpdate)
-   const queryClient = useQueryClient()
+   const arrSkeleton = Array.from({ length: 5 }, (_, index) => index)
-   const [status, setStatus] = useState<'true' | 'false'>(active == 'false' ? 'false' : 'true')
+   const [loading, setLoading] = useState(true)
+   const [status, setStatus] = useState<'true' | 'false'>('true')
+   const [page, setPage] = useState(1)
+   const [waiting, setWaiting] = useState(false)
    const [refreshing, setRefreshing] = useState(false)
-   const { visible: guideVisible, dismiss: dismissGuide } = useGuide('member')
 
-   // TanStack Query for Members with Infinite Scroll
+   async function handleLoad(loading: boolean, thisPage: number) {
-   const {
+      try {
-      data,
+         setWaiting(true)
-      fetchNextPage,
+         setLoading(loading)
-      hasNextPage,
+         setPage(thisPage)
-      isFetchingNextPage,
-      isLoading,
-      refetch
-   } = useInfiniteQuery({
-      queryKey: ['members', { status, search, group }],
-      queryFn: async ({ pageParam = 1 }) => {
          const hasil = await decryptToken(String(token?.current))
-         const response = await apiGetUser({ 
+         const response = await apiGetUser({ user: hasil, active: status, search, group: String(group), page: thisPage })
-            user: hasil, 
+         if (thisPage == 1) {
-            active: status, 
+            setData(response.data)
-            search, 
+         } else if (thisPage > 1 && response.data.length > 0) {
-            group: String(group), 
+            setData([...data, ...response.data])
-            page: pageParam 
+         } else {
-         })
+            return;
-         return response;
+         }
-      },
+         setNameGroup(response.filter.name)
-      initialPageParam: 1,
+      } catch (error) {
-      getNextPageParam: (lastPage, allPages) => {
+         console.error(error)
-         return lastPage.data.length > 0 ? allPages.length + 1 : undefined;
+      } finally {
-      },
+         setLoading(false)
-      enabled: !!token?.current,
+         setWaiting(false)
-      staleTime: 0,
+      }
-   })
+   }
 
-   // Flatten pages into a single data array
+   const loadMoreData = () => {
-   const flatData = useMemo(() => {
+      if (waiting) return
-      return data?.pages.flatMap(page => page.data) || [];
+      setTimeout(() => {
-   }, [data])
+         handleLoad(false, page + 1)
+      }, 1000);
+   };
 
-   // Get nameGroup from the first available page
-   const nameGroup = useMemo(() => {
-      return data?.pages[0]?.filter?.name || "";
-   }, [data])
-
-   // Refetch when manual update state changes
    useEffect(() => {
-      refetch()
+      handleLoad(false, 1)
-   }, [update, refetch])
+   }, [update])
+
+   useEffect(() => {
+      handleLoad(true, 1)
+   }, [group, search, status])
 
    const handleRefresh = async () => {
       setRefreshing(true)
-      await queryClient.invalidateQueries({ queryKey: ['members'] })
+      handleLoad(false, 1)
+      await new Promise(resolve => setTimeout(resolve, 2000));
       setRefreshing(false)
    };
 
-   const loadMoreData = () => {
-      if (hasNextPage && !isFetchingNextPage) {
-         fetchNextPage()
-      }
-   };
-
-   const arrSkeleton = [0, 1, 2, 3, 4]
-
    const getItem = (_data: unknown, index: number): Props => ({
-      id: flatData[index]?.id,
+      id: data[index].id,
-      name: flatData[index]?.name,
+      name: data[index].name,
-      nik: flatData[index]?.nik,
+      nik: data[index].nik,
-      email: flatData[index]?.email,
+      email: data[index].email,
-      phone: flatData[index]?.phone,
+      phone: data[index].phone,
-      gender: flatData[index]?.gender,
+      gender: data[index].gender,
-      position: flatData[index]?.position,
+      position: data[index].position,
-      group: flatData[index]?.group,
+      group: data[index].group,
-      img: flatData[index]?.img,
+      img: data[index].img,
-      isActive: flatData[index]?.isActive,
+      isActive: data[index].isActive,
-      role: flatData[index]?.role,
+      role: data[index].role,
    });
 
    return (
-      <View style={[Styles.p15, { flex: 1, backgroundColor: colors.background }]}>
+      <View style={[Styles.p15, { flex: 1 }]}>
-         <GuideOverlay visible={guideVisible} steps={GUIDE_MEMBER} onDismiss={dismissGuide} />
          <View>
-            <WrapTab>
+            <View style={[Styles.wrapBtnTab]}>
                <ButtonTab
                   active={status == "false" ? "false" : "true"}
                   value="true"
                   onPress={() => { setStatus("true") }}
                   label="Aktif"
-                  icon={<Feather name="check-circle" color={status == "false" ? colors.dimmed : 'white'} size={20} />}
+                  icon={<Feather name="check-circle" color={status == "false" ? 'black' : 'white'} size={20} />}
                   n={2} />
                <ButtonTab
                   active={status == "false" ? "false" : "true"}
                   value="false"
                   onPress={() => { setStatus("false") }}
                   label="Tidak Aktif"
-                  icon={<AntDesign name="closecircleo" color={status == "false" ? 'white' : colors.dimmed} size={20} />}
+                  icon={<AntDesign name="closecircleo" color={status == "false" ? 'white' : 'black'} size={20} />}
                   n={2} />
-            </WrapTab>
+            </View>
             <InputSearch onChange={setSearch} />
             {
                (entityUser.role == "supadmin" || entityUser.role == "developer") &&
-               <View style={[Styles.mt10, Styles.rowOnly]}>
+               <View style={[Styles.mv05, Styles.rowOnly]}>
                   <Text>Filter :</Text>
                   <LabelStatus size="small" category="secondary" text={nameGroup} style={[Styles.mh05]} />
                </View>
             }
          </View>
-         <View style={[{ flex: 2 }, Styles.mt10]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
-               isLoading ?
+               loading ?
                   arrSkeleton.map((item, index) => {
                      return (
                         <SkeletonTwoItem key={index} />
                      )
                   })
                   :
-                  flatData.length > 0
+                  data.length > 0
                      ?
                      <VirtualizedList
-                        data={flatData}
+                        data={data}
-                        getItemCount={() => flatData.length}
+                        getItemCount={() => data.length}
                         getItem={getItem}
                         renderItem={({ item, index }: { item: Props, index: number }) => {
                            return (
@@ -185,12 +168,11 @@ export default function Index() {
                            <RefreshControl
                               refreshing={refreshing}
                               onRefresh={handleRefresh}
-                              tintColor={colors.icon}
                            />
                         }
                      />
                      :
-                     <Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada data</Text>
+                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
             }
          </View>
       </View>

app/(application)/notification.tsx

@@ -1,18 +1,15 @@
-import AppHeader from "@/components/AppHeader";
+import BorderBottomItem from "@/components/borderBottomItem";
-import ModalConfirmation from "@/components/ModalConfirmation";
 import SkeletonTwoItem from "@/components/skeletonTwoItem";
 import Text from "@/components/Text";
+import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
-import { apiGetNotification, apiReadAllNotification, apiReadOneNotification } from "@/lib/api";
+import { apiGetNotification, apiReadOneNotification } from "@/lib/api";
 import { setUpdateNotification } from "@/lib/notificationSlice";
 import { pushToPage } from "@/lib/pushToPage";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { Feather } from "@expo/vector-icons";
-import { useInfiniteQuery, useQueryClient } from "@tanstack/react-query";
+import { useEffect, useState } from "react";
-import { router, Stack } from "expo-router";
+import { RefreshControl, SafeAreaView, View, VirtualizedList } from "react-native";
-import { useEffect, useMemo, useState } from "react";
-import { FlatList, Pressable, RefreshControl, SafeAreaView, View } from "react-native";
 import { useDispatch, useSelector } from "react-redux";
 
 type Props = {
@@ -25,121 +22,66 @@ type Props = {
    createdAt: string
 }
 
-type HeaderRow = { _type: 'header'; date: string }
-type ItemRow = Props & { _type: 'item' }
-type ListRow = HeaderRow | ItemRow
-
-function getNotifStyle(category: string): { icon: keyof typeof Feather.glyphMap; color: string } {
-   if (category === 'announcement') return { icon: 'volume-2', color: '#3B82F6' }
-   if (category === 'project') return { icon: 'activity', color: '#10B981' }
-   if (category.includes('/task')) return { icon: 'clipboard', color: '#8B5CF6' }
-   if (category === 'division') return { icon: 'users', color: '#3B82F6' }
-   if (category.includes('/discussion') || category === 'discussion-general') return { icon: 'message-square', color: '#06B6D4' }
-   if (category.includes('/calendar')) return { icon: 'calendar', color: '#F59E0B' }
-   if (category.includes('/document')) return { icon: 'file-text', color: '#FBBF24' }
-   if (category === 'member') return { icon: 'user', color: '#1F3C88' }
-   return { icon: 'bell', color: '#6B7280' }
-}
-
 export default function Notification() {
    const { token, decryptToken } = useAuthSession()
-   const { colors } = useTheme();
+   const [loading, setLoading] = useState(false)
-   const queryClient = useQueryClient()
+   const [data, setData] = useState<Props[]>([])
+   const [page, setPage] = useState(1)
+   const [waiting, setWaiting] = useState(false)
+   const arrSkeleton = Array.from({ length: 5 }, (_, index) => index)
    const dispatch = useDispatch()
    const updateNotification = useSelector((state: any) => state.notificationUpdate)
    const [refreshing, setRefreshing] = useState(false)
-   const [markingAll, setMarkingAll] = useState(false)
-   const [showConfirm, setShowConfirm] = useState(false)
 
-   const {
+   async function handleLoad(loading: boolean, thisPage: number) {
-      data,
-      fetchNextPage,
-      hasNextPage,
-      isFetchingNextPage,
-      isLoading,
-      refetch
-   } = useInfiniteQuery({
-      queryKey: ['notifications'],
-      queryFn: async ({ pageParam = 1 }) => {
-         const hasil = await decryptToken(String(token?.current))
-         const response = await apiGetNotification({ user: hasil, page: pageParam })
-         return response;
-      },
-      initialPageParam: 1,
-      getNextPageParam: (lastPage, allPages) => {
-         return lastPage.data.length > 0 ? allPages.length + 1 : undefined;
-      },
-      enabled: !!token?.current,
-      staleTime: 0,
-   })
-
-   const flatData = useMemo(() => {
-      return data?.pages.flatMap(page => page.data) || [];
-   }, [data])
-
-   const listData = useMemo<ListRow[]>(() => {
-      const BULAN: Record<string, number> = {
-         'JAN': 0, 'FEB': 1, 'MAR': 2, 'APR': 3, 'MEI': 4, 'JUN': 5,
-         'JUL': 6, 'AGU': 7, 'SEP': 8, 'OKT': 9, 'NOV': 10, 'DES': 11,
-      }
-      const parseDate = (str: string) => {
-         const [d, m, y] = str.split(' ')
-         return new Date(Number(y), BULAN[m] ?? 0, Number(d)).getTime()
-      }
-
-      const groups: Record<string, Props[]> = {}
-      const dateOrder: string[] = []
-
-      flatData.forEach((item) => {
-         if (!groups[item.createdAt]) {
-            groups[item.createdAt] = []
-            dateOrder.push(item.createdAt)
-         }
-         groups[item.createdAt].push(item)
-      })
-
-      dateOrder.sort((a, b) => parseDate(b) - parseDate(a))
-
-      const result: ListRow[] = []
-      dateOrder.forEach((date) => {
-         result.push({ _type: 'header', date })
-         const sorted = [...groups[date]].sort((a, b) => Number(a.isRead) - Number(b.isRead))
-         sorted.forEach((item) => result.push({ ...item, _type: 'item' }))
-      })
-      return result
-   }, [flatData])
-
-   useEffect(() => {
-      refetch()
-   }, [updateNotification, refetch])
-
-   const handleRefresh = async () => {
-      setRefreshing(true)
-      await queryClient.invalidateQueries({ queryKey: ['notifications'] })
-      setRefreshing(false)
-   };
-
-   const hasUnread = flatData.some((item) => !item.isRead)
-
-   async function handleReadAll() {
       try {
-         setMarkingAll(true)
+         setLoading(loading)
+         setPage(thisPage)
+         setWaiting(true)
          const hasil = await decryptToken(String(token?.current))
-         await apiReadAllNotification({ user: hasil })
+         const response = await apiGetNotification({ user: hasil, page: thisPage })
-         await queryClient.invalidateQueries({ queryKey: ['notifications'] })
+         if (thisPage == 1) {
-         dispatch(setUpdateNotification(!updateNotification))
+            setData(response.data)
+         } else if (thisPage > 1 && response.data.length > 0) {
+            setData([...data, ...response.data])
+         } else {
+            return;
+         }
       } catch (error) {
          console.error(error)
       } finally {
-         setMarkingAll(false)
+         setLoading(false)
+         setWaiting(false)
       }
    }
 
+
+   const loadMoreData = () => {
+      if (waiting) return
+      setTimeout(() => {
+         handleLoad(false, page + 1)
+      }, 1000);
+   };
+
+   useEffect(() => {
+      handleLoad(true, 1)
+   }, [])
+
+
+   const getItem = (_data: unknown, index: number): Props => ({
+      id: data[index].id,
+      title: data[index].title,
+      desc: data[index].desc,
+      category: data[index].category,
+      idContent: data[index].idContent,
+      isRead: data[index].isRead,
+      createdAt: data[index].createdAt,
+   });
+
    async function handleReadNotification(id: string, category: string, idContent: string) {
       try {
          const hasil = await decryptToken(String(token?.current))
-         await apiReadOneNotification({ user: hasil, id: id })
+         const response = await apiReadOneNotification({ user: hasil, id: id })
-         await queryClient.invalidateQueries({ queryKey: ['notifications'] })
          pushToPage(category, idContent)
          dispatch(setUpdateNotification(!updateNotification))
       } catch (error) {
@@ -147,150 +89,64 @@ export default function Notification() {
       }
    }
 
-   async function handleMarkOneRead(id: string) {
+   const handleRefresh = async () => {
-      try {
+      setRefreshing(true)
-         const hasil = await decryptToken(String(token?.current))
+      handleLoad(false, 1)
-         await apiReadOneNotification({ user: hasil, id: id })
+      await new Promise(resolve => setTimeout(resolve, 2000));
-         await queryClient.invalidateQueries({ queryKey: ['notifications'] })
+      setRefreshing(false)
-         dispatch(setUpdateNotification(!updateNotification))
+   };
-      } catch (error) {
-         console.error(error)
-      }
-   }
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
-         <Stack.Screen
+         <View style={[Styles.p15]}>
-            options={{
+            {
-               header: () => (
+               loading ?
-                  <AppHeader
+                  arrSkeleton.map((item, index) => {
-                     title="Notifikasi"
-                     showBack={true}
-                     onPressLeft={() => router.back()}
-                     right={
-                        hasUnread ? (
-                           <Pressable
-                              onPress={() => setShowConfirm(true)}
-                              disabled={markingAll}
-                              style={{ opacity: markingAll ? 0.5 : 1, padding: 4 }}
-                           >
-                              <Feather name="check-square" size={20} color="white" />
-                           </Pressable>
-                        ) : undefined
-                     }
-                  />
-               )
-            }}
-         />
-
-         <ModalConfirmation
-            visible={showConfirm}
-            title="Tandai Semua Dibaca"
-            message="Semua notifikasi akan ditandai sebagai telah dibaca."
-            confirmText="Tandai"
-            cancelText="Batal"
-            onConfirm={() => {
-               setShowConfirm(false)
-               handleReadAll()
-            }}
-            onCancel={() => setShowConfirm(false)}
-         />
-
-
-<View style={[Styles.flex1, Styles.ph15, Styles.notifContainer]}>
-            {isLoading ? (
-               [0, 1, 2, 3, 4].map((_, i) => <SkeletonTwoItem key={i} />)
-            ) : flatData.length === 0 ? (
-               <View style={[Styles.contentItemCenter, Styles.mt30]}>
-                  <Feather name="bell-off" size={42} color={colors.icon + '40'} />
-                  <Text style={[Styles.mt10, { color: colors.dimmed, fontSize: 14 }]}>
-                     Tidak ada notifikasi
-                  </Text>
-               </View>
-            ) : (
-               <FlatList
-                  data={listData}
-                  keyExtractor={(item, index) => String(index)}
-                  showsVerticalScrollIndicator={false}
-                  onEndReached={() => {
-                     if (hasNextPage && !isFetchingNextPage) fetchNextPage()
-                  }}
-                  onEndReachedThreshold={0.5}
-                  refreshControl={
-                     <RefreshControl
-                        refreshing={refreshing}
-                        onRefresh={handleRefresh}
-                        tintColor={colors.icon}
-                     />
-                  }
-                  renderItem={({ item }) => {
-                     if (item._type === 'header') {
-                        return (
-                           <View style={[Styles.rowItemsCenter, Styles.notifHeaderRow]}>
-                              <Text style={[Styles.notifDateText, { color: colors.dimmed }]}>
-                                 {item.date}
-                              </Text>
-                              <View style={[Styles.notifDateSeparator, { backgroundColor: colors.icon + '20' }]} />
-                           </View>
-                        )
-                     }
-
-                     const { icon, color } = getNotifStyle(item.category)
-
                      return (
-                        <Pressable
+                        <SkeletonTwoItem key={index} />
-                           onPress={() => handleReadNotification(item.id, item.category, item.idContent)}
-                           style={({ pressed }) => [Styles.notifItemRow, {
-                              borderColor: colors.icon + '20',
-                              backgroundColor: pressed
-                                 ? colors.icon + '10'
-                                 : item.isRead
-                                    ? colors.icon + '10'
-                                    : colors.card,
-                           }]}
-                        >
-                           <View style={[Styles.notifIconContainer, { backgroundColor: color + '20' }]}>
-                              <Feather name={icon} size={20} color={color} />
-                           </View>
-
-                           <View style={[Styles.flex1, Styles.notifContent]}>
-                              <View style={[Styles.rowSpaceBetween, Styles.itemsCenter]}>
-                                 <View style={[Styles.flex1, Styles.mr10]}>
-                                    <Text
-                                       style={[Styles.textDefaultSemiBold, { color: item.isRead ? colors.dimmed : colors.text }]}
-                                       numberOfLines={1}
-                                    >
-                                       {item.title}
-                                    </Text>
-                                 </View>
-                                 {!item.isRead && (
-                                    <Pressable
-                                       onPress={(e) => {
-                                          e.stopPropagation()
-                                          handleMarkOneRead(item.id)
-                                       }}
-                                       hitSlop={8}
-                                       style={({ pressed }) => ({ opacity: pressed ? 0.5 : 1, flexShrink: 0 })}
-                                    >
-                                       <Text style={Styles.notifMarkReadText}>
-                                          Tandai dibaca
-                                       </Text>
-                                    </Pressable>
-                                 )}
-                              </View>
-                              <Text
-                                 style={[Styles.textMediumNormal, { color: item.isRead ? colors.dimmed : colors.text, opacity: item.isRead ? 0.7 : 1 }]}
-                                 numberOfLines={2}
-                              >
-                                 {item.desc}
-                              </Text>
-                           </View>
-                        </Pressable>
                      )
-                  }}
+                  })
-               />
+                  :
-            )}
+                  data.length > 0 ?
+                     <VirtualizedList
+                        data={data}
+                        getItemCount={() => data.length}
+                        getItem={getItem}
+                        renderItem={({ item, index }: { item: Props, index: number }) => {
+                           return (
+                              <BorderBottomItem
+                                 borderType="bottom"
+                                 icon={
+                                    <View style={[Styles.iconContent, item.isRead ? ColorsStatus.secondary : ColorsStatus.primary]}>
+                                       <Feather name="bell" size={25} color="white" />
+                                    </View>
+                                 }
+                                 title={item.title}
+                                 rightTopInfo={item.createdAt}
+                                 desc={item.desc}
+                                 textColor={item.isRead ? 'gray' : 'black'}
+                                 onPress={() => {
+                                    handleReadNotification(item.id, item.category, item.idContent)
+
+                                 }}
+                              />
+                           )
+                        }}
+                        keyExtractor={(item, index) => String(index)}
+                        onEndReached={loadMoreData}
+                        onEndReachedThreshold={0.5}
+                        showsVerticalScrollIndicator={false}
+                        refreshControl={
+                           <RefreshControl
+                              refreshing={refreshing}
+                              onRefresh={handleRefresh}
+                           />
+                        }
+                     />
+                     :
+                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
+            }
          </View>
       </SafeAreaView>
    )
-}
+}

app/(application)/position/index.tsx

@@ -1,4 +1,4 @@
-import GuideOverlay from "@/components/GuideOverlay";
+import AlertKonfirmasi from "@/components/alertKonfirmasi";
 import BorderBottomItem from "@/components/borderBottomItem";
 import { ButtonForm } from "@/components/buttonForm";
 import ButtonTab from "@/components/buttonTab";
@@ -7,21 +7,16 @@ import { InputForm } from "@/components/inputForm";
 import InputSearch from "@/components/inputSearch";
 import LabelStatus from "@/components/labelStatus";
 import MenuItemRow from "@/components/menuItemRow";
-import ModalConfirmation from "@/components/ModalConfirmation";
 import SkeletonTwoItem from "@/components/skeletonTwoItem";
 import Text from "@/components/Text";
-import WrapTab from "@/components/wrapTab";
+import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
 import { apiDeletePosition, apiEditPosition, apiGetPosition } from "@/lib/api";
 import { setUpdatePosition } from "@/lib/positionSlice";
-import { GUIDE_POSITION } from "@/lib/guideSteps";
-import { useGuide } from "@/lib/useGuide";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { AntDesign, Feather, MaterialCommunityIcons } from "@expo/vector-icons";
-import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { useLocalSearchParams } from "expo-router";
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useState } from "react";
 import { RefreshControl, View, VirtualizedList } from "react-native";
 import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
@@ -35,54 +30,49 @@ type Props = {
 }
 
 export default function Index() {
+   const arrSkeleton = Array.from({ length: 5 }, (_, index) => index)
+   const [loading, setLoading] = useState(true)
    const { token, decryptToken } = useAuthSession()
-   const { colors } = useTheme()
+   const [status, setStatus] = useState<'true' | 'false'>('true')
-   const { active, group } = useLocalSearchParams<{ active?: string, group?: string }>()
-   const [status, setStatus] = useState<'true' | 'false'>(active == 'false' ? 'false' : 'true')
    const entityUser = useSelector((state: any) => state.user)
+   const { active, group } = useLocalSearchParams<{ active?: string, group?: string }>()
    const [isModal, setModal] = useState(false)
    const [isVisibleEdit, setVisibleEdit] = useState(false)
+   const [data, setData] = useState<Props[]>([])
    const [search, setSearch] = useState('')
+   const [nameGroup, setNameGroup] = useState('')
    const [loadingSubmit, setLoadingSubmit] = useState(false)
    const [chooseData, setChooseData] = useState({ name: '', id: '', active: false, idGroup: '' })
    const [error, setError] = useState({
       name: false,
    });
-   const queryClient = useQueryClient()
    const [refreshing, setRefreshing] = useState(false)
-   const [showDeleteModal, setShowDeleteModal] = useState(false)
-   const { visible: guideVisible, dismiss: dismissGuide } = useGuide('position')
 
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.positionUpdate)
 
-   // TanStack Query for Positions
+   async function handleLoad(loading: boolean) {
-   const {
+      try {
-      data: queryData,
+         setLoading(loading)
-      isLoading,
-      refetch
-   } = useQuery({
-      queryKey: ['positions', { status, search, group }],
-      queryFn: async () => {
          const hasil = await decryptToken(String(token?.current))
-         const response = await apiGetPosition({
+         const response = await apiGetPosition({ user: hasil, active: status, search: search, group: String(group) })
-            user: hasil,
+         setData(response.data)
-            active: status,
+         setNameGroup(response.filter.name)
-            search: search,
+      } catch (error) {
-            group: String(group)
+         console.error(error)
-         })
+      } finally {
-         return response;
+         setLoading(false)
-      },
+      }
-      enabled: !!token?.current,
+   }
-      staleTime: 0,
-   })
-
-   const data = useMemo(() => queryData?.data || [], [queryData])
-   const nameGroup = useMemo(() => queryData?.filter?.name || "", [queryData])
 
    useEffect(() => {
-      refetch()
+      handleLoad(false)
-   }, [update, refetch])
+   }, [update])
+
+
+   useEffect(() => {
+      handleLoad(true)
+   }, [status, search, group])
 
 
    function handleChooseData(id: string, name: string, active: boolean, group: string) {
@@ -95,11 +85,8 @@ export default function Index() {
          const hasil = await decryptToken(String(token?.current))
          const response = await apiDeletePosition({ user: hasil, isActive: chooseData.active }, chooseData.id)
          dispatch(setUpdatePosition(!update))
-      } catch (error: any) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         const message = error?.response?.data?.message || "Gagal menghapus data"
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setModal(false)
          Toast.show({ type: 'small', text1: 'Berhasil mengupdate data', })
@@ -117,11 +104,8 @@ export default function Index() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error: any) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         const message = error?.response?.data?.message || "Gagal mengubah data"
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoadingSubmit(false)
          setVisibleEdit(false)
@@ -145,11 +129,10 @@ export default function Index() {
       handleEdit()
    }
 
-   const arrSkeleton = [0, 1, 2, 3, 4]
-
    const handleRefresh = async () => {
       setRefreshing(true)
-      await queryClient.invalidateQueries({ queryKey: ['positions'] })
+      handleLoad(false)
+      await new Promise(resolve => setTimeout(resolve, 2000));
       setRefreshing(false)
    };
 
@@ -163,37 +146,36 @@ export default function Index() {
    });
 
    return (
-      <View style={[Styles.p15, Styles.flex1, { backgroundColor: colors.background }]}>
+      <View style={[Styles.p15, { flex: 1 }]}>
-         <GuideOverlay visible={guideVisible} steps={GUIDE_POSITION} onDismiss={dismissGuide} />
          <View>
-            <WrapTab>
+            <View style={[Styles.wrapBtnTab]}>
                <ButtonTab
                   active={status == "false" ? "false" : "true"}
                   value="true"
                   onPress={() => { setStatus("true") }}
                   label="Aktif"
-                  icon={<Feather name="check-circle" color={status == "true" ? 'white' : colors.dimmed} size={20} />}
+                  icon={<Feather name="check-circle" color={status == "true" ? 'white' : 'black'} size={20} />}
                   n={2} />
                <ButtonTab
                   active={status == "false" ? "false" : "true"}
                   value="false"
                   onPress={() => { setStatus("false") }}
                   label="Tidak Aktif"
-                  icon={<AntDesign name="closecircleo" color={status == "false" ? 'white' : colors.dimmed} size={20} />}
+                  icon={<AntDesign name="closecircleo" color={status == "false" ? 'white' : 'black'} size={20} />}
                   n={2} />
-            </WrapTab>
+            </View>
             <InputSearch onChange={setSearch} />
             {
                (entityUser.role == "supadmin" || entityUser.role == "developer") &&
-               <View style={[Styles.mt10, Styles.rowOnly]}>
+               <View style={[Styles.mv05, Styles.rowOnly]}>
                   <Text>Filter :</Text>
                   <LabelStatus size="small" category="secondary" text={nameGroup} style={[Styles.mh05]} />
                </View>
             }
          </View>
-         <View style={[Styles.flex2, Styles.mt10]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
-               isLoading ?
+               loading ?
                   arrSkeleton.map((item, index) => {
                      return (
                         <SkeletonTwoItem key={index} />
@@ -215,8 +197,8 @@ export default function Index() {
                                  }}
                                  borderType="all"
                                  icon={
-                                    <View style={[Styles.iconContent]}>
+                                    <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                                       <MaterialCommunityIcons name="account-tie-outline" size={25} color={'black'} />
+                                       <MaterialCommunityIcons name="account-tie" size={25} color={'#384288'} />
                                     </View>
                                  }
                                  title={item.name}
@@ -230,28 +212,29 @@ export default function Index() {
                            <RefreshControl
                               refreshing={refreshing}
                               onRefresh={handleRefresh}
-                              tintColor={colors.icon}
                            />
                         }
                      />
                      :
-                     <Text style={[Styles.textDefault, Styles.textCenter, { color: colors.dimmed }]}>Tidak ada data</Text>
+                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
             }
          </View>
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={() => setModal(false)} title={chooseData.name}>
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<MaterialCommunityIcons name="toggle-switch-off-outline" color={colors.text} size={25} />}
+                  icon={<MaterialCommunityIcons name="toggle-switch-off-outline" color="black" size={25} />}
                   title={chooseData.active ? 'Non Aktifkan' : "Aktifkan"}
                   onPress={() => {
                      setModal(false)
-                     setTimeout(() => {
+                     AlertKonfirmasi({
-                        setShowDeleteModal(true)
+                        title: 'Konfirmasi',
-                     }, 600)
+                        desc: chooseData.active ? 'Apakah anda yakin ingin menonaktifkan data?' : 'Apakah anda yakin ingin mengaktifkan data?',
+                        onPress: () => { handleDelete() }
+                     })
                   }}
                />
                <MenuItemRow
-                  icon={<MaterialCommunityIcons name="pencil-outline" color={colors.text} size={25} />}
+                  icon={<MaterialCommunityIcons name="pencil-outline" color="black" size={25} />}
                   title="Edit"
                   onPress={() => {
                      setModal(false)
@@ -265,14 +248,13 @@ export default function Index() {
 
 
          <DrawerBottom animation="none" keyboard height={30} backdropPressable={false} isVisible={isVisibleEdit} setVisible={() => setVisibleEdit(false)} title="Edit Jabatan">
-            <View style={[Styles.justifySpaceBetween, Styles.flex1]}>
+            <View style={{ justifyContent: 'space-between', flex: 1 }}>
                <View>
                   <InputForm
                      type="default"
                      placeholder="Nama Jabatan"
                      required
                      label="Jabatan"
-                     bg={"transparent"}
                      value={chooseData.name}
                      onChange={(val) => { validationForm(val) }}
                      error={error.name}
@@ -284,19 +266,6 @@ export default function Index() {
                </View>
             </View>
          </DrawerBottom>
-
-         <ModalConfirmation
-            visible={showDeleteModal}
-            title="Konfirmasi"
-            message={chooseData.active ? 'Apakah anda yakin ingin menonaktifkan data?' : 'Apakah anda yakin ingin mengaktifkan data?'}
-            onConfirm={() => {
-               setShowDeleteModal(false)
-               handleDelete()
-            }}
-            onCancel={() => setShowDeleteModal(false)}
-            confirmText={chooseData.active ? "Nonaktifkan" : "Aktifkan"}
-            cancelText="Batal"
-         />
       </View>
    )
 }

app/(application)/profile.tsx

@@ -1,57 +1,28 @@
+import AlertKonfirmasi from "@/components/alertKonfirmasi";
 import AppHeader from "@/components/AppHeader";
 import { ButtonHeader } from "@/components/buttonHeader";
+import ItemDetailMember from "@/components/itemDetailMember";
 import Text from "@/components/Text";
 import { assetUserImage } from "@/constants/AssetsError";
 import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
-import { apiGetProfile } from "@/lib/api";
-import { setEntities } from "@/lib/entitiesSlice";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
+import { AntDesign } from "@expo/vector-icons";
-import { Feather, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons";
-import { LinearGradient } from "expo-linear-gradient";
 import { router, Stack } from "expo-router";
 import { useState } from "react";
-import { Image, Pressable, RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
+import { Image, Pressable, SafeAreaView, ScrollView, View } from "react-native";
 import ImageViewing from 'react-native-image-viewing';
-import { useDispatch, useSelector } from 'react-redux';
+import { useSelector } from 'react-redux';
 
 export default function Profile() {
-   const { colors } = useTheme();
+   const { signOut } = useAuthSession()
    const entities = useSelector((state: any) => state.entities)
    const [error, setError] = useState(false)
    const [preview, setPreview] = useState(false)
-   const [refreshing, setRefreshing] = useState(false)
-   const dispatch = useDispatch()
-   const { token, decryptToken } = useAuthSession()
 
-   async function handleUserLogin() {
-      const hasil = await decryptToken(String(token?.current))
-      apiGetProfile({ id: hasil })
-         .then((data) => dispatch(setEntities(data.data)))
-         .catch((error) => {
-            console.error(error)
-         });
-   }
-
-   const handleRefresh = async () => {
-      setRefreshing(true)
-      handleUserLogin()
-      await new Promise(resolve => setTimeout(resolve, 2000));
-      setRefreshing(false)
-   };
-
-   const infoRows = [
-      { icon: <MaterialCommunityIcons name="card-account-details" size={20} color={colors.icon} />, label: 'NIK', value: entities.nik },
-      { icon: <MaterialCommunityIcons name="office-building-outline" size={20} color={colors.icon} />, label: 'Lembaga Desa', value: entities.group },
-      { icon: <MaterialCommunityIcons name="account-tie" size={20} color={colors.icon} />, label: 'Jabatan', value: entities.position },
-      { icon: <MaterialIcons name="phone" size={20} color={colors.icon} />, label: 'No Telepon', value: `0${entities.phone}` },
-      { icon: <MaterialIcons name="email" size={20} color={colors.icon} />, label: 'Email', value: entities.email },
-      { icon: <MaterialCommunityIcons name="gender-male-female" size={20} color={colors.icon} />, label: 'Jenis Kelamin', value: entities.gender == "F" ? 'Perempuan' : 'Laki-laki' },
-   ]
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                headerTitle: 'Profile',
@@ -63,69 +34,59 @@ export default function Profile() {
                      onPressLeft={() => router.back()}
                      right={
                         <ButtonHeader
-                           item={<Feather name="settings" size={20} color="white" />}
+                           item={<AntDesign name="logout" size={20} color="white" />}
-                           onPress={() => router.push('/setting')}
+                           onPress={() => {
+                              AlertKonfirmasi({
+                                 title: 'Keluar',
+                                 desc: 'Apakah anda yakin ingin keluar?',
+                                 onPress: () => { signOut() }
+                              })
+                           }}
                         />
                      }
                   />
                )
+               // headerRight: () => <ButtonHeader
+               //    item={<AntDesign name="logout" size={20} color="white" />}
+               //    onPress={() => {
+               //       AlertKonfirmasi({
+               //          title: 'Keluar',
+               //          desc: 'Apakah anda yakin ingin keluar?',
+               //          onPress: () => { signOut() }
+               //       })
+               //    }}
+               // />
             }}
          />
-         <ScrollView
+         <ScrollView style={[Styles.h100]}>
-            refreshControl={
+            <View style={{ flexDirection: 'column' }}>
-               <RefreshControl
+               <View style={[Styles.wrapHeadViewMember]}>
-                  refreshing={refreshing}
+                  <Pressable onPress={() => setPreview(true)}>
-                  onRefresh={handleRefresh}
-                  tintColor={colors.icon}
-               />
-            }
-            style={[Styles.h100, { backgroundColor: colors.background }]}
-         >
-            <LinearGradient
-               colors={[colors.header, colors.homeGradient]}
-               style={[Styles.wrapHeadViewMember]}
-            >
-               <Pressable onPress={() => setPreview(true)}>
-                  <View style={[Styles.memberAvatarRing]}>
                      <Image
                         source={error ? require("../../assets/images/user.jpg") : { uri: `${ConstEnv.url_storage}/files/${entities.img}` }}
-                        onError={() => setError(true)}
+                        onError={() => { setError(true) }}
                         style={[Styles.userProfileBig]}
                      />
+                  </Pressable>
+                  <Text style={[Styles.textSubtitle, Styles.cWhite, Styles.mt10]}>{entities.name}</Text>
+                  <Text style={[Styles.textMediumNormal, Styles.cWhite]}>{entities.role}</Text>
+               </View>
+               <View style={[Styles.p15]}>
+                  <View style={[Styles.rowSpaceBetween]}>
+                     <Text style={[Styles.textDefaultSemiBold]}>Informasi</Text>
+                     {
+                        entities.idUserRole != "developer" && <Text onPress={() => { router.push('/edit-profile') }} style={[Styles.textLink]}>Edit</Text>
+                     }
                   </View>
-               </Pressable>
+                  <ItemDetailMember category="nik" value={entities.nik} />
-               <Text style={[Styles.textSubtitle, Styles.cWhite, Styles.mt10, Styles.textCenter]}>{entities.name}</Text>
+                  <ItemDetailMember category="group" value={entities.group} />
-               <Text style={[Styles.textMediumNormal, Styles.cWhiteDimmed]}>{entities.role}</Text>
+                  <ItemDetailMember category="position" value={entities.position} />
-               {entities.isApprover && (
+                  <ItemDetailMember category="phone" value={`0${entities.phone}`} />
-                  <View style={[Styles.memberBadgeRow, { justifyContent: 'center' }]}>
+                  <ItemDetailMember category="email" value={entities.email} />
-                     <View style={[Styles.memberBadgeApprover]}>
+                  <ItemDetailMember category="gender" value={entities.gender == "F" ? 'Perempuan' : 'Laki-laki'} />
-                        <Text style={[Styles.textSmallSemiBold, Styles.cWhite]}>APPROVER</Text>
-                     </View>
-                  </View>
-               )}
-            </LinearGradient>
-
-            <View style={[Styles.p15]}>
-               <Text style={[Styles.textDefaultSemiBold, Styles.mb08, { color: colors.dimmed }]}>Informasi</Text>
-               <View>
-                  {infoRows.map((item, index, arr) => (
-                     <View
-                        key={index}
-                        style={[Styles.memberInfoRow, { borderBottomWidth: index < arr.length - 1 ? 1 : 0, borderBottomColor: `${colors.dimmed}30` }]}
-                     >
-                        <View style={[Styles.memberInfoIcon]}>
-                           {item.icon}
-                        </View>
-                        <View style={[Styles.memberInfoContent]}>
-                           <Text style={[Styles.textInformation, { color: colors.dimmed }]}>{item.label}</Text>
-                           <Text style={[Styles.textDefault, Styles.mt02, { color: colors.text }]} numberOfLines={1}>{item.value ?? '-'}</Text>
-                        </View>
-                     </View>
-                  ))}
                </View>
             </View>
          </ScrollView>
-
          <ImageViewing
             images={[{ uri: error ? assetUserImage.uri : `${ConstEnv.url_storage}/files/${entities.img}` }]}
             imageIndex={0}
@@ -135,4 +96,4 @@ export default function Profile() {
          />
       </SafeAreaView>
    )
-}
+}

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

@@ -3,13 +3,11 @@ import BorderBottomItem from "@/components/borderBottomItem"
 import ButtonSaveHeader from "@/components/buttonSaveHeader"
 import ButtonSelect from "@/components/buttonSelect"
 import DrawerBottom from "@/components/drawerBottom"
-import LoadingCenter from "@/components/loadingCenter"
 import MenuItemRow from "@/components/menuItemRow"
 import Styles from "@/constants/Styles"
 import { apiAddFileProject, apiCheckFileProject } from "@/lib/api"
 import { setUpdateProject } from "@/lib/projectUpdate"
 import { useAuthSession } from "@/providers/AuthProvider"
-import { useTheme } from "@/providers/ThemeProvider"
 import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons"
 import * as DocumentPicker from "expo-document-picker"
 import { router, Stack, useLocalSearchParams } from "expo-router"
@@ -19,7 +17,6 @@ import Toast from "react-native-toast-message"
 import { useDispatch, useSelector } from "react-redux"
 
 export default function ProjectAddFile() {
-   const { colors } = useTheme();
    const { id } = useLocalSearchParams<{ id: string }>()
    const [fileForm, setFileForm] = useState<any[]>([])
    const [listFile, setListFile] = useState<any[]>([])
@@ -118,11 +115,9 @@ export default function ProjectAddFile() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error : any ) {
+      } catch (error) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal menambahkan data"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
@@ -132,7 +127,7 @@ export default function ProjectAddFile() {
 
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -158,23 +153,20 @@ export default function ProjectAddFile() {
                )
             }}
          />
-         {
+         <ScrollView>
-            loading && <LoadingCenter size="large" />
+            <View style={[Styles.p15, Styles.mb100]}>
-         }
-         <ScrollView style={[Styles.flex1, { backgroundColor: colors.background }]}>
-            <View style={[Styles.p15]}>
                <ButtonSelect value="Upload File" onPress={pickDocumentAsync} />
                {
                   listFile.length > 0 && (
                      <View style={[Styles.mb15]}>
-                        <Text style={[Styles.textDefaultSemiBold, Styles.mv05, { color: colors.text }]}>File</Text>
+                        <Text style={[Styles.textDefaultSemiBold, Styles.mv05]}>File</Text>
-                        <View style={[Styles.wrapPaper, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                        <View style={[Styles.wrapPaper]}>
                            {
                               listFile.map((item, index) => (
                                  <BorderBottomItem
                                     key={index}
                                     borderType="all"
-                                    icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
+                                    icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
                                     title={item}
                                     titleWeight="normal"
                                     onPress={() => { setIndexDelFile(index); setModal(true) }}
@@ -188,12 +180,15 @@ export default function ProjectAddFile() {
                {
                   loadingCheck && <ActivityIndicator size="small" />
                }
+               {
+                  loading && <ActivityIndicator size="large" />
+               }
             </View>
          </ScrollView>
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
+                  icon={<Ionicons name="trash" color="black" size={25} />}
                   title="Hapus"
                   onPress={() => { deleteFile(indexDelFile) }}
                />

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

@@ -9,7 +9,6 @@ import Styles from "@/constants/Styles";
 import { apiAddMemberProject, apiGetProjectOne, apiGetUser } from "@/lib/api";
 import { setUpdateProject } from "@/lib/projectUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { AntDesign } from "@expo/vector-icons";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
@@ -24,7 +23,6 @@ type Props = {
 }
 
 export default function AddMemberProject() {
-   const { colors } = useTheme();
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.projectUpdate)
    const { token, decryptToken } = useAuthSession()
@@ -45,11 +43,9 @@ export default function AddMemberProject() {
          setIdGroup(responseGroup.data.idGroup)
          const responsemember = await apiGetUser({ user: hasil, active: "true", search: search, group: String(responseGroup.data.idGroup) })
          setData(responsemember.data.filter((i: any) => i.idUserRole != 'supadmin'))
-      } catch (error : any ) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         const message = error?.response?.data?.message || "Gagal mengambil data"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       }
    }
 
@@ -88,11 +84,9 @@ export default function AddMemberProject() {
             dispatch(setUpdateProject({ ...update, member: !update.member }))
             router.back()
          }
-      } catch (error : any ) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         const message = error?.response?.data?.message || "Gagal menambahkan anggota"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
@@ -104,7 +98,7 @@ export default function AddMemberProject() {
          <Stack.Screen
             options={{
                // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
-               headerTitle: 'Tambah Anggota',
+               headerTitle: 'Tambah Anggota Kegiatan',
                headerTitleAlign: 'center',
                // headerRight: () => (
                //    <ButtonSaveHeader
@@ -117,7 +111,7 @@ export default function AddMemberProject() {
                // )
                header: () => (
                   <AppHeader
-                     title="Tambah Anggota"
+                     title="Tambah Anggota Kegiatan"
                      showBack={true}
                      onPressLeft={() => router.back()}
                      right={
@@ -133,7 +127,7 @@ export default function AddMemberProject() {
                )
             }}
          />
-         <View style={[Styles.p15, { flex: 1, backgroundColor: colors.background }]}>
+         <View style={[Styles.p15, { flex: 1 }]}>
             <InputSearch onChange={(val) => handleSearch(val)} value={search} />
             {
                selectMember.length > 0
@@ -154,11 +148,11 @@ export default function AddMemberProject() {
                   </View>
 
                   :
-                  <Text style={[Styles.textDefault, Styles.pv05, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada member yang dipilih</Text>
+                  <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
             }
             <ScrollView
                showsVerticalScrollIndicator={false}
-               style={[Styles.h100, { backgroundColor: colors.background }]}
+               style={[Styles.h100]}
             >
                {
                   data.length > 0 ?
@@ -169,7 +163,7 @@ export default function AddMemberProject() {
                               return (
                                  <Pressable
                                     key={index}
-                                    style={[Styles.itemSelectModal, { borderColor: colors.icon + '20' }]}
+                                    style={[Styles.itemSelectModal]}
                                     onPress={() => {
                                        !found && onChoose(item.id, item.name, item.img)
                                     }}
@@ -179,12 +173,12 @@ export default function AddMemberProject() {
                                        <View style={[Styles.ml10]}>
                                           <Text style={[Styles.textDefault]} numberOfLines={1}>{item.name}</Text>
                                           {
-                                             found && <Text style={[Styles.textInformation, { color: colors.dimmed }]}>sudah menjadi anggota</Text>
+                                             found && <Text style={[Styles.textInformation, Styles.cGray]}>sudah menjadi anggota</Text>
                                           }
                                        </View>
                                     </View>
                                     {
-                                       selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={colors.text} />
+                                       selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'} />
                                     }
                                  </Pressable>
                               )

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

@@ -1,6 +1,5 @@
 import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
-import ButtonSelect from "@/components/buttonSelect";
 import { InputForm } from "@/components/inputForm";
 import ModalAddDetailTugasProject from "@/components/project/modalAddDetailTugasProject";
 import Text from "@/components/Text";
@@ -10,7 +9,6 @@ import { formatDateOnly } from "@/lib/fun_formatDateOnly";
 import { getDatesInRange } from "@/lib/fun_getDatesInRange";
 import { setUpdateProject } from "@/lib/projectUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import 'intl';
@@ -20,6 +18,7 @@ import { useEffect, useState } from "react";
 import {
    KeyboardAvoidingView,
    Platform,
+   Pressable,
    SafeAreaView,
    ScrollView,
    View
@@ -31,7 +30,6 @@ import DateTimePicker, {
 import { useDispatch, useSelector } from "react-redux";
 
 export default function ProjectAddTask() {
-   const { colors } = useTheme();
    const headerHeight = useHeaderHeight();
    const { token, decryptToken } = useAuthSession()
    const dispatch = useDispatch()
@@ -126,18 +124,16 @@ export default function ProjectAddTask() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error : any ) {
+      } catch (error) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal menambahkan data"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
    }
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => (
@@ -162,11 +158,11 @@ export default function ProjectAddTask() {
                      showBack={true}
                      onPressLeft={() => router.back()}
                      right={
-                        <ButtonSaveHeader
+                           <ButtonSaveHeader
-                           disable={disable || loading}
+                              disable={disable || loading}
-                           category="create"
+                              category="create"
-                           onPress={() => { handleCreate() }}
+                              onPress={() => { handleCreate() }}
-                        />
+                           />
                      }
                   />
                )
@@ -176,9 +172,9 @@ export default function ProjectAddTask() {
             behavior={Platform.OS === 'ios' ? 'padding' : undefined}
             keyboardVerticalOffset={headerHeight}
          >
-            <ScrollView style={[Styles.h100, { backgroundColor: colors.background }]}>
+            <ScrollView>
                <View style={[Styles.p15, Styles.mb100]}>
-                  <View style={[Styles.wrapPaper, Styles.p10, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                  <View style={[Styles.wrapPaper, Styles.p10]}>
                      <DateTimePicker
                         mode="range"
                         startDate={range.startDate}
@@ -188,55 +184,52 @@ export default function ProjectAddTask() {
                            selected: Styles.selectedDate,
                            selected_label: Styles.cWhite,
                            range_fill: Styles.selectRangeDate,
-                           month_label: { color: colors.text },
+                           month_label: Styles.cBlack,
-                           month_selector_label: { color: colors.text },
+                           month_selector_label: Styles.cBlack,
-                           year_label: { color: colors.text },
+                           year_label: Styles.cBlack,
-                           year_selector_label: { color: colors.text },
+                           year_selector_label: Styles.cBlack,
-                           day_label: { color: colors.text },
+                           day_label: Styles.cBlack,
-                           time_label: { color: colors.text },
+                           time_label: Styles.cBlack,
-                           weekday_label: { color: colors.text },
+                           weekday_label: Styles.cBlack,
-                           button_next_image: { tintColor: colors.text },
-                           button_prev_image: { tintColor: colors.text },
                         }}
                      />
                   </View>
                   <View style={[Styles.mv10]}>
-                     <View style={[Styles.rowSpaceBetween, Styles.mb10]}>
+                     <View style={[Styles.rowSpaceBetween]}>
-                        <View style={[Styles.w48]}>
+                        <View style={[{ width: "48%" }]}>
                            <Text style={[Styles.mb05]}>
-                              Tanggal Mulai <Text style={{ color: colors.error }}>*</Text>
+                              Tanggal Mulai <Text style={Styles.cError}>*</Text>
                            </Text>
-                           <View style={[Styles.wrapPaper, Styles.noShadow, Styles.borderAll, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+                           <View style={[Styles.wrapPaper, Styles.p10]}>
-                              <Text style={Styles.textCenter}>{from}</Text>
+                              <Text style={{ textAlign: "center" }}>{from}</Text>
                            </View>
                         </View>
-                        <View style={[Styles.w48]}>
+                        <View style={[{ width: "48%" }]}>
                            <Text style={[Styles.mb05]}>
-                              Tanggal Berakhir <Text style={{ color: colors.error }}>*</Text>
+                              Tanggal Berakhir <Text style={Styles.cError}>*</Text>
                            </Text>
-                           <View style={[Styles.wrapPaper, Styles.noShadow, Styles.borderAll, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+                           <View style={[Styles.wrapPaper, Styles.p10]}>
-                              <Text style={Styles.textCenter}>{to}</Text>
+                              <Text style={{ textAlign: "center" }}>{to}</Text>
                            </View>
                         </View>
                      </View>
                      {
-                        (error.endDate || error.startDate) && <Text style={[Styles.textInformation, { color: colors.error }, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
+                        (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
                      }
-                     {/* <Pressable
+                     <Pressable
                         style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
                         disabled={dsbButton}
                         onPress={() => { setModalDetail(true) }}
                      >
                         <Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
-                     </Pressable> */}
+                     </Pressable>
-                     <ButtonSelect value="Detail" onPress={() => { setModalDetail(true) }} disabled={from == "" || to == ""} />
                   </View>
                   <InputForm
                      label="Judul Tugas"
                      type="default"
                      placeholder="Judul Tugas"
                      required
-                     bg={colors.card}
+                     bg="white"
                      value={title}
                      error={error.title}
                      errorText="Judul tidak boleh kosong"

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

@@ -5,7 +5,6 @@ import Styles from "@/constants/Styles";
 import { apiCancelProject } from "@/lib/api";
 import { setUpdateProject } from "@/lib/projectUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import React, { useEffect, useState } from "react";
 import { SafeAreaView, ScrollView, View } from "react-native";
@@ -13,7 +12,6 @@ import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function ProjectCancel() {
-   const { colors } = useTheme();
    const { token, decryptToken } = useAuthSession();
    const { id } = useLocalSearchParams<{ id: string }>();
    const dispatch = useDispatch();
@@ -58,18 +56,16 @@ export default function ProjectCancel() {
             Toast.show({ type: 'small', text1: 'Berhasil membatalkan kegiatan', })
             router.back();
          }
-      } catch (error : any ) {
+      } catch (error) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal membatalkan kegiatan"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
    }
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => (
@@ -110,7 +106,7 @@ export default function ProjectCancel() {
          />
          <ScrollView
             showsVerticalScrollIndicator={false}
-            style={[Styles.h100, { backgroundColor: colors.background }]}
+            style={[Styles.h100]}
          >
             <View style={[Styles.p15]}>
                <InputForm
@@ -118,7 +114,7 @@ export default function ProjectCancel() {
                   type="default"
                   placeholder="Alasan Pembatalan"
                   required
-                  bg={colors.card}
+                  bg="white"
                   error={error}
                   errorText="Alasan pembatalan harus diisi"
                   onChange={(val) => onValidation(val)}

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

@@ -5,7 +5,6 @@ import Styles from "@/constants/Styles";
 import { apiEditProject, apiGetProjectOne } from "@/lib/api";
 import { setUpdateProject } from "@/lib/projectUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
 import { SafeAreaView, ScrollView, View } from "react-native";
@@ -13,7 +12,6 @@ import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function EditProject() {
-   const { colors } = useTheme();
    const { token, decryptToken } = useAuthSession();
    const { id } = useLocalSearchParams<{ id: string }>();
    const dispatch = useDispatch()
@@ -77,11 +75,9 @@ export default function EditProject() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error : any ) {
+      } catch (error) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal mengubah data"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
@@ -90,7 +86,7 @@ export default function EditProject() {
 
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => (
@@ -125,14 +121,14 @@ export default function EditProject() {
                )
             }}
          />
-         <ScrollView style={[Styles.h100, { backgroundColor: colors.background }]}>
+         <ScrollView>
             <View style={[Styles.p15, Styles.mb100]}>
                <InputForm
                   label="Judul Kegiatan"
                   type="default"
                   placeholder="Judul Kegiatan"
                   required
-                  bg={colors.card}
+                  bg="white"
                   value={judul}
                   onChange={(val) => { onValidation(val) }}
                   error={error}

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

@@ -1,5 +1,4 @@
 import AppHeader from "@/components/AppHeader";
-import GuideOverlay from "@/components/GuideOverlay";
 import HeaderRightProjectDetail from "@/components/project/headerProjectDetail";
 import SectionFile from "@/components/project/sectionFile";
 import SectionLink from "@/components/project/sectionLink";
@@ -10,10 +9,7 @@ import SectionCancel from "@/components/sectionCancel";
 import SectionProgress from "@/components/sectionProgress";
 import Styles from "@/constants/Styles";
 import { apiGetProjectOne } from "@/lib/api";
-import { GUIDE_PROJECT_DETAIL } from "@/lib/guideSteps";
-import { useGuide } from "@/lib/useGuide";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import React, { useEffect, useState } from "react";
 import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
@@ -36,17 +32,14 @@ type Props = {
 
 export default function DetailProject() {
    const { token, decryptToken } = useAuthSession()
-   const { colors } = useTheme();
    const { id } = useLocalSearchParams<{ id: string }>();
    const [data, setData] = useState<Props>()
    const [progress, setProgress] = useState(0)
-   const [taskStats, setTaskStats] = useState<{ done: number, total: number } | undefined>()
    const [loading, setLoading] = useState(true)
    const update = useSelector((state: any) => state.projectUpdate)
    const [isMember, setIsMember] = useState(false)
    const entityUser = useSelector((state: any) => state.user)
    const [refreshing, setRefreshing] = useState(false)
-   const { visible: guideVisible, dismiss: dismissGuide } = useGuide('project-detail')
 
    async function handleLoad(cat: 'data' | 'progress') {
       try {
@@ -65,17 +58,6 @@ export default function DetailProject() {
       }
    }
 
-   async function handleLoadTaskStats() {
-      try {
-         const hasil = await decryptToken(String(token?.current))
-         const response = await apiGetProjectOne({ user: hasil, cat: 'task', id: id })
-         const tasks: { status: number }[] = response.data
-         setTaskStats({ done: tasks.filter(t => t.status === 1).length, total: tasks.length })
-      } catch (error) {
-         console.error(error)
-      }
-   }
-
    async function checkMember() {
       try {
          const hasil = await decryptToken(String(token?.current))
@@ -95,10 +77,6 @@ export default function DetailProject() {
       handleLoad('progress')
    }, [update.progress])
 
-   useEffect(() => {
-      handleLoadTaskStats()
-   }, [update.task])
-
    useEffect(() => {
       checkMember()
    }, [])
@@ -108,13 +86,12 @@ export default function DetailProject() {
       setRefreshing(true)
       await handleLoad('data')
       await handleLoad('progress')
-      await handleLoadTaskStats()
       await new Promise(resolve => setTimeout(resolve, 2000));
       setRefreshing(false)
    };
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -133,14 +110,11 @@ export default function DetailProject() {
                )
             }}
          />
-         <GuideOverlay visible={guideVisible} steps={GUIDE_PROJECT_DETAIL} onDismiss={dismissGuide} />
          <ScrollView
-            style={[Styles.h100, { backgroundColor: colors.background }]}
             refreshControl={
                <RefreshControl
                   refreshing={refreshing}
                   onRefresh={handleRefresh}
-                  tintColor={colors.icon}
                />
             }
          >
@@ -148,9 +122,9 @@ export default function DetailProject() {
                {
                   data?.reason != null && data?.reason != "" && <SectionCancel text={data?.reason} />
                }
-               <SectionProgress progress={progress} doneCount={taskStats?.done} totalCount={taskStats?.total} />
+               <SectionProgress text={`Kemajuan Kegiatan ${progress}%`} progress={progress} />
                <SectionReportProject refreshing={refreshing} />
-               <SectionTanggalTugasProject status={data?.status} member={isMember} refreshing={refreshing} idGroup={data?.idGroup ?? ''} />
+               <SectionTanggalTugasProject status={data?.status} member={isMember} refreshing={refreshing} />
                <SectionFile status={data?.status} member={isMember} refreshing={refreshing} />
                <SectionLink status={data?.status} member={isMember} refreshing={refreshing} />
                <SectionMember status={data?.status} refreshing={refreshing} />

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

@@ -5,7 +5,6 @@ import Styles from "@/constants/Styles";
 import { apiGetProjectOne, apiReportProject } from "@/lib/api";
 import { setUpdateProject } from "@/lib/projectUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
 import { SafeAreaView, ScrollView, View } from "react-native";
@@ -13,7 +12,6 @@ import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function ReportProject() {
-   const { colors } = useTheme();
    const { token, decryptToken } = useAuthSession();
    const { id } = useLocalSearchParams<{ id: string }>();
    const dispatch = useDispatch()
@@ -77,11 +75,9 @@ export default function ReportProject() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error : any ) {
+      } catch (error) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal mengubah data"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
@@ -90,7 +86,7 @@ export default function ReportProject() {
 
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => (
@@ -127,7 +123,7 @@ export default function ReportProject() {
          />
          <ScrollView
             showsVerticalScrollIndicator={false}
-            style={[Styles.h100, { backgroundColor: colors.background }]}
+            style={[Styles.h100]}
          >
             <View style={[Styles.p15]}>
                <InputForm
@@ -135,7 +131,7 @@ export default function ReportProject() {
                   type="default"
                   placeholder="Laporan Kegiatan"
                   required
-                  bg={colors.card}
+                  bg="white"
                   value={laporan}
                   onChange={(val) => { onValidation(val) }}
                   error={error}

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

@@ -1,377 +0,0 @@
-import AppHeader from "@/components/AppHeader";
-import BorderBottomItem from "@/components/borderBottomItem";
-import { ButtonForm } from "@/components/buttonForm";
-import ButtonSelect from "@/components/buttonSelect";
-import DrawerBottom from "@/components/drawerBottom";
-import MenuItemRow from "@/components/menuItemRow";
-import ModalConfirmation from "@/components/ModalConfirmation";
-import ModalLoading from "@/components/modalLoading";
-import Skeleton from "@/components/skeleton";
-import Text from "@/components/Text";
-import { ConstEnv } from "@/constants/ConstEnv";
-import Styles from "@/constants/Styles";
-import {
-   apiAddProjectTaskFile,
-   apiDeleteProjectTaskFile,
-   apiGetProjectOne,
-   apiGetProjectTaskFile,
-   apiLinkProjectTaskFile,
-} from "@/lib/api";
-import { setUpdateProject } from "@/lib/projectUpdate";
-import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
-import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
-import * as DocumentPicker from "expo-document-picker";
-import * as FileSystem from "expo-file-system";
-import { startActivityAsync } from "expo-intent-launcher";
-import { router, Stack, useLocalSearchParams } from "expo-router";
-import * as Sharing from "expo-sharing";
-import { useEffect, useState } from "react";
-import {
-   ActivityIndicator,
-   Alert,
-   Platform,
-   SafeAreaView,
-   ScrollView,
-   View,
-} from "react-native";
-import * as mime from "react-native-mime-types";
-import Toast from "react-native-toast-message";
-import { useDispatch, useSelector } from "react-redux";
-
-type FileItem = {
-   id: string;      // ProjectTaskFile.id
-   idFile: string;  // ProjectFile.id
-   name: string;
-   extension: string;
-   idStorage: string;
-};
-
-type ProjectFile = {
-   id: string;
-   name: string;
-   extension: string;
-   idStorage: string;
-};
-
-export default function ProjectTugasFileScreen() {
-   const { colors } = useTheme();
-   const { id, taskId, member: memberParam } = useLocalSearchParams<{ id: string; taskId: string; member: string }>();
-   const { token, decryptToken } = useAuthSession();
-   const dispatch = useDispatch();
-   const update = useSelector((state: any) => state.projectUpdate);
-   const entityUser = useSelector((state: any) => state.user);
-   const isMember = memberParam === "true";
-   const canEdit = isMember || (entityUser.role !== "user" && entityUser.role !== "coadmin");
-
-   const [data, setData] = useState<FileItem[]>([]);
-   const [loading, setLoading] = useState(true);
-   const [loadingOpen, setLoadingOpen] = useState(false);
-   const [loadingUpload, setLoadingUpload] = useState(false);
-   const [loadingLink, setLoadingLink] = useState(false);
-
-   const [selectFile, setSelectFile] = useState<FileItem | null>(null);
-   const [isMenuModal, setMenuModal] = useState(false);
-   const [showDeleteModal, setShowDeleteModal] = useState(false);
-
-   const [projectFiles, setProjectFiles] = useState<ProjectFile[]>([]);
-   const [isPickerModal, setPickerModal] = useState(false);
-   const [loadingProjectFiles, setLoadingProjectFiles] = useState(false);
-   const [selectedProjectFiles, setSelectedProjectFiles] = useState<string[]>([]);
-
-   const arrSkeleton = Array.from({ length: 4 });
-
-   async function loadFiles() {
-      try {
-         setLoading(true);
-         const hasil = await decryptToken(String(token?.current));
-         const response = await apiGetProjectTaskFile({ user: hasil, id: taskId });
-         setData(response.data ?? []);
-      } catch (error) {
-         console.error(error);
-      } finally {
-         setLoading(false);
-      }
-   }
-
-   async function loadProjectFiles() {
-      try {
-         setLoadingProjectFiles(true);
-         const hasil = await decryptToken(String(token?.current));
-         const response = await apiGetProjectOne({ user: hasil, cat: "file", id });
-         setProjectFiles(response.data ?? []);
-      } catch (error) {
-         console.error(error);
-      } finally {
-         setLoadingProjectFiles(false);
-      }
-   }
-
-   useEffect(() => {
-      loadFiles();
-   }, []);
-
-   const openFile = () => {
-      setMenuModal(false);
-      setLoadingOpen(true);
-      const remoteUrl = ConstEnv.url_storage + "/files/" + selectFile?.idStorage;
-      const fileName = selectFile?.name + "." + selectFile?.extension;
-      const localPath = `${FileSystem.documentDirectory}/${fileName}`;
-      const mimeType = mime.lookup(fileName);
-
-      FileSystem.downloadAsync(remoteUrl, localPath).then(async ({ uri }) => {
-         const contentURL = await FileSystem.getContentUriAsync(uri);
-         try {
-            if (Platform.OS === "android") {
-               await startActivityAsync("android.intent.action.VIEW", {
-                  data: contentURL,
-                  flags: 1,
-                  type: mimeType as string,
-               });
-            } else {
-               Sharing.shareAsync(localPath);
-            }
-         } catch {
-            Alert.alert("INFO", "Gagal membuka file, tidak ada aplikasi yang dapat membuka file ini");
-         } finally {
-            setLoadingOpen(false);
-         }
-      });
-   };
-
-   async function handleDelete() {
-      try {
-         const hasil = await decryptToken(String(token?.current));
-         const response = await apiDeleteProjectTaskFile({ user: hasil }, String(selectFile?.id));
-         if (response.success) {
-            Toast.show({ type: "small", text1: "Berhasil menghapus file" });
-            dispatch(setUpdateProject({ ...update, task: !update.task }));
-            loadFiles();
-         } else {
-            Toast.show({ type: "small", text1: response.message });
-         }
-      } catch (error: any) {
-         const message = error?.response?.data?.message || "Gagal menghapus file";
-         Toast.show({ type: "small", text1: message });
-      } finally {
-         setMenuModal(false);
-      }
-   }
-
-   async function handleUpload() {
-      const result = await DocumentPicker.getDocumentAsync({ type: ["*/*"], multiple: true });
-      if (result.canceled) return;
-
-      try {
-         setLoadingUpload(true);
-         const hasil = await decryptToken(String(token?.current));
-         const fd = new FormData();
-
-         for (let i = 0; i < result.assets.length; i++) {
-            fd.append(`file${i}`, {
-               uri: result.assets[i].uri,
-               type: "application/octet-stream",
-               name: result.assets[i].name,
-            } as any);
-         }
-         fd.append("data", JSON.stringify({ user: hasil }));
-
-         const response = await apiAddProjectTaskFile({ data: fd, id: taskId });
-         if (response.success) {
-            Toast.show({ type: "small", text1: "Berhasil menambahkan file" });
-            dispatch(setUpdateProject({ ...update, task: !update.task }));
-            loadFiles();
-         } else {
-            Toast.show({ type: "small", text1: response.message });
-         }
-      } catch (error: any) {
-         const message = error?.response?.data?.message || "Gagal menambahkan file";
-         Toast.show({ type: "small", text1: message });
-      } finally {
-         setLoadingUpload(false);
-      }
-   }
-
-   function toggleProjectFileSelect(fileId: string) {
-      setSelectedProjectFiles((prev) =>
-         prev.includes(fileId) ? prev.filter((v) => v !== fileId) : [...prev, fileId]
-      );
-   }
-
-   async function handleLinkFiles() {
-      if (selectedProjectFiles.length === 0) return;
-      try {
-         setLoadingLink(true);
-         const hasil = await decryptToken(String(token?.current));
-         for (const idFile of selectedProjectFiles) {
-            await apiLinkProjectTaskFile({ user: hasil, idFile, id: taskId });
-         }
-         Toast.show({ type: "small", text1: "Berhasil menambahkan file" });
-         dispatch(setUpdateProject({ ...update, task: !update.task }));
-         setPickerModal(false);
-         setSelectedProjectFiles([]);
-         loadFiles();
-      } catch (error: any) {
-         const message = error?.response?.data?.message || "Gagal menambahkan file";
-         Toast.show({ type: "small", text1: message });
-      } finally {
-         setLoadingLink(false);
-      }
-   }
-
-   const attachedFileIds = new Set(data.map((f) => f.idFile));
-
-   return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
-         <Stack.Screen
-            options={{
-               header: () => (
-                  <AppHeader
-                     title="File Tugas"
-                     showBack={true}
-                     onPressLeft={() => router.back()}
-                  />
-               ),
-            }}
-         />
-         <ModalLoading isVisible={loadingOpen} setVisible={setLoadingOpen} />
-
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
-               {canEdit && (
-                  <>
-                     <ButtonSelect
-                        value="Upload dari Perangkat"
-                        onPress={handleUpload}
-                        disabled={loadingUpload}
-                     />
-                     <ButtonSelect
-                        value="Pilih dari File Kegiatan ini"
-                        onPress={() => {
-                           setSelectedProjectFiles([]);
-                           setPickerModal(true);
-                           loadProjectFiles();
-                        }}
-                     />
-                  </>
-               )}
-
-               {loadingUpload && <ActivityIndicator size="small" style={Styles.mv05} />}
-
-               <View style={[Styles.mb15, Styles.mt10]}>
-                  <Text style={[Styles.textDefaultSemiBold, Styles.mv05]}>File Terlampir</Text>
-                  <View style={[Styles.wrapPaper, { backgroundColor: colors.card, borderColor: colors.background }]}>
-                     {loading ? (
-                        arrSkeleton.map((_, index) => (
-                           <Skeleton key={index} width={100} height={40} widthType="percent" borderRadius={10} />
-                        ))
-                     ) : data.length > 0 ? (
-                        data.map((item, index) => (
-                           <BorderBottomItem
-                              key={index}
-                              borderType="all"
-                              icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
-                              title={item.name + "." + item.extension}
-                              titleWeight="normal"
-                              onPress={() => {
-                                 setSelectFile(item);
-                                 setMenuModal(true);
-                              }}
-                           />
-                        ))
-                     ) : (
-                        <Text style={[Styles.textDefault, { textAlign: "center", color: colors.dimmed }]}>
-                           Tidak ada file
-                        </Text>
-                     )}
-                  </View>
-               </View>
-            </View>
-         </ScrollView>
-
-         {/* Menu per file */}
-         <DrawerBottom animation="slide" isVisible={isMenuModal} setVisible={setMenuModal} title="Menu">
-            <View style={Styles.rowItemsCenter}>
-               <MenuItemRow
-                  icon={<MaterialCommunityIcons name="file-eye" color={colors.text} size={25} />}
-                  title="Lihat / Share"
-                  onPress={openFile}
-               />
-               {canEdit && (
-                  <MenuItemRow
-                     icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
-                     title="Hapus"
-                     onPress={() => {
-                        setMenuModal(false);
-                        setTimeout(() => setShowDeleteModal(true), 600);
-                     }}
-                  />
-               )}
-            </View>
-         </DrawerBottom>
-
-         <ModalConfirmation
-            visible={showDeleteModal}
-            title="Konfirmasi"
-            message="Apakah Anda yakin ingin menghapus file ini?"
-            onConfirm={() => {
-               setShowDeleteModal(false);
-               handleDelete();
-            }}
-            onCancel={() => setShowDeleteModal(false)}
-            confirmText="Hapus"
-            cancelText="Batal"
-         />
-
-         {/* Picker file dari proyek */}
-         <DrawerBottom
-            animation="slide"
-            isVisible={isPickerModal}
-            setVisible={setPickerModal}
-            title="Pilih File Proyek"
-            height={60}
-         >
-            <ScrollView>
-               {loadingProjectFiles ? (
-                  <ActivityIndicator size="small" />
-               ) : projectFiles.length > 0 ? (
-                  projectFiles.map((item, index) => {
-                     const isAttached = attachedFileIds.has(item.id);
-                     const isSelected = selectedProjectFiles.includes(item.id);
-                     return (
-                        <View key={index} style={isAttached ? { opacity: 0.4 } : undefined}>
-                           <BorderBottomItem
-                              borderType="bottom"
-                              icon={
-                                 isAttached || isSelected ? (
-                                    <Ionicons name="checkmark-circle" size={25} color={colors.primary} />
-                                 ) : (
-                                    <MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />
-                                 )
-                              }
-                              title={item.name + "." + item.extension}
-                              titleWeight="normal"
-                              onPress={() => !isAttached && toggleProjectFileSelect(item.id)}
-                              bgColor="transparent"
-                           />
-                        </View>
-                     );
-                  })
-               ) : (
-                  <Text style={[Styles.textDefault, { textAlign: "center", color: colors.dimmed }]}>
-                     Tidak ada file tersedia
-                  </Text>
-               )}
-            </ScrollView>
-            {projectFiles.length > 0 && (
-               <View>
-                  <ButtonForm
-                     text={loadingLink ? "Menyimpan..." : `Tambahkan (${selectedProjectFiles.length})`}
-                     disabled={selectedProjectFiles.length === 0 || loadingLink}
-                     onPress={handleLinkFiles} />
-               </View>
-            )}
-         </DrawerBottom>
-      </SafeAreaView>
-   );
-}

app/(application)/project/create.tsx

@@ -1,9 +1,10 @@
 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";
-import LoadingCenter from "@/components/loadingCenter";
 import MenuItemRow from "@/components/menuItemRow";
 import ModalSelect from "@/components/modalSelect";
 import SectionListAddTask from "@/components/project/sectionListAddTask";
@@ -17,13 +18,11 @@ import { setMemberChoose } from "@/lib/memberChoose";
 import { setUpdateProject } from "@/lib/projectUpdate";
 import { setTaskCreate } from "@/lib/taskCreate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
 import * as DocumentPicker from "expo-document-picker";
 import { router, Stack } from "expo-router";
 import { useEffect, useState } from "react";
 import {
-   Pressable,
    SafeAreaView,
    ScrollView,
    View
@@ -31,28 +30,7 @@ import {
 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 CreateProject() {
-   const { colors } = useTheme();
    const [loading, setLoading] = useState(false)
    const { token, decryptToken } = useAuthSession();
    const [chooseGroup, setChooseGroup] = useState({ val: "", label: "" });
@@ -170,11 +148,9 @@ export default function CreateProject() {
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error : any ) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         const message = error?.response?.data?.message || "Gagal menambahkan data"
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
@@ -214,7 +190,7 @@ export default function CreateProject() {
 
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => (
@@ -252,194 +228,123 @@ export default function CreateProject() {
                )
             }}
          />
-         {
-            loading && <LoadingCenter />
-         }
          <ScrollView
             showsVerticalScrollIndicator={false}
-            style={[Styles.h100, { backgroundColor: colors.background }]}
+            style={[Styles.h100]}
          >
             <View style={[Styles.p15]}>
-               {(entityUser.role == "supadmin" || entityUser.role == "developer") && (
+               {
-                  <SelectForm
+                  (entityUser.role == "supadmin" || entityUser.role == "developer")
-                     label="Lembaga Desa"
+                  &&
-                     placeholder="Pilih Lembaga Desa"
+                  (
-                     value={chooseGroup.label}
+                     <SelectForm
-                     required
+                        label="Lembaga Desa"
-                     bg={colors.card}
+                        placeholder="Pilih Lembaga Desa"
-                     onPress={() => {
+                        value={chooseGroup.label}
-                        setValChoose(chooseGroup.val);
+                        required
-                        setValSelect("group");
+                        onPress={() => {
-                        setSelect(true);
+                           setValChoose(chooseGroup.val);
-                     }}
+                           setValSelect("group");
-                     error={error.group}
+                           setSelect(true);
-                     errorText="Lembaga Desa tidak boleh kosong"
+                        }}
-                  />
+                        error={error.group}
-               )}
+                        errorText="Lembaga Desa tidak boleh kosong"
-
+                     />
+                  )
+               }
                <InputForm
                   label="Kegiatan"
                   type="default"
                   placeholder="Nama Kegiatan"
                   required
-                  bg={colors.card}
                   value={dataForm.title}
                   error={error.title}
                   errorText="Nama kegiatan tidak boleh kosong"
-                  onChange={(val) => validationForm("title", val)}
+                  onChange={(val) => {
+                     validationForm("title", val);
+                  }}
                />
-
+               <ButtonSelect
-               {/* Tanggal & Tugas */}
+                  value="Tambah Tanggal & Tugas"
-               <View style={[
+                  onPress={() => {
-                  Styles.wrapPaper, Styles.mb15, Styles.sectionCard,
+                     router.push(`/project/create/task`);
-                  { backgroundColor: colors.card, borderColor: error.task ? colors.error + '50' : colors.icon + '18' }
+                  }}
-               ]}>
+                  error={error.task}
-                  <Pressable
+                  errorText="Tanggal & Tugas tidak boleh kosong"
-                     onPress={() => router.push(`/project/create/task`)}
+               />
-                     style={[Styles.sectionActionRow, { marginBottom: taskCreate.length > 0 ? 12 : 0 }]}
+               <ButtonSelect value="Upload File" onPress={pickDocumentAsync} />
-                  >
+               <ButtonSelect
-                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.tabActive + '18' }]}>
+                  value="Pilih Anggota"
-                        <MaterialCommunityIcons name="calendar-check-outline" size={18} color={colors.tabActive} />
+                  onPress={() => {
-                     </View>
+                     if (entityUser.role == "supadmin" || entityUser.role == "developer") {
-                     <View style={Styles.flex1}>
+                        if (chooseGroup.val != "") {
-                        <Text style={[Styles.textDefaultSemiBold, { color: colors.text }]}>Tanggal & Tugas</Text>
-                        {taskCreate.length === 0 && (
-                           <Text style={[Styles.textMediumNormal, { color: colors.dimmed }]}>Belum ada tugas ditambahkan</Text>
-                        )}
-                     </View>
-                     {taskCreate.length > 0 && (
-                        <View style={[Styles.sectionBadge, { backgroundColor: colors.tabActive + '18' }]}>
-                           <Text style={[Styles.textSmallSemiBold, { color: colors.tabActive }]}>{taskCreate.length} tugas</Text>
-                        </View>
-                     )}
-                     <MaterialCommunityIcons name="chevron-right" size={18} color={colors.dimmed} />
-                  </Pressable>
-                  {taskCreate.length > 0 && <SectionListAddTask showTitle={false} />}
-                  {error.task && (
-                     <Text style={[Styles.textMediumNormal, Styles.mt05, { color: colors.error }]}>
-                        Tanggal & Tugas tidak boleh kosong
-                     </Text>
-                  )}
-               </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); setModal(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>
-
-               {/* Anggota */}
-               <View style={[
-                  Styles.wrapPaper, Styles.mb15, Styles.sectionCard,
-                  { backgroundColor: colors.card, borderColor: error.member ? colors.error + '50' : colors.icon + '18' }
-               ]}>
-                  <Pressable
-                     onPress={() => {
-                        if (entityUser.role == "supadmin" || entityUser.role == "developer") {
-                           if (chooseGroup.val != "") {
-                              router.push(`/project/create/member`);
-                           } else {
-                              Toast.show({ type: 'small', text1: "Pilih Lembaga Desa terlebih dahulu" })
-                           }
-                        } else {
                            router.push(`/project/create/member`);
+                        } else {
+                           Toast.show({ type: 'small', text1: "Pilih Lembaga Desa terlebih dahulu", })
                         }
-                     }}
+                     } else {
-                     style={[Styles.sectionActionRow, { marginBottom: entitiesMember.length > 0 ? 12 : 0 }]}
+                        router.push(`/project/create/member`);
-                  >
+                     }
-                     <View style={[Styles.sectionIconBox, { backgroundColor: colors.tabActive + '18' }]}>
+                  }}
-                        <MaterialCommunityIcons name="account-group-outline" size={18} color={colors.tabActive} />
+                  error={error.member}
+                  errorText="Anggota tidak boleh kosong"
+               />
+               <SectionListAddTask />
+               {
+                  fileForm.length > 0 && (
+                     <View style={[Styles.mb15]}>
+                        <Text style={[Styles.textDefaultSemiBold, Styles.mv05]}>File</Text>
+                        <View style={[Styles.wrapPaper]}>
+                           {
+                              fileForm.map((item, index) => (
+                                 <BorderBottomItem
+                                    key={index}
+                                    borderType="all"
+                                    icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
+                                    title={item.name}
+                                    titleWeight="normal"
+                                    onPress={() => { setIndexDelFile(index); setModal(true) }}
+                                 />
+                              ))
+                           }
+                        </View>
                      </View>
-                     <View style={Styles.flex1}>
+                  )
-                        <Text style={[Styles.textDefaultSemiBold, { color: colors.text }]}>Anggota</Text>
+               }
-                        {entitiesMember.length === 0 && (
+               {entitiesMember.length > 0 && (
-                           <Text style={[Styles.textMediumNormal, { color: colors.dimmed }]}>Belum ada anggota dipilih</Text>
+                  <View>
+                     <View style={[Styles.rowSpaceBetween, Styles.mv05]}>
+                        <Text>Anggota</Text>
+                        <Text>Total {entitiesMember.length} Anggota</Text>
+                     </View>
+
+                     <View style={[Styles.borderAll, Styles.round10, Styles.p10]}>
+                        {entitiesMember.map(
+                           (item: { img: any; name: any }, index: any) => {
+                              return (
+                                 <BorderBottomItem
+                                    key={index}
+                                    borderType="bottom"
+                                    icon={
+                                       <ImageUser
+                                          src={`${ConstEnv.url_storage}/files/${item.img}`}
+                                          size="sm"
+                                       />
+                                    }
+                                    title={item.name}
+                                 />
+                              );
+                           }
                         )}
                      </View>
-                     {entitiesMember.length > 0 && (
+                  </View>
-                        <View style={[Styles.sectionBadge, { backgroundColor: colors.tabActive + '18' }]}>
+               )}
-                           <Text style={[Styles.textSmallSemiBold, { color: colors.tabActive }]}>{entitiesMember.length} orang</Text>
-                        </View>
-                     )}
-                     <MaterialCommunityIcons name="chevron-right" size={18} color={colors.dimmed} />
-                  </Pressable>
-                  {entitiesMember.length > 0 && (
-                     <View style={{ gap: 6 }}>
-                        {entitiesMember.map((item: { img: any; name: any; position?: string }, index: any) => (
-                           <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>
-                              {item.position && (
-                                 <View style={[Styles.positionBadge, { backgroundColor: colors.dimmed + '15' }]}>
-                                    <Text style={[Styles.textSmallSemiBold, { color: colors.dimmed }]} numberOfLines={1}>{item.position}</Text>
-                                 </View>
-                              )}
-                           </View>
-                        ))}
-                     </View>
-                  )}
-                  {error.member && (
-                     <Text style={[Styles.textMediumNormal, Styles.mt05, { color: colors.error }]}>
-                        Anggota tidak boleh kosong
-                     </Text>
-                  )}
-               </View>
-
             </View>
          </ScrollView>
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
+                  icon={<Ionicons name="trash" color="black" size={25} />}
                   title="Hapus"
                   onPress={() => { deleteFile(indexDelFile) }}
                />

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

@@ -9,7 +9,6 @@ import Styles from "@/constants/Styles";
 import { apiGetUser } from "@/lib/api";
 import { setMemberChoose } from "@/lib/memberChoose";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { AntDesign } from "@expo/vector-icons";
 import { router, Stack } from "expo-router";
 import React, { useEffect, useState } from "react";
@@ -24,7 +23,6 @@ type Props = {
 }
 
 export default function AddMemberCreateProject() {
-   const { colors } = useTheme();
    const dispatch = useDispatch()
    const { token, decryptToken } = useAuthSession()
    const [data, setData] = useState<Props[]>([])
@@ -105,7 +103,7 @@ export default function AddMemberCreateProject() {
                )
             }}
          />
-         <View style={[Styles.p15, Styles.flex1, { backgroundColor: colors.background }]}>
+         <View style={[Styles.p15, { flex: 1 }]}>
             <InputSearch onChange={(val) => setSearch(val)} value={search} />
 
             {
@@ -127,11 +125,10 @@ export default function AddMemberCreateProject() {
                   </View>
 
                   :
-                  <Text style={[Styles.textDefault, Styles.textCenter, { color: colors.dimmed }, Styles.pv05]}>Tidak ada member yang dipilih</Text>
+                  <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
             }
             <ScrollView
                showsVerticalScrollIndicator={false}
-               style={[Styles.h100, Styles.flex1, { backgroundColor: colors.background }]}
             >
 
                {
@@ -140,7 +137,7 @@ export default function AddMemberCreateProject() {
                         return (
                            <Pressable
                               key={index}
-                              style={[Styles.itemSelectModal, { borderColor: colors.icon + '20' }]}
+                              style={[Styles.itemSelectModal]}
                               onPress={() => {
                                  onChoose(item.id, item.name, item.img)
                               }}
@@ -152,14 +149,14 @@ export default function AddMemberCreateProject() {
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={colors.text} />
+                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )
                      }
                      )
                      :
-                     <Text style={[Styles.textDefault, Styles.textCenter]}>Tidak ada data</Text>
+                     <Text style={[Styles.textDefault, { textAlign: 'center' }]}>Tidak ada data</Text>
                }
             </ScrollView>
          </View>

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

@@ -1,6 +1,5 @@
 import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
-import ButtonSelect from "@/components/buttonSelect";
 import { InputForm } from "@/components/inputForm";
 import ModalAddDetailTugasProject from "@/components/project/modalAddDetailTugasProject";
 import Text from "@/components/Text";
@@ -8,7 +7,6 @@ import Styles from "@/constants/Styles";
 import { formatDateOnly } from "@/lib/fun_formatDateOnly";
 import { getDatesInRange } from "@/lib/fun_getDatesInRange";
 import { setTaskCreate } from "@/lib/taskCreate";
-import { useTheme } from "@/providers/ThemeProvider";
 import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack } from "expo-router";
 import 'intl';
@@ -18,6 +16,7 @@ import React, { useEffect, useState } from "react";
 import {
    KeyboardAvoidingView,
    Platform,
+   Pressable,
    SafeAreaView,
    ScrollView,
    View
@@ -28,7 +27,6 @@ import DateTimePicker, {
 import { useDispatch, useSelector } from "react-redux";
 
 export default function CreateProjectAddTask() {
-   const { colors } = useTheme();
    const headerHeight = useHeaderHeight();
    const dispatch = useDispatch()
    const [disable, setDisable] = useState(true);
@@ -121,7 +119,7 @@ export default function CreateProjectAddTask() {
    }
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => (
@@ -160,9 +158,9 @@ export default function CreateProjectAddTask() {
             behavior={Platform.OS === 'ios' ? 'padding' : undefined}
             keyboardVerticalOffset={headerHeight}
          >
-            <ScrollView style={[Styles.h100, { backgroundColor: colors.background }]}>
+            <ScrollView>
                <View style={[Styles.p15, Styles.mb100]}>
-                  <View style={[Styles.wrapPaper, Styles.p10, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                  <View style={[Styles.wrapPaper, Styles.p10]}>
                      <DateTimePicker
                         mode="range"
                         startDate={range.startDate}
@@ -172,48 +170,52 @@ export default function CreateProjectAddTask() {
                            selected: Styles.selectedDate,
                            selected_label: Styles.cWhite,
                            range_fill: Styles.selectRangeDate,
-                           month_label: { color: colors.text },
+                           month_label: Styles.cBlack,
-                           month_selector_label: { color: colors.text },
+                           month_selector_label: Styles.cBlack,
-                           year_label: { color: colors.text },
+                           year_label: Styles.cBlack,
-                           year_selector_label: { color: colors.text },
+                           year_selector_label: Styles.cBlack,
-                           day_label: { color: colors.text },
+                           day_label: Styles.cBlack,
-                           time_label: { color: colors.text },
+                           time_label: Styles.cBlack,
-                           weekday_label: { color: colors.text },
+                           weekday_label: Styles.cBlack,
-                           button_next_image: { tintColor: colors.text },
-                           button_prev_image: { tintColor: colors.text },
                         }}
                      />
                   </View>
                   <View style={[Styles.mv10]}>
-                     <View style={[Styles.rowSpaceBetween, Styles.mb10]}>
+                     <View style={[Styles.rowSpaceBetween]}>
                         <View style={[{ width: "48%" }]}>
                            <Text style={[Styles.mb05]}>
-                              Tanggal Mulai <Text style={{ color: colors.error }}>*</Text>
+                              Tanggal Mulai <Text style={Styles.cError}>*</Text>
                            </Text>
-                           <View style={[Styles.wrapPaper, Styles.noShadow, Styles.borderAll, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+                           <View style={[Styles.wrapPaper, Styles.p10]}>
-                              <Text style={Styles.textCenter}>{from}</Text>
+                              <Text style={{ textAlign: "center" }}>{from}</Text>
                            </View>
                         </View>
                         <View style={[{ width: "48%" }]}>
                            <Text style={[Styles.mb05]}>
-                              Tanggal Berakhir <Text style={{ color: colors.error }}>*</Text>
+                              Tanggal Berakhir <Text style={Styles.cError}>*</Text>
                            </Text>
-                           <View style={[Styles.wrapPaper, Styles.noShadow, Styles.borderAll, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+                           <View style={[Styles.wrapPaper, Styles.p10]}>
-                              <Text style={Styles.textCenter}>{to}</Text>
+                              <Text style={{ textAlign: "center" }}>{to}</Text>
                            </View>
                         </View>
                      </View>
                      {
-                        (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.mt05, { color: colors.error }]}>Tanggal tidak boleh kosong</Text>
+                        (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
                      }
-                     <ButtonSelect value="Detail" onPress={() => { setModalDetail(true) }} disabled={from == "" || to == ""} />
+                     <Pressable
+                        style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
+                        disabled={dsbButton}
+                        onPress={() => { setModalDetail(true) }}
+                     >
+                        <Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
+                     </Pressable>
                   </View>
                   <InputForm
                      label="Judul Tugas"
                      type="default"
                      placeholder="Judul Tugas"
                      required
-                     bg={colors.card}
+                     bg="white"
                      value={title}
                      error={error.title}
                      errorText="Judul tidak boleh kosong"

app/(application)/project/index.tsx

@@ -7,23 +7,19 @@ import ProgressBar from "@/components/progressBar";
 import Skeleton from "@/components/skeleton";
 import SkeletonTwoItem from "@/components/skeletonTwoItem";
 import Text from "@/components/Text";
-import WrapTab from "@/components/wrapTab";
 import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
 import { apiGetProject } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import {
    AntDesign,
    Ionicons,
    MaterialCommunityIcons,
 } from "@expo/vector-icons";
-import { useInfiniteQuery, useQueryClient } from "@tanstack/react-query";
 import { router, useLocalSearchParams } from "expo-router";
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useState } from "react";
 import { Pressable, RefreshControl, ScrollView, View, VirtualizedList } from "react-native";
 import { useSelector } from "react-redux";
-import AsyncStorage from "@react-native-async-storage/async-storage";
 
 type Props = {
    id: string;
@@ -42,41 +38,26 @@ export default function ListProject() {
       cat?: string;
       year?: string;
    }>();
-   const [statusFix, setStatusFix] = useState<'0' | '1' | '2' | '3'>(
+   const [statusFix, setStatusFix] = useState<'0' | '1' | '2' | '3'>('0')
-      (status == '1' || status == '2' || status == '3') ? status : '0'
-   )
    const { token, decryptToken } = useAuthSession();
-   const { colors } = useTheme();
    const entityUser = useSelector((state: any) => state.user)
    const [search, setSearch] = useState("")
+   const [nameGroup, setNameGroup] = useState("")
+   const [isYear, setYear] = useState("")
+   const [data, setData] = useState<Props[]>([])
    const [isList, setList] = useState(false)
    const update = useSelector((state: any) => state.projectUpdate)
-
+   const [loading, setLoading] = useState(true)
-   useEffect(() => {
+   const arrSkeleton = Array.from({ length: 3 }, (_, index) => index)
-      AsyncStorage.getItem('division_view_mode').then((val) => {
+   const [page, setPage] = useState(1)
-         if (val !== null) setList(val === 'list')
+   const [waiting, setWaiting] = useState(false)
-      })
-   }, [])
-
-   function toggleView() {
-      const next = !isList
-      setList(next)
-      AsyncStorage.setItem('division_view_mode', next ? 'list' : 'grid')
-   }
-   const queryClient = useQueryClient()
    const [refreshing, setRefreshing] = useState(false)
 
-   // TanStack Query for Projects with Infinite Scroll
+   async function handleLoad(loading: boolean, thisPage: number) {
-   const {
+      try {
-      data,
+         setLoading(loading)
-      fetchNextPage,
+         setWaiting(true)
-      hasNextPage,
+         setPage(thisPage)
-      isFetchingNextPage,
-      isLoading,
-      refetch
-   } = useInfiniteQuery({
-      queryKey: ['projects', { statusFix, search, group, cat, year }],
-      queryFn: async ({ pageParam = 1 }) => {
          const hasil = await decryptToken(String(token?.current));
          const response = await apiGetProject({
             user: hasil,
@@ -84,152 +65,164 @@ export default function ListProject() {
             search: search,
             group: String(group),
             kategori: String(cat),
-            page: pageParam,
+            page: thisPage,
             year: String(year)
          });
-         return response;
-      },
-      initialPageParam: 1,
-      getNextPageParam: (lastPage, allPages) => {
-         return lastPage.data.length > 0 ? allPages.length + 1 : undefined;
-      },
-      enabled: !!token?.current,
-      staleTime: 0,
-   })
 
-   // Refetch when manual update state changes
+         if (response.success) {
+            setNameGroup(response.filter.name);
+            setYear(response.tahun)
+            if (thisPage == 1) {
+               setData(response.data);
+            } else if (thisPage > 1 && response.data.length > 0) {
+               setData([...data, ...response.data])
+            } else {
+               return;
+            }
+         }
+      } catch (error) {
+         console.error(error);
+      } finally {
+         setLoading(false)
+         setWaiting(false)
+      }
+   }
+
    useEffect(() => {
-      refetch()
+      handleLoad(false, 1);
-   }, [update.data, refetch])
+   }, [update.data]);
 
-   // Flatten pages into a single data array
-   const flatData = useMemo(() => {
-      return data?.pages.flatMap(page => page.data) || [];
-   }, [data])
 
-   // Get metadata from the first available page
+   useEffect(() => {
-   const nameGroup = useMemo(() => data?.pages[0]?.filter?.name || "", [data])
+      handleLoad(true, 1);
-   const isYear = useMemo(() => data?.pages[0]?.tahun || "", [data])
+   }, [statusFix, search, group, cat, year]);
+
+   const loadMoreData = () => {
+      if (waiting) return
+      setTimeout(() => {
+         handleLoad(false, page + 1)
+      }, 1000);
+   }
 
    const handleRefresh = async () => {
       setRefreshing(true)
-      await queryClient.invalidateQueries({ queryKey: ['projects'] })
+      handleLoad(false, 1)
+      await new Promise(resolve => setTimeout(resolve, 2000));
       setRefreshing(false)
-   };
+   }
-
-   const loadMoreData = () => {
-      if (hasNextPage && !isFetchingNextPage) {
-         fetchNextPage()
-      }
-   };
-
-   const arrSkeleton = [0, 1, 2]
 
    const getItem = (_data: unknown, index: number): Props => ({
-      id: flatData[index]?.id,
+      id: data[index].id,
-      title: flatData[index]?.title,
+      title: data[index].title,
-      desc: flatData[index]?.desc,
+      desc: data[index].desc,
-      status: flatData[index]?.status,
+      status: data[index].status,
-      member: flatData[index]?.member,
+      member: data[index].member,
-      progress: flatData[index]?.progress,
+      progress: data[index].progress,
-      createdAt: flatData[index]?.createdAt,
+      createdAt: data[index].createdAt,
    })
 
    return (
-      <View style={[Styles.p15, Styles.flex1, { backgroundColor: colors.background }]}>
+      <View style={[Styles.p15, { flex: 1 }]}>
          <View>
-            <WrapTab>
+            <ScrollView horizontal style={[Styles.mb10]} showsHorizontalScrollIndicator={false}>
-               <ScrollView horizontal showsHorizontalScrollIndicator={false} style={[Styles.round20]}>
+               <ButtonTab
-                  <ButtonTab
+                  active={statusFix}
-                     active={statusFix}
+                  value="0"
-                     value="0"
+                  onPress={() => { setStatusFix("0") }}
-                     onPress={() => { setStatusFix("0") }}
+                  label="Segera"
-                     label="Segera"
+                  icon={
-                     icon={
+                     <MaterialCommunityIcons
-                        <MaterialCommunityIcons
+                        name="clock-alert-outline"
-                           name="clock-alert-outline"
+                        color={statusFix == "0" ? "white" : "black"}
-                           color={statusFix == "0" ? "white" : colors.dimmed}
+                        size={20}
-                           size={20}
+                     />
-                        />
+                  }
-                     }
+                  n={4}
-                     n={4}
+               />
-                  />
+               <ButtonTab
-                  <ButtonTab
+                  active={statusFix}
-                     active={statusFix}
+                  value="1"
-                     value="1"
+                  onPress={() => { setStatusFix("1") }}
-                     onPress={() => { setStatusFix("1") }}
+                  label="Dikerjakan"
-                     label="Dikerjakan"
+                  icon={
-                     icon={
+                     <MaterialCommunityIcons
-                        <MaterialCommunityIcons
+                        name="progress-check"
-                           name="progress-check"
+                        color={statusFix == "1" ? "white" : "black"}
-                           color={statusFix == "1" ? "white" : colors.dimmed}
+                        size={20}
-                           size={20}
+                     />
-                        />
+                  }
-                     }
+                  n={4}
-                     n={4}
+               />
-                  />
+               <ButtonTab
-                  <ButtonTab
+                  active={statusFix}
-                     active={statusFix}
+                  value="2"
-                     value="2"
+                  onPress={() => { setStatusFix("2") }}
-                     onPress={() => { setStatusFix("2") }}
+                  label="Selesai"
-                     label="Selesai"
+                  icon={
-                     icon={
+                     <Ionicons
-                        <Ionicons
+                        name="checkmark-done-circle-outline"
-                           name="checkmark-done-circle-outline"
+                        color={statusFix == "2" ? "white" : "black"}
-                           color={statusFix == "2" ? "white" : colors.dimmed}
+                        size={20}
-                           size={20}
+                     />
-                        />
+                  }
-                     }
+                  n={4}
-                     n={4}
+               />
-                  />
+               <ButtonTab
-                  <ButtonTab
+                  active={statusFix}
-                     active={statusFix}
+                  value="3"
-                     value="3"
+                  onPress={() => { setStatusFix("3") }}
-                     onPress={() => { setStatusFix("3") }}
+                  label="Batal"
-                     label="Batal"
+                  icon={
-                     icon={
+                     <AntDesign
-                        <AntDesign
+                        name="closecircleo"
-                           name="closecircleo"
+                        color={statusFix == "3" ? "white" : "black"}
-                           color={statusFix == "3" ? "white" : colors.dimmed}
+                        size={20}
-                           size={20}
+                     />
-                        />
+                  }
-                     }
+                  n={4}
-                     n={4}
+               />
-                  />
+            </ScrollView>
-               </ScrollView>
+            <View style={[Styles.rowSpaceBetween, { alignItems: 'center' }]}>
-            </WrapTab>
-
-            <View style={[Styles.rowSpaceBetween, Styles.rowItemsCenter]}>
                <InputSearch width={68} onChange={setSearch} />
-               <Pressable onPress={toggleView}>
+               <Pressable
+                  onPress={() => {
+                     setList(!isList);
+                  }}
+               >
                   <MaterialCommunityIcons
                      name={isList ? "format-list-bulleted" : "view-grid"}
-                     color={colors.text}
+                     color={"black"}
                      size={30}
                   />
                </Pressable>
             </View>
-            <View style={[Styles.mt10]}>
+            <View style={[Styles.mv05]}>
                {
+                  // entityUser.role != 'cosupadmin' && entityUser.role != 'admin' &&
                   <View style={[Styles.rowOnly]}>
                      <Text style={[Styles.mr05]}>Filter :</Text>
                      {
                         (entityUser.role == "supadmin" || entityUser.role == "developer") &&
-                        <LabelStatus size="small" category="secondary" text={nameGroup} style={[Styles.mr05]} />
+                        <LabelStatus size="small" category="secondary" text={nameGroup} style={{ marginRight: 5 }} />
                      }
                      {
                         (entityUser.role == 'user' || entityUser.role == 'coadmin')
-                           ? (cat == 'null' || cat == 'undefined' || cat == undefined || cat == '' || cat == 'data-saya') ? <LabelStatus size="small" category="secondary" text="Kegiatan Saya" style={[Styles.mr05]} /> : <LabelStatus size="small" category="secondary" text="Semua Kegiatan" style={[Styles.mr05]} />
+                           ? (cat == 'null' || cat == 'undefined' || cat == undefined || cat == '' || cat == 'data-saya') ? <LabelStatus size="small" category="secondary" text="Kegiatan Saya" style={{ marginRight: 5 }} /> : <LabelStatus size="small" category="secondary" text="Semua Kegiatan" style={{ marginRight: 5 }} />
                            : ''
                      }
-                     <LabelStatus size="small" category="secondary" text={isYear} style={[Styles.mr05]} />
+                     <LabelStatus size="small" category="secondary" text={isYear} style={{ marginRight: 5 }} />
+                     {/* {
+                        (entityUser.role == 'user' || entityUser.role == 'coadmin')
+                           ? (cat == 'null' || cat == 'undefined' || cat == undefined || cat == '' || cat == 'data-saya') ? <LabelStatus size="small" category="primary" text="Kegiatan Saya" /> : <LabelStatus size="small" category="primary" text="Semua Kegiatan" />
+                           : ''
+                     } */}
                   </View>
                }
             </View>
          </View>
-         <View style={[Styles.flex2, Styles.mt10]}>
+         <View style={[{ flex: 2 }]}>
             {
-               isLoading ?
+               loading ?
                   isList ?
                      arrSkeleton.map((item, index) => (
                         <SkeletonTwoItem key={index} />
@@ -239,13 +232,13 @@ export default function ListProject() {
                         <Skeleton key={index} width={100} height={180} widthType="percent" borderRadius={10} />
                      ))
                   :
-                  flatData.length > 0
+                  data.length > 0
                      ?
                      isList ? (
                         <View style={[Styles.h100]}>
                            <VirtualizedList
-                              data={flatData}
+                              data={data}
-                              getItemCount={() => flatData.length}
+                              getItemCount={() => data.length}
                               getItem={getItem}
                               renderItem={({ item, index }: { item: Props, index: number }) => {
                                  return (
@@ -253,13 +246,12 @@ export default function ListProject() {
                                        key={index}
                                        onPress={() => { router.push(`/project/${item.id}`); }}
                                        borderType="bottom"
-                                       bgColor="transparent"
                                        icon={
-                                          <View style={[Styles.iconContent]} >
+                                          <View style={[Styles.iconContent, ColorsStatus.lightGreen]} >
                                              <AntDesign
                                                 name="areachart"
                                                 size={25}
-                                                color={"black"}
+                                                color={"#384288"}
                                              />
                                           </View>
                                        }
@@ -275,16 +267,38 @@ export default function ListProject() {
                                  <RefreshControl
                                     refreshing={refreshing}
                                     onRefresh={handleRefresh}
-                                    tintColor={colors.icon}
                                  />
                               }
                            />
+                           {/* {
+                              data.map((item, index) => {
+                                 return (
+                                    <BorderBottomItem
+                                       key={index}
+                                       onPress={() => { router.push(`/project/${item.id}`); }}
+                                       borderType="bottom"
+                                       icon={
+                                          <View
+                                             style={[Styles.iconContent, ColorsStatus.lightGreen]}
+                                          >
+                                             <AntDesign
+                                                name="areachart"
+                                                size={25}
+                                                color={"#384288"}
+                                             />
+                                          </View>
+                                       }
+                                       title={item.title}
+                                    />
+                                 );
+                              })
+                           } */}
                         </View>
                      ) : (
                         <View style={[Styles.h100]}>
                            <VirtualizedList
-                              data={flatData}
+                              data={data}
-                              getItemCount={() => flatData.length}
+                              getItemCount={() => data.length}
                               getItem={getItem}
                               renderItem={({ item, index }: { item: Props, index: number }) => {
                                  return (
@@ -296,21 +310,20 @@ export default function ListProject() {
                                        content="page"
                                        title={item.title}
                                        headerColor="primary"
-                                       titleTail={2}
                                     >
                                        <ProgressBar value={item.progress} category="list" />
                                        <View style={[Styles.rowSpaceBetween]}>
-                                          <Text style={[Styles.textDefault, { color: colors.dimmed }]}>
+                                          <Text style={[Styles.textDefault, Styles.cGray]}>
                                              {item.createdAt}
                                           </Text>
                                           <LabelStatus
                                              size="default"
                                              category={
-                                                item.status === 0 ? 'secondary' :
+                                                item.status === 0 ? 'primary' :
                                                    item.status === 1 ? 'warning' :
                                                       item.status === 2 ? 'success' :
                                                          item.status === 3 ? 'error' :
-                                                            'secondary'
+                                                            'primary'
                                              }
                                              text={
                                                 item.status === 0 ? 'SEGERA' :
@@ -332,15 +345,51 @@ export default function ListProject() {
                                  <RefreshControl
                                     refreshing={refreshing}
                                     onRefresh={handleRefresh}
-                                    tintColor={colors.icon}
                                  />
                               }
                            />
+                           {/* {data.map((item, index) => {
+                              return (
+                                 <PaperGridContent
+                                    key={index}
+                                    onPress={() => {
+                                       router.push(`/project/${item.id}`);
+                                    }}
+                                    content="page"
+                                    title={item.title}
+                                    headerColor="primary"
+                                 >
+                                    <ProgressBar value={item.progress} category="list" />
+                                    <View style={[Styles.rowSpaceBetween]}>
+                                       <Text style={[Styles.textDefault, Styles.cGray]}>
+                                          {item.createdAt}
+                                       </Text>
+                                       <LabelStatus
+                                          size="default"
+                                          category={
+                                             item.status === 0 ? 'primary' :
+                                                item.status === 1 ? 'warning' :
+                                                   item.status === 2 ? 'success' :
+                                                      item.status === 3 ? 'error' :
+                                                         'primary'
+                                          }
+                                          text={
+                                             item.status === 0 ? 'SEGERA' :
+                                                item.status === 1 ? 'DIKERJAKAN' :
+                                                   item.status === 2 ? 'SELESAI' :
+                                                      item.status === 3 ? 'DIBATALKAN' :
+                                                         'SEGERA'
+                                          }
+                                       />
+                                    </View>
+                                 </PaperGridContent>
+                              );
+                           })} */}
                         </View>
                      )
                      :
                      <View style={[Styles.mt15]}>
-                        <Text style={[Styles.textDefault, Styles.textCenter, { color: colors.dimmed }]}>Tidak ada kegiatan</Text>
+                        <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada kegiatan</Text>
                      </View>
             }
          </View>