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

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

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
 

android/app/build.gradle

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

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.1.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: "9",
+         buildNumber: "7",
          infoPlist: {
             ITSAppUsesNonExemptEncryption: false,
             CFBundleDisplayName: "Desa+"
@@ -23,7 +23,7 @@ export default {
       },
       android: {
          package: "mobiledarmasaba.app",
-         versionCode: 16,
+         versionCode: 15,
          adaptiveIcon: {
             foregroundImage: "./assets/images/logo-icon-small.png",
             backgroundColor: "#ffffff"
@@ -79,12 +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,
       }
    }
 };

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,100 +8,22 @@ 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 {
@@ -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,10 +93,11 @@ 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' }} />
@@ -212,18 +112,6 @@ export default function RootLayout() {
                )
             }} />
             <Stack.Screen name="profile" options={{ title: 'Profile' }} />
-            <Stack.Screen name="setting/index" options={{
-               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
-               title: 'Pengaturan',
-               headerTitleAlign: 'center',
-               // headerRight: () => <HeaderRightProjectList />
-               header: () => (
-                  <AppHeader title="Pengaturan"
-                     showBack={true}
-                     onPressLeft={() => router.back()}
-                  />
-               )
-            }} />
             <Stack.Screen name="member/index" options={{
                // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                title: 'Anggota',
@@ -322,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

@@ -8,7 +8,6 @@ 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 * as FileSystem from 'expo-file-system';
 import { startActivityAsync } from 'expo-intent-launcher';
@@ -52,7 +51,6 @@ 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[]>([])
@@ -89,11 +87,9 @@ export default function DetailAnnouncement() {
          } 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)
       }
@@ -179,7 +175,7 @@ export default function DetailAnnouncement() {
    };
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -197,23 +193,22 @@ export default function DetailAnnouncement() {
          />
          <ScrollView
             showsVerticalScrollIndicator={false}
-            style={[Styles.h100, { backgroundColor: colors.background }]}
+            style={[Styles.h100]}
             refreshControl={
                <RefreshControl
                   refreshing={refreshing}
                   onRefresh={() => handleRefresh()}
-                  tintColor={colors.icon}
                />
             }
          >
             <View style={[Styles.p15, Styles.mb50]}>
-               <View style={[Styles.wrapPaper, Styles.borderAll, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+               <View style={[Styles.wrapPaper]}>
                   {
                      loading ?
                         <View>
                            <View style={[Styles.rowOnly]}>
                               <Skeleton width={30} height={30} borderRadius={10} />
-                              <View style={[Styles.flex1, Styles.ph05]}>
+                              <View style={[{ flex: 1 }, Styles.ph05]}>
                                  <Skeleton width={100} widthType="percent" height={30} borderRadius={10} />
                               </View>
                            </View>
@@ -223,8 +218,8 @@ export default function DetailAnnouncement() {
                         </View>
                         :
                         <>
-                           <View style={[Styles.rowOnly, Styles.alignStart]}>
+                           <View style={[Styles.rowItemsCenter, { alignItems: 'flex-start' }]}>
-                              <MaterialIcons name="campaign" size={25} color={colors.text} style={[Styles.mr05]} />
+                              <MaterialIcons name="campaign" size={25} color="black" style={[Styles.mr05]} />
                               <Text style={[Styles.textDefaultSemiBold, Styles.w90, Styles.mt02]}>{data?.title}</Text>
                            </View>
                            <View style={[Styles.mt10]}>
@@ -233,7 +228,7 @@ export default function DetailAnnouncement() {
                                     <RenderHTML
                                        contentWidth={contentWidth}
                                        source={{ html: data?.desc }}
-                                       baseStyle={{ color: colors.text }}
+                                       baseStyle={{ color: 'black' }}
                                     />
                                     :
                                     <Text>{data?.desc}</Text>
@@ -245,18 +240,18 @@ export default function DetailAnnouncement() {
                </View>
                {
                   dataFile.length > 0 && (
-                     <View style={[Styles.wrapPaper, Styles.borderAll, Styles.mt10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+                     <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={index === dataFile.length - 1 ? 'none' : 'bottom'}
+                              borderType="bottom"
                               icon={<MaterialCommunityIcons
                                  name={isImageFile(item.extension) ? "file-image-outline" : "file-document-outline"}
                                  size={25}
-                                 color={colors.text}
+                                 color="black"
                               />}
                               title={item.name + '.' + item.extension}
                               titleWeight="normal"
@@ -270,7 +265,7 @@ export default function DetailAnnouncement() {
                      </View>
                   )
                }
-               <View style={[Styles.wrapPaper, Styles.borderAll, Styles.mt10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+               <View style={[Styles.wrapPaper, Styles.mt10]}>
                   {
                      loading ?
                         arrSkeleton.map((item, index) => {
@@ -291,7 +286,7 @@ export default function DetailAnnouncement() {
                                     dataMember[v].map((item: any, x: any) => {
                                        return (
                                           <View key={x} style={[Styles.rowItemsCenter, Styles.w90]}>
-                                             <Entypo name="dot-single" size={24} color={colors.text} />
+                                             <Entypo name="dot-single" size={24} color="black" />
                                              <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode='tail'>{item.division}</Text>
                                           </View>
                                        )
@@ -320,7 +315,7 @@ export default function DetailAnnouncement() {
                      accessibilityRole="button"
                      accessibilityLabel="Close image viewer"
                   >
-                     <Text style={[Styles.textWhite, Styles.font26]}>✕</Text>
+                     <Text style={{ color: 'white', fontSize: 26 }}>✕</Text>
                   </Pressable>
 
                   {/* MENU */}
@@ -330,17 +325,17 @@ export default function DetailAnnouncement() {
                      accessibilityLabel="Download or share image"
                      disabled={loadingOpen}
                   >
-                     <Text style={[{ color: loadingOpen ? 'gray' : 'white' }, Styles.font26]}>⋯</Text>
+                     <Text style={{ color: loadingOpen ? 'gray' : 'white', fontSize: 22 }}>⋯</Text>
                   </Pressable>
                </View>
             )}
             FooterComponent={({ imageIndex }) => (
-               <View style={[
+               <View style={{
-                  Styles.pb20,
+                  paddingBottom: 20,
-                  Styles.ph16,
+                  paddingHorizontal: 16,
-                  Styles.alignCenter,
+                  alignItems: 'center',
-               ]}>
+               }}>
-                  <Text style={[Styles.textWhite, Styles.font16]}>{chooseFile?.name}.{chooseFile?.extension}</Text>
+                  <Text style={{ color: 'white', fontSize: 16 }}>{chooseFile?.name}.{chooseFile?.extension}</Text>
                </View>
             )}
          />

app/(application)/announcement/create.tsx

@@ -4,7 +4,7 @@ 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";
@@ -12,12 +12,11 @@ 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 * as DocumentPicker from "expo-document-picker";
 import { router, Stack } from "expo-router";
 import React, { useEffect, useState } from "react";
-import { SafeAreaView, ScrollView, View } from "react-native";
+import { SafeAreaView, ScrollView, StyleSheet, View } from "react-native";
 import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
@@ -25,7 +24,6 @@ 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>([])
@@ -95,21 +93,17 @@ export default function CreateAnnouncement() {
 
          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', })
             router.back();
-         } else {
-            Toast.show({ type: 'small', text1: response.message, })
          }
-      } catch (error: any) {
+      } catch (error) {
          console.error(error);
-         const message = error?.response?.data?.message || "Tidak dapat terhubung ke server"
-
-         Toast.show({
-            type: 'small',
-            text1: message
-         })
       } finally {
          setLoading(false)
       }
@@ -135,7 +129,7 @@ export default function CreateAnnouncement() {
    }
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => (
@@ -164,24 +158,24 @@ export default function CreateAnnouncement() {
                      showBack={true}
                      onPressLeft={() => router.back()}
                      right={
-                        <ButtonSaveHeader
+                           <ButtonSaveHeader
-                           disable={disableBtn || divisionMember.length == 0 || loading ? true : false}
+                              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 }]}
+            style={[Styles.h100]}
          >
             <View style={[Styles.p15]}>
                <InputForm
@@ -190,7 +184,6 @@ export default function CreateAnnouncement() {
                   placeholder="Judul Pengumuman"
                   required
                   error={error.title}
-                  bg={colors.card}
                   errorText="Judul harus diisi"
                   onChange={(val) => validationForm("title", val)}
                />
@@ -200,7 +193,6 @@ export default function CreateAnnouncement() {
                   placeholder="Deskripsi Pengumuman"
                   required
                   error={error.desc}
-                  bg={colors.card}
                   errorText="Pengumuman harus diisi"
                   onChange={(val) => validationForm("desc", val)}
                   multiline
@@ -209,27 +201,21 @@ export default function CreateAnnouncement() {
                {
                   fileForm.length > 0
                   &&
-                  <>
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
-                     <View style={[Styles.rowSpaceBetween, Styles.mv05]}>
+                     <Text style={[Styles.textDefaultSemiBold]}>File</Text>
-                        <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                     {
-                        <Text style={[Styles.textDefault]}>{fileForm.length} file</Text>
+                        fileForm.map((item, index) => (
-                     </View>
+                           <BorderBottomItem
-                     <View style={[Styles.borderAll, Styles.round05, Styles.p10, Styles.mb10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+                              key={index}
-                        {
+                              borderType={fileForm.length > 1 ? "bottom" : "none"}
-                           fileForm.map((item, index) => (
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
-                              <BorderBottomItem
+                              title={item.name}
-                                 key={index}
+                              titleWeight="normal"
-                                 borderType={fileForm.length - 1 == index ? "none" : "bottom"}
+                              onPress={() => { setIndexDelFile(index); setModalFile(true) }}
-                                 icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
+                           />
-                                 title={item.name}
+                        ))
-                                 bgColor="transparent"
+                     }
-                                 titleWeight="normal"
+                  </View>
-                                 onPress={() => { setIndexDelFile(index); setModalFile(true) }}
-                              />
-                           ))
-                        }
-                     </View>
-                  </>
                }
 
                <ButtonSelect
@@ -242,30 +228,25 @@ export default function CreateAnnouncement() {
                {
                   divisionMember.length > 0
                   &&
-                  <>
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10]}>
-                     <View style={[Styles.rowSpaceBetween, Styles.mv05]}>
+                     {
-                        <Text style={[Styles.textDefaultSemiBold]}>Divisi</Text>
+                        divisionMember.map((item: { name: any; Division: any }, index: any) => {
-                     </View>
+                           return (
-                     <View style={[Styles.borderAll, Styles.round05, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+                              <View key={index}>
-                        {
+                                 <Text style={[Styles.textDefaultSemiBold]}>{item.name}</Text>
-                           divisionMember.map((item: { name: any; Division: any }, index: any) => {
+                                 {
-                              return (
+                                    item.Division.map((division: any, i: any) => (
-                                 <View key={index}>
+                                       <View key={i} style={[Styles.rowItemsCenter, Styles.w90]}>
-                                    <Text style={[Styles.textDefaultSemiBold]}>{item.name}</Text>
+                                          <Entypo name="dot-single" size={24} color="black" />
-                                    {
+                                          <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode='tail'>{division.name}</Text>
-                                       item.Division.map((division: any, i: any) => (
+                                       </View>
-                                          <View key={i} style={[Styles.rowItemsCenter, Styles.w90]}>
+                                    ))
-                                             <Entypo name="dot-single" size={24} color={colors.text} />
+                                 }
-                                             <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode='tail'>{division.name}</Text>
+                              </View>
-                                          </View>
+                           )
-                                       ))
+                        })
-                                    }
+                     }
-                                 </View>
+                  </View>
-                              )
-                           })
-                        }
-                     </View>
-                  </>
                }
             </View>
          </ScrollView>
@@ -285,7 +266,7 @@ 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) }}
                />
@@ -295,4 +276,15 @@ export default function CreateAnnouncement() {
    );
 }
 
-
+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

@@ -4,7 +4,7 @@ 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';
@@ -12,7 +12,6 @@ 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 * as DocumentPicker from "expo-document-picker";
 import { router, Stack, useLocalSearchParams } from "expo-router";
@@ -36,7 +35,6 @@ 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<any>([]);
@@ -144,14 +142,9 @@ export default function EditAnnouncement() {
             dispatch(setUpdateAnnouncement(!update))
             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);
-         const message = error?.response?.data?.message || "Gagal mengubah data"
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoading(false)
       }
@@ -187,7 +180,7 @@ export default function EditAnnouncement() {
    }
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => (
@@ -230,10 +223,10 @@ export default function EditAnnouncement() {
                )
             }}
          />
-         {loading && <LoadingCenter />}
+         <LoadingOverlay visible={loading} />
          <ScrollView
             showsVerticalScrollIndicator={false}
-            style={[Styles.h100, { backgroundColor: colors.background }]}
+            style={[Styles.h100]}
          >
             <View style={[Styles.p15]}>
                <InputForm
@@ -242,7 +235,6 @@ export default function EditAnnouncement() {
                   placeholder="Judul Pengumuman"
                   required
                   error={error.title}
-                  bg={colors.card}
                   errorText="Judul harus diisi"
                   onChange={(val) => validationForm("title", val)}
                   value={dataForm.title}
@@ -253,7 +245,6 @@ export default function EditAnnouncement() {
                   placeholder="Deskripsi Pengumuman"
                   required
                   error={error.desc}
-                  bg={colors.card}
                   errorText="Pengumuman harus diisi"
                   onChange={(val) => validationForm("desc", val)}
                   value={dataForm.desc}
@@ -263,40 +254,33 @@ export default function EditAnnouncement() {
                {
                   (fileForm.length > 0 || dataFile.filter((val) => !val.delete).length > 0)
                   &&
-                  <>
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
-                     <View style={[Styles.rowSpaceBetween, Styles.mv05]}>
+                     <Text style={[Styles.textDefaultSemiBold]}>File</Text>
-                        <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                     {
-                        <Text style={[Styles.textDefault]}>{fileForm.length + dataFile.filter((val) => !val.delete).length} file</Text>
+                        dataFile.filter((val) => !val.delete).map((item, index) => (
-                     </View>
+                           <BorderBottomItem
-                     <View style={[Styles.borderAll, Styles.round05, Styles.p10, Styles.mb10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+                              key={index}
-                        {
+                              borderType={(fileForm.length + dataFile.length) > 1 ? "bottom" : "none"}
-                           dataFile.filter((val) => !val.delete).map((item, index) => (
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
-                              <BorderBottomItem
+                              title={item.name + '.' + item.extension}
-                                 key={index}
+                              titleWeight="normal"
-                                 borderType={dataFile.filter((val) => !val.delete).length - 1 == index && fileForm.length == 0 ? "none" : "bottom"}
+                              onPress={() => { setIndexDelFile({ id: item.id, cat: "oldFile" }); setModalFile(true) }}
-                                 icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
+                           />
-                                 title={item.name + '.' + item.extension}
+                        ))
-                                 titleWeight="normal"
+                     }
-                                 bgColor="transparent"
+                     {
-                                 onPress={() => { setIndexDelFile({ id: item.id, cat: "oldFile" }); setModalFile(true) }}
+                        fileForm.map((item, index) => (
-                              />
+                           <BorderBottomItem
-                           ))
+                              key={index}
-                        }
+                              borderType={(fileForm.length + dataFile.length) > 1 ? "bottom" : "none"}
-                        {
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
-                           fileForm.map((item, index) => (
+                              title={item.name}
-                              <BorderBottomItem
+                              titleWeight="normal"
-                                 key={index}
+                              onPress={() => { setIndexDelFile({ id: index, cat: "newFile" }); setModalFile(true) }}
-                                 borderType={fileForm.length - 1 == index ? "none" : "bottom"}
+                           />
-                                 icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
+                        ))
-                                 title={item.name}
+                     }
-                                 titleWeight="normal"
+                  </View>
-                                 bgColor="transparent"
-                                 onPress={() => { setIndexDelFile({ id: index, cat: "newFile" }); setModalFile(true) }}
-                              />
-                           ))
-                        }
-                     </View>
-                  </>
                }
                <ButtonSelect
                   value="Pilih divisi penerima pengumuman"
@@ -307,30 +291,25 @@ export default function EditAnnouncement() {
                {
                   dataMember.length > 0
                   &&
-                  <>
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10]}>
-                     <View style={[Styles.rowSpaceBetween, Styles.mv05]}>
+                     {
-                        <Text style={[Styles.textDefaultSemiBold]}>Divisi</Text>
+                        dataMember.map((item: { name: any; Division: any }, index: any) => {
-                     </View>
+                           return (
-                     <View style={[Styles.borderAll, Styles.round05, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+                              <View key={index}>
-                        {
+                                 <Text style={[Styles.textDefaultSemiBold]}>{item.name}</Text>
-                           dataMember.map((item: { name: any; Division: any }, index: any) => {
+                                 {
-                              return (
+                                    item.Division.map((division: any, i: any) => (
-                                 <View key={index}>
+                                       <View key={i} style={[Styles.rowItemsCenter, Styles.w90]}>
-                                    <Text style={[Styles.textDefaultSemiBold]}>{item.name}</Text>
+                                          <Entypo name="dot-single" size={24} color="black" />
-                                    {
+                                          <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode='tail'>{division.name}</Text>
-                                       item.Division.map((division: any, i: any) => (
+                                       </View>
-                                          <View key={i} style={[Styles.rowItemsCenter, Styles.w90]}>
+                                    ))
-                                             <Entypo name="dot-single" size={24} color={colors.text} />
+                                 }
-                                             <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode='tail'>{division.name}</Text>
+                              </View>
-                                          </View>
+                           )
-                                       ))
+                        })
-                                    }
+                     }
-                                 </View>
+                  </View>
-                              )
-                           })
-                        }
-                     </View>
-                  </>
                }
             </View>
          </ScrollView>
@@ -351,7 +330,7 @@ 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) }}
                />

app/(application)/announcement/index.tsx

@@ -6,7 +6,6 @@ import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
 import { apiGetAnnouncement } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { MaterialIcons } from "@expo/vector-icons";
 import { router } from "expo-router";
 import { useEffect, useState } from "react";
@@ -23,7 +22,6 @@ type Props = {
 
 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)
@@ -85,11 +83,11 @@ export default function Announcement() {
    })
 
    return (
-      <View style={[Styles.p15, Styles.flex1, { backgroundColor: colors.background }]}>
+      <View style={[Styles.p15, { flex: 1 }]}>
          <View>
             <InputSearch onChange={setSearch} />
          </View>
-         <View style={[Styles.flex2, Styles.mt05]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   arrSkeleton.map((item, index) => {
@@ -110,11 +108,10 @@ export default function Announcement() {
                                  key={index}
                                  onPress={() => { router.push(`/announcement/${item.id}`) }}
                                  borderType="bottom"
-                                 bgColor="transparent"
                                  icon={
-                                    // <View style={[Styles.iconContent]}>
+                                    <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                                    <MaterialIcons name="campaign" size={25} color={colors.text} />
+                                       <MaterialIcons name="campaign" size={25} color={'#384288'} />
-                                    // </View>
+                                    </View>
                                  }
                                  title={item.title}
                                  desc={item.desc.replace(/<[^>]*>?/gm, '').replace(/\r?\n|\r/g, ' ')}
@@ -130,12 +127,11 @@ export default function Announcement() {
                            <RefreshControl
                               refreshing={refreshing}
                               onRefresh={handleRefresh}
-                              tintColor={colors.icon}
                            />
                         }
                      />
                      :
-                     <Text style={[Styles.textDefault, Styles.textCenter, { color: colors.dimmed }]}>Tidak ada pengumuman</Text>
+                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>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,9 +1,9 @@
+import AlertKonfirmasi from "@/components/alertKonfirmasi"
 import AppHeader from "@/components/AppHeader"
 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 Text from "@/components/Text"
 import { ConstEnv } from "@/constants/ConstEnv"
@@ -11,7 +11,6 @@ import Styles from "@/constants/Styles"
 import { apiDeleteBanner, apiGetBanner } from "@/lib/api"
 import { setEntities } from "@/lib/bannerSlice"
 import { useAuthSession } from "@/providers/AuthProvider"
-import { useTheme } from "@/providers/ThemeProvider"
 import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons"
 import * as FileSystem from 'expo-file-system'
 import { startActivityAsync } from 'expo-intent-launcher'
@@ -33,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('')
@@ -42,7 +40,6 @@ export default function BannerList() {
    const [refreshing, setRefreshing] = useState(false)
    const [loadingOpen, setLoadingOpen] = useState(false)
    const [viewImg, setViewImg] = useState(false)
-   const [showDeleteModal, setShowDeleteModal] = useState(false)
 
    const handleDeleteEntity = async () => {
       try {
@@ -56,11 +53,9 @@ export default function BannerList() {
          } else {
             Toast.show({ type: 'small', text1: 'Gagal menghapus data', })
          }
-      } 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: 'Terjadi kesalahan', })
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setModal(false)
       }
@@ -110,7 +105,7 @@ export default function BannerList() {
 
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -135,10 +130,9 @@ export default function BannerList() {
                <RefreshControl
                   refreshing={refreshing}
                   onRefresh={handleRefresh}
-                  tintColor={colors.icon}
                />
             }
-            style={[Styles.h100, { backgroundColor: colors.background }]}
+            style={[Styles.h100]}
          >
             {
                entities.length > 0
@@ -160,12 +154,13 @@ export default function BannerList() {
                               />
                            }
                            title={index.title}
+                           width={65}
                         />
                      ))}
                   </View>
                   :
                   <View style={[Styles.p15, Styles.mb100]}>
-                     <Text style={[Styles.textDefault, Styles.textCenter]}>Tidak ada data</Text>
+                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
                   </View>
             }
 
@@ -175,7 +170,7 @@ export default function BannerList() {
          <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)
@@ -183,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)
@@ -194,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>
@@ -213,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,3 +1,4 @@
+import AlertKonfirmasi from "@/components/alertKonfirmasi";
 import AppHeader from "@/components/AppHeader";
 import BorderBottomItem from "@/components/borderBottomItem";
 import BorderBottomItem2 from "@/components/borderBottomItem2";
@@ -7,17 +8,16 @@ 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';
@@ -56,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 }>();
@@ -80,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 => {
@@ -158,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)
       }
@@ -178,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()
@@ -199,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)
@@ -248,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}
                   />
                }
             >
@@ -268,11 +256,10 @@ export default function DetailDiscussionGeneral() {
                         <BorderBottomItem2
                            dataFile={fileDiscussion}
                            descEllipsize={false}
-                           borderType="all"
+                           borderType="bottom"
-                           bgColor="white"
                            icon={
-                              <View style={[Styles.iconContent]}>
+                              <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                                 <MaterialIcons name="chat" size={25} color={'black'} />
+                                 <MaterialIcons name="chat" size={25} color={'#384288'} />
                               </View>
                            }
                            title={data?.title}
@@ -286,18 +273,18 @@ export default function DetailDiscussionGeneral() {
                            desc={data?.desc}
                            leftBottomInfo={
                               <View style={[Styles.rowItemsCenter]}>
-                                 <Ionicons name="chatbox-ellipses-outline" size={18} 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 }, Styles.mb05]}>{dataKomentar.length} Komentar</Text>
+                                 <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>{dataKomentar.length} Komentar</Text>
                               </View>
                            }
                            rightBottomInfo={
                               <View style={[Styles.rowItemsCenter]}>
-                                 <Text style={[Styles.textInformation, { color: colors.dimmed }, Styles.mb05]}>{data?.createdAt}</Text>
+                                 <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) => {
@@ -310,7 +297,7 @@ export default function DetailDiscussionGeneral() {
                               return (
                                  <BorderBottomItem
                                     key={i}
-                                    borderType="all"
+                                    borderType="bottom"
                                     colorPress
                                     icon={
                                        <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="xs" />
@@ -320,7 +307,6 @@ export default function DetailDiscussionGeneral() {
                                     desc={item.comment}
                                     rightBottomInfo={item.isEdited ? "Edited" : ""}
                                     descEllipsize={detailMore.includes(item.id) ? false : true}
-                                    bgColor="white"
                                     onPress={() => {
                                        setDetailMore((prev: any) => {
                                           if (prev.includes(item.id)) {
@@ -347,7 +333,7 @@ export default function DetailDiscussionGeneral() {
                <View style={[
                   Styles.contentItemCenter,
                   Styles.w100,
-                  { backgroundColor: colors.background },
+                  { backgroundColor: "#f4f4f4" },
                   viewEdit && Styles.borderTop
                ]}>
                   {
@@ -355,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
@@ -367,6 +353,7 @@ export default function DetailDiscussionGeneral() {
                               type="default"
                               round
                               placeholder="Kirim Komentar"
+                              bg="white"
                               onChange={(val: string) => setSelectKomentar({ ...selectKomentar, comment: val })}
                               value={selectKomentar.comment}
                               multiline
@@ -380,7 +367,7 @@ export default function DetailDiscussionGeneral() {
                                        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>
                               }
                            />
@@ -393,6 +380,7 @@ export default function DetailDiscussionGeneral() {
                               type="default"
                               round
                               placeholder="Kirim Komentar"
+                              bg="white"
                               onChange={setKomentar}
                               value={komentar}
                               multiline
@@ -406,13 +394,13 @@ export default function DetailDiscussionGeneral() {
                                        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"
                                  }
@@ -427,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

@@ -5,7 +5,7 @@ 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";
@@ -16,7 +16,6 @@ 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 * as DocumentPicker from "expo-document-picker";
 import { router, Stack } from "expo-router";
@@ -28,7 +27,6 @@ import { useDispatch, useSelector } from "react-redux";
 
 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: "" });
@@ -156,18 +154,16 @@ export default function CreateDiscussionGeneral() {
          } 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: () => (
@@ -208,8 +204,8 @@ 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" ||
@@ -219,7 +215,6 @@ export default function CreateDiscussionGeneral() {
                         placeholder="Pilih Lembaga Desa"
                         value={chooseGroup.label}
                         required
-                        bg={colors.card}
                         onPress={() => {
                            setValChoose(chooseGroup.val);
                            setValSelect("group");
@@ -236,7 +231,6 @@ export default function CreateDiscussionGeneral() {
                   placeholder="Judul"
                   required
                   error={error.title}
-                  bg={colors.card}
                   errorText="Judul tidak boleh kosong"
                   onChange={(val) => { validationForm("title", val) }}
                />
@@ -246,7 +240,6 @@ export default function CreateDiscussionGeneral() {
                   placeholder="Hal yang didiskusikan"
                   required
                   error={error.desc}
-                  bg={colors.card}
                   errorText="Diskusi tidak boleh kosong"
                   onChange={(val) => { validationForm("desc", val) }}
                   multiline
@@ -255,27 +248,21 @@ export default function CreateDiscussionGeneral() {
                {
                   fileForm.length > 0
                   &&
-                  <>
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
-                     <View style={[Styles.rowSpaceBetween, Styles.mv05]}>
+                     <Text style={[Styles.textDefaultSemiBold]}>File</Text>
-                        <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                     {
-                        <Text style={[Styles.textDefault]}>{fileForm.length} file</Text>
+                        fileForm.map((item, index) => (
-                     </View>
+                           <BorderBottomItem
-                     <View style={[Styles.borderAll, Styles.round05, Styles.p10, Styles.mb10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+                              key={index}
-                        {
+                              borderType={fileForm.length > 1 ? "bottom" : "none"}
-                           fileForm.map((item, index) => (
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
-                              <BorderBottomItem
+                              title={item.name}
-                                 key={index}
+                              titleWeight="normal"
-                                 borderType={fileForm.length - 1 == index ? "none" : "bottom"}
+                              onPress={() => { setIndexDelFile(index); setModalFile(true) }}
-                                 icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
+                           />
-                                 title={item.name}
+                        ))
-                                 bgColor="transparent"
+                     }
-                                 titleWeight="normal"
+                  </View>
-                                 onPress={() => { setIndexDelFile(index); setModalFile(true) }}
-                              />
-                           ))
-                        }
-                     </View>
-                  </>
                }
                <ButtonSelect
                   value="Pilih Anggota"
@@ -300,22 +287,21 @@ export default function CreateDiscussionGeneral() {
                   entitiesMember.length > 0 &&
                   <View>
                      <View style={[Styles.rowSpaceBetween, Styles.mv05]}>
-                        <Text style={[Styles.textDefaultSemiBold]}>Anggota</Text>
+                        <Text>Anggota</Text>
-                        <Text style={[Styles.textDefault]}>{entitiesMember.length} Anggota</Text>
+                        <Text>Total {entitiesMember.length} Anggota</Text>
                      </View>
 
-                     <View style={[Styles.borderAll, Styles.round05, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+                     <View style={[Styles.borderAll, Styles.round10, Styles.p10]}>
                         {
                            entitiesMember.map((item: { img: any; name: any; }, index: any) => {
                               return (
                                  <BorderBottomItem
                                     key={index}
-                                    borderType={entitiesMember.length - 1 == index ? "none" : "bottom"}
+                                    borderType="bottom"
                                     icon={
-                                       <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="xs" />
+                                       <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="sm" />
                                     }
                                     title={item.name}
-                                    bgColor="transparent"
                                  />
                               )
                            })
@@ -341,7 +327,7 @@ export default function CreateDiscussionGeneral() {
          <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) }}
                />

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

@@ -5,13 +5,12 @@ 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 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";
@@ -22,7 +21,6 @@ import { useDispatch, useSelector } from "react-redux";
 
 export default function EditDiscussionGeneral() {
    const { token, decryptToken } = useAuthSession();
-   const { colors } = useTheme();
    const { id } = useLocalSearchParams<{ id: string }>();
    const [disableBtn, setDisableBtn] = useState(false)
    const dispatch = useDispatch()
@@ -154,21 +152,17 @@ export default function EditDiscussionGeneral() {
             dispatch(setUpdateDiscussionGeneralDetail(!update))
             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);
-         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: () => (
@@ -203,15 +197,14 @@ export default function EditDiscussionGeneral() {
                )
             }}
          />
-         {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]}>
                <InputForm
                   label="Judul"
                   type="default"
                   placeholder="Judul"
                   required
-                  bg={colors.card}
                   error={error.title}
                   value={dataForm.title}
                   errorText="Judul tidak boleh kosong"
@@ -222,7 +215,6 @@ export default function EditDiscussionGeneral() {
                   type="default"
                   placeholder="Hal yang didiskusikan"
                   required
-                  bg={colors.card}
                   error={error.desc}
                   value={dataForm.desc}
                   errorText="Diskusi tidak boleh kosong"
@@ -233,40 +225,33 @@ export default function EditDiscussionGeneral() {
                {
                   (fileForm.length > 0 || dataFile.filter((val) => !val.delete).length > 0)
                   &&
-                  <>
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
-                     <View style={[Styles.rowSpaceBetween, Styles.mv05]}>
+                     <Text style={[Styles.textDefaultSemiBold]}>File</Text>
-                        <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                     {
-                        <Text style={[Styles.textDefault]}>{fileForm.length + dataFile.filter((val) => !val.delete).length} file</Text>
+                        dataFile.filter((val) => !val.delete).map((item, index) => (
-                     </View>
+                           <BorderBottomItem
-                     <View style={[Styles.borderAll, Styles.round05, Styles.p10, Styles.mb10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+                              key={index}
-                        {
+                              borderType={(fileForm.length + dataFile.length) > 1 ? "bottom" : "none"}
-                           dataFile.filter((val) => !val.delete).map((item, index) => (
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
-                              <BorderBottomItem
+                              title={item.name + '.' + item.extension}
-                                 key={index}
+                              titleWeight="normal"
-                                 borderType={dataFile.filter((val) => !val.delete).length - 1 == index && fileForm.length == 0 ? "none" : "bottom"}
+                              onPress={() => { setIndexDelFile({ id: item.id, cat: "oldFile" }); setModalFile(true) }}
-                                 icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
+                           />
-                                 title={item.name + '.' + item.extension}
+                        ))
-                                 titleWeight="normal"
+                     }
-                                 bgColor="transparent"
+                     {
-                                 onPress={() => { setIndexDelFile({ id: item.id, cat: "oldFile" }); setModalFile(true) }}
+                        fileForm.map((item, index) => (
-                              />
+                           <BorderBottomItem
-                           ))
+                              key={index}
-                        }
+                              borderType={(fileForm.length + dataFile.length) > 1 ? "bottom" : "none"}
-                        {
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
-                           fileForm.map((item, index) => (
+                              title={item.name}
-                              <BorderBottomItem
+                              titleWeight="normal"
-                                 key={index}
+                              onPress={() => { setIndexDelFile({ id: index, cat: "newFile" }); setModalFile(true) }}
-                                 borderType={fileForm.length - 1 == index ? "none" : "bottom"}
+                           />
-                                 icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
+                        ))
-                                 title={item.name}
+                     }
-                                 titleWeight="normal"
+                  </View>
-                                 bgColor="transparent"
-                                 onPress={() => { setIndexDelFile({ id: index, cat: "newFile" }); setModalFile(true) }}
-                              />
-                           ))
-                        }
-                     </View>
-                  </>
                }
             </View>
          </ScrollView>
@@ -274,7 +259,7 @@ export default function EditDiscussionGeneral() {
          <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) }}
                />

app/(application)/discussion/index.tsx

@@ -4,12 +4,10 @@ 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 { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { AntDesign, Feather, Ionicons, MaterialIcons } from "@expo/vector-icons";
 import { router, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
@@ -29,7 +27,6 @@ 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('')
@@ -99,26 +96,26 @@ export default function Discussion() {
    })
 
    return (
-      <View style={[Styles.p15, Styles.flex1, { 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"
                      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="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} />
-               </WrapTab>
+               </View>
             }
 
             <InputSearch onChange={setSearch} />
@@ -130,7 +127,7 @@ export default function Discussion() {
                </View>
             }
          </View>
-         <View style={[Styles.flex2, Styles.mt05]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   arrSkeleton.map((item: any, i: number) => {
@@ -148,14 +145,13 @@ export default function Discussion() {
                         renderItem={({ item, index }: { item: Props, index: number }) => {
                            return (
                               <BorderBottomItem
-                                 bgColor="transparent"
                                  key={index}
                                  onPress={() => { router.push(`/discussion/${item.id}`) }}
                                  borderType="bottom"
                                  icon={
-                                    // <View style={[Styles.iconContent]}>
+                                    <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                                    <MaterialIcons name="chat" size={25} color={colors.text} />
+                                       <MaterialIcons name="chat" size={25} color={'#384288'} />
-                                    // </View>
+                                    </View>
                                  }
                                  title={item.title}
                                  subtitle={
@@ -165,8 +161,8 @@ export default function Discussion() {
                                  desc={item.desc.replace(/<[^>]*>?/gm, ' ').replace(/\r?\n|\r/g, ' ')}
                                  leftBottomInfo={
                                     <View style={[Styles.rowItemsCenter]}>
-                                       <Ionicons name="chatbox-ellipses-outline" size={18} 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 }, Styles.mb05]}>Diskusikan</Text>
+                                       <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>Diskusikan</Text>
                                     </View>
                                  }
                                  rightBottomInfo={`${item.total_komentar} Komentar`}
@@ -182,12 +178,11 @@ export default function Discussion() {
                            <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>
       </View>

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

@@ -1,9 +1,9 @@
+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";
@@ -11,7 +11,6 @@ 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 { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
@@ -27,7 +26,6 @@ type Props = {
 
 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[]>([])
@@ -36,8 +34,6 @@ export default function MemberDiscussionDetail() {
    const update = useSelector((state: any) => state.discussionGeneralDetailUpdate)
    const [loading, setLoading] = useState(true)
    const arrSkeleton = Array.from({ length: 5 }, (_, index) => index)
-   const [showDeleteModal, setShowDeleteModal] = useState(false)
-
 
    async function handleLoad(loading: boolean) {
       try {
@@ -67,18 +63,15 @@ export default function MemberDiscussionDetail() {
          await apiDeleteMemberDiscussionGeneral({ user: hasil, idUser: chooseUser.idUser }, id)
          Toast.show({ type: 'small', text1: 'Berhasil mengeluarkan anggota dari diskusi', })
          handleLoad(false)
-      } 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: message })
       } finally {
          setModal(false)
       }
    }
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -93,10 +86,10 @@ export default function MemberDiscussionDetail() {
                )
             }}
          />
-         <ScrollView style={[Styles.h100, Styles.flex1, { backgroundColor: colors.background }]}>
+         <ScrollView>
             <View style={[Styles.p15]}>
                <Text style={[Styles.textDefault, Styles.mv05]}>{data.length} Anggota</Text>
-               <View style={[Styles.wrapPaper, { backgroundColor: colors.card, borderColor: colors.background }]}>
+               <View style={[Styles.wrapPaper, Styles.mb100]}>
                   {
                      entityUser.role != "user" && entityUser.role != "coadmin" &&
                      <BorderBottomItem
@@ -142,7 +135,7 @@ export default function MemberDiscussionDetail() {
          <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)
@@ -152,32 +145,24 @@ export default function MemberDiscussionDetail() {
                {
                   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(() => {
+                        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="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,4 +1,4 @@
-import ModalConfirmation from "@/components/ModalConfirmation"
+import AlertKonfirmasi from "@/components/alertKonfirmasi"
 import AppHeader from "@/components/AppHeader"
 import BorderBottomItem from "@/components/borderBottomItem"
 import ButtonBackHeader from "@/components/buttonBackHeader"
@@ -13,7 +13,6 @@ 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 Clipboard from "@react-native-clipboard/clipboard"
 import { router, Stack, useLocalSearchParams } from "expo-router"
@@ -46,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[]>([])
@@ -57,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)
 
@@ -137,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)
       }
@@ -157,14 +152,14 @@ export default function DetailEventCalendar() {
    };
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Detail Acara',
                headerTitleAlign: 'center',
                // headerRight: () => (entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision ? <></> : <HeaderRightCalendarDetail id={String(data?.idCalendar)} idReminder={String(detail)} />
-               header: () => (
+               header:()=>(
                   <AppHeader
                      title="Detail Acara"
                      showBack={true}
@@ -182,14 +177,13 @@ export default function DetailEventCalendar() {
                <RefreshControl
                   refreshing={refreshing}
                   onRefresh={handleRefresh}
-                  tintColor={colors.icon}
                />
             }
          >
             <View style={[Styles.p15]}>
-               <View style={[Styles.wrapPaper, Styles.mb15, { backgroundColor: colors.card, borderColor: colors.background }]}>
+               <View style={[Styles.wrapPaper, Styles.mb15]}>
                   <View style={[Styles.rowItemsCenter, { alignItems: 'flex-start' }]}>
-                     <MaterialCommunityIcons name="calendar-text" size={30} color={colors.text} style={Styles.mr10} />
+                     <MaterialCommunityIcons name="calendar-text" size={30} color="black" style={Styles.mr10} />
                      {
                         loading ?
                            <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
@@ -198,7 +192,7 @@ export default function DetailEventCalendar() {
 
                   </View>
                   <View style={[Styles.rowItemsCenter, Styles.mt10]}>
-                     <MaterialCommunityIcons name="calendar-month-outline" size={30} color={colors.text} style={Styles.mr10} />
+                     <MaterialCommunityIcons name="calendar-month-outline" size={30} color="black" style={Styles.mr10} />
                      {
                         loading ?
                            <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
@@ -207,7 +201,7 @@ export default function DetailEventCalendar() {
                      }
                   </View>
                   <View style={[Styles.rowItemsCenter, Styles.mt10]}>
-                     <MaterialCommunityIcons name="clock-outline" size={30} color={colors.text} style={Styles.mr10} />
+                     <MaterialCommunityIcons name="clock-outline" size={30} color="black" style={Styles.mr10} />
                      {
                         loading ?
                            <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
@@ -216,7 +210,7 @@ export default function DetailEventCalendar() {
                      }
                   </View>
                   <View style={[Styles.rowItemsCenter, Styles.mt10]}>
-                     <MaterialCommunityIcons name="repeat" size={30} color={colors.text} style={Styles.mr10} />
+                     <MaterialCommunityIcons name="repeat" size={30} color="black" style={Styles.mr10} />
                      {
                         loading ?
                            <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
@@ -234,7 +228,7 @@ export default function DetailEventCalendar() {
                      }
                   </View>
                   <View style={[Styles.rowItemsCenter, Styles.mt10]}>
-                     <MaterialCommunityIcons name="link-variant" size={30} color={colors.text} style={Styles.mr10} />
+                     <MaterialCommunityIcons name="link-variant" size={30} color="black" style={Styles.mr10} />
                      {
                         loading ?
                            <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
@@ -247,7 +241,7 @@ export default function DetailEventCalendar() {
                      }
                   </View>
                   <View style={[Styles.rowItemsCenter, Styles.mt10, { alignItems: 'flex-start' }]}>
-                     <MaterialCommunityIcons name="card-text-outline" size={30} color={colors.text} style={Styles.mr10} />
+                     <MaterialCommunityIcons name="card-text-outline" size={30} color="black" style={Styles.mr10} />
                      {
                         loading ?
                            <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
@@ -263,7 +257,7 @@ export default function DetailEventCalendar() {
                      <Text style={[Styles.textDefault]}>Total {member.length} Anggota</Text>
                   </View>
 
-                  <View style={[Styles.wrapPaper, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                  <View style={[Styles.wrapPaper]}>
                      {
                         member.map((item, index) => (
                            <BorderBottomItem
@@ -292,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)
@@ -301,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

@@ -7,7 +7,6 @@ import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
 import { apiGetCalendarByDateDivision, apiGetIndicatorCalendar } from "@/lib/api";
 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';
@@ -35,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()
@@ -119,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: () => (
@@ -155,13 +153,12 @@ export default function CalendarDivision() {
                <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"
@@ -170,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 ?
                            <>
@@ -205,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

@@ -4,14 +4,13 @@ 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";
@@ -21,7 +20,6 @@ import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function DiscussionDivisionEdit() {
-   const { colors } = useTheme();
    const { id, detail } = useLocalSearchParams<{ id: string; detail: string }>();
    const { token, decryptToken } = useAuthSession();
    const [data, setData] = useState("");
@@ -89,11 +87,9 @@ export default function DiscussionDivisionEdit() {
          } 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)
       }
@@ -131,7 +127,7 @@ export default function DiscussionDivisionEdit() {
    }
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => (
@@ -170,7 +166,7 @@ export default function DiscussionDivisionEdit() {
                )
             }}
          />
-         {loading && <LoadingCenter />}
+         <LoadingOverlay visible={loading} />
          <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100]}>
             <View style={[Styles.p15]}>
                <InputForm
@@ -181,45 +177,39 @@ export default function DiscussionDivisionEdit() {
                   value={data}
                   onChange={setData}
                   multiline
-                  bg={colors.card}
                />
 
                <ButtonSelect value="Upload File" onPress={pickDocumentAsync} />
                {
                   (fileForm.length > 0 || dataFile.filter((val) => !val.delete).length > 0)
                   &&
-                  <>
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
-                     <View style={[Styles.rowSpaceBetween, Styles.mv05]}>
+                     <Text style={[Styles.textDefaultSemiBold]}>File</Text>
-                        <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                     {
-                        <Text style={[Styles.textDefault]}>{fileForm.length + dataFile.filter((val) => !val.delete).length} file</Text>
+                        dataFile.filter((val) => !val.delete).map((item, index) => (
-                     </View>
+                           <BorderBottomItem
-                     <View style={[Styles.borderAll, Styles.round05, Styles.p10, Styles.mb10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+                              key={index}
-                        {
+                              borderType={(fileForm.length + dataFile.length) > 1 ? "bottom" : "none"}
-                           dataFile.filter((val) => !val.delete).map((item, index) => (
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
-                              <BorderBottomItem
+                              title={item.name + '.' + item.extension}
-                                 key={index}
+                              titleWeight="normal"
-                                 borderType={dataFile.filter((val) => !val.delete).length - 1 == index && fileForm.length == 0 ? "none" : "bottom"}
+                              onPress={() => { setIndexDelFile({ id: item.id, cat: "oldFile" }); setModalFile(true) }}
-                                 icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
+                           />
-                                 title={item.name + '.' + item.extension}
+                        ))
-                                 titleWeight="normal"
+                     }
-                                 onPress={() => { setIndexDelFile({ id: item.id, cat: "oldFile" }); setModalFile(true) }}
+                     {
-                              />
+                        fileForm.map((item, index) => (
-                           ))
+                           <BorderBottomItem
-                        }
+                              key={index}
-                        {
+                              borderType={fileForm.length > 1 ? "bottom" : "none"}
-                           fileForm.map((item, index) => (
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
-                              <BorderBottomItem
+                              title={item.name}
-                                 key={index}
+                              titleWeight="normal"
-                                 borderType={fileForm.length - 1 == index ? "none" : "bottom"}
+                              onPress={() => { setIndexDelFile({ id: index, cat: "newFile" }); setModalFile(true) }}
-                                 icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
+                           />
-                                 title={item.name}
+                        ))
-                                 titleWeight="normal"
+                     }
-                                 onPress={() => { setIndexDelFile({ id: index, cat: "newFile" }); setModalFile(true) }}
+                  </View>
-                              />
-                           ))
-                        }
-                     </View>
-                  </>
                }
             </View>
          </ScrollView>
@@ -228,7 +218,7 @@ export default function DiscussionDivisionEdit() {
          <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) }}
                />

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

@@ -1,3 +1,4 @@
+import AlertKonfirmasi from "@/components/alertKonfirmasi";
 import AppHeader from "@/components/AppHeader";
 import BorderBottomItem from "@/components/borderBottomItem";
 import BorderBottomItem2 from "@/components/borderBottomItem2";
@@ -7,7 +8,6 @@ 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";
@@ -23,7 +23,6 @@ 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 { ref } from "@react-native-firebase/database";
 import { useHeaderHeight } from '@react-navigation/elements';
@@ -65,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[]>([]);
@@ -92,7 +90,6 @@ export default function DiscussionDetail() {
       comment: ''
    })
    const [viewEdit, setViewEdit] = useState(false)
-   const [showDeleteModal, setShowDeleteModal] = useState(false)
 
 
 
@@ -202,11 +199,8 @@ export default function DiscussionDetail() {
             setKomentar("")
             updateTrigger()
          }
-      } catch (error: any) {
+      } catch (error) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal menambahkan komentar"
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoadingSend(false);
       }
@@ -225,11 +219,8 @@ export default function DiscussionDetail() {
          } else {
             Toast.show({ type: 'small', text1: response.message })
          }
-      } catch (error : any ) {
+      } catch (error) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal mengedit komentar"
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoadingSend(false);
          handleViewEditKomentar()
@@ -249,11 +240,8 @@ export default function DiscussionDetail() {
          } else {
             Toast.show({ type: 'small', text1: response.message })
          }
-      } catch (error : any ) {
+      } catch (error) {
          console.error(error);
-         const message = error?.response?.data?.message || "Gagal menghapus komentar"
-
-         Toast.show({ type: 'small', text1: message })
       } finally {
          setLoadingSend(false)
          setVisible(false)
@@ -307,7 +295,7 @@ export default function DiscussionDetail() {
                      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}
@@ -318,13 +306,12 @@ export default function DiscussionDetail() {
                )
             }}
          />
-         <View style={{ flex: 1, backgroundColor: colors.background }}>
+         <View style={{ flex: 1 }}>
             <ScrollView
                refreshControl={
                   <RefreshControl
                      refreshing={refreshing}
                      onRefresh={handleRefresh}
-                     tintColor={colors.icon}
                   />
                }
             >
@@ -336,8 +323,7 @@ export default function DiscussionDetail() {
                         <BorderBottomItem2
                            dataFile={fileDiscussion}
                            descEllipsize={false}
-                           bgColor="white"
+                           borderType="bottom"
-                           borderType="all"
                            icon={
                               <ImageUser
                                  src={`${ConstEnv.url_storage}/files/${data?.user_img}`}
@@ -366,7 +352,7 @@ export default function DiscussionDetail() {
                                     color="grey"
                                     style={Styles.mr05}
                                  />
-                                 <Text style={[Styles.textInformation, { color: colors.dimmed }, Styles.mb05]} >
+                                 <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]} >
                                     {dataComment.length} Komentar
                                  </Text>
                               </View>
@@ -374,7 +360,7 @@ export default function DiscussionDetail() {
                         />
                   }
 
-                  <View style={[Styles.mt10]}>
+                  <View style={[Styles.p15]}>
                      {
                         loadingKomentar ?
                            arrSkeleton.map((item, index) => (
@@ -384,7 +370,7 @@ export default function DiscussionDetail() {
                            dataComment.map((item, index) => (
                               <BorderBottomItem
                                  key={index}
-                                 borderType="all"
+                                 borderType="bottom"
                                  colorPress
                                  icon={
                                     <ImageUser
@@ -397,7 +383,6 @@ export default function DiscussionDetail() {
                                  desc={item.comment}
                                  rightBottomInfo={item.isEdited ? "Edited" : ""}
                                  descEllipsize={detailMore.includes(item.id) ? false : true}
-                                 bgColor="white"
                                  onPress={() => {
                                     setDetailMore((prev: any) => {
                                        if (prev.includes(item.id)) {
@@ -425,7 +410,7 @@ export default function DiscussionDetail() {
                   style={[
                      Styles.contentItemCenter,
                      Styles.w100,
-                     { backgroundColor: colors.background },
+                     { backgroundColor: "#f4f4f4" },
                      viewEdit && Styles.borderTop
                   ]}
                >
@@ -434,15 +419,15 @@ export default function DiscussionDetail() {
                         <>
                            <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
-                              bg={colors.card}
+                              bg="white"
                               type="default"
                               round
                               multiline
@@ -475,8 +460,8 @@ export default function DiscussionDetail() {
                                        size={25}
                                        style={
                                           [selectKomentar.comment == "" || regexOnlySpacesOrEnter.test(selectKomentar.comment) || loadingSend || ((entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision)
-                                             ? { color: colors.dimmed }
+                                             ? Styles.cGray
-                                             : { color: colors.tint },
+                                             : Styles.cDefault,
                                           ]
                                        }
                                     />
@@ -489,6 +474,7 @@ export default function DiscussionDetail() {
                            isMemberDivision)
                            ?
                            <InputForm
+                              bg="white"
                               type="default"
                               round
                               multiline
@@ -521,8 +507,8 @@ export default function DiscussionDetail() {
                                        size={25}
                                        style={
                                           [komentar == "" || regexOnlySpacesOrEnter.test(komentar) || loadingSend || ((entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision)
-                                             ? { color: colors.dimmed }
+                                             ? Styles.cGray
-                                             : { color: colors.tint }
+                                             : Styles.cDefault,
                                           ]
                                        }
                                     />
@@ -531,7 +517,7 @@ export default function DiscussionDetail() {
                            />
                            :
                            <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 divisi yang dapat memberikan komentar"
                                  }
@@ -545,35 +531,25 @@ export default function DiscussionDetail() {
          <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)/division/[id]/(fitur-division)/discussion/create.tsx

@@ -4,14 +4,13 @@ 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"
@@ -22,7 +21,6 @@ import { useDispatch, useSelector } from "react-redux"
 
 
 export default function CreateDiscussionDivision() {
-   const { colors } = useTheme();
    const { id } = useLocalSearchParams<{ id: string }>()
    const [desc, setDesc] = useState('')
    const { token, decryptToken } = useAuthSession()
@@ -81,18 +79,16 @@ export default function CreateDiscussionDivision() {
          } 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)
       }
    }
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -121,7 +117,7 @@ export default function CreateDiscussionDivision() {
                )
             }}
          />
-         {loading && <LoadingCenter />}
+         <LoadingOverlay visible={loading} />
          <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100]}>
             <View style={[Styles.p15, Styles.mb100]}>
                <InputForm
@@ -131,33 +127,26 @@ export default function CreateDiscussionDivision() {
                   required
                   onChange={setDesc}
                   multiline
-                  bg={colors.card}
                />
                <ButtonSelect value="Upload File" onPress={pickDocumentAsync} />
                {
                   fileForm.length > 0
                   &&
-                  <>
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
-                     <View style={[Styles.rowSpaceBetween, Styles.mv05]}>
+                     <Text style={[Styles.textDefaultSemiBold]}>File</Text>
-                        <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                     {
-                        <Text style={[Styles.textDefault]}>{fileForm.length} file</Text>
+                        fileForm.map((item, index) => (
-                     </View>
+                           <BorderBottomItem
-                     <View style={[Styles.borderAll, Styles.round05, Styles.p10, Styles.mb10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
+                              key={index}
-                        {
+                              borderType={fileForm.length > 1 ? "bottom" : "none"}
-                           fileForm.map((item, index) => (
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
-                              <BorderBottomItem
+                              title={item.name}
-                                 key={index}
+                              titleWeight="normal"
-                                 borderType={fileForm.length - 1 == index ? "none" : "bottom"}
+                              onPress={() => { setIndexDelFile(index); setModalFile(true) }}
-                                 icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
+                           />
-                                 title={item.name}
+                        ))
-                                 titleWeight="normal"
+                     }
-                                 onPress={() => { setIndexDelFile(index); setModalFile(true) }}
+                  </View>
-                              />
-                           ))
-                        }
-                     </View>
-                  </>
-
                }
             </View>
          </ScrollView>
@@ -165,7 +154,7 @@ export default function CreateDiscussionDivision() {
          <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) }}
                />

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

@@ -5,12 +5,10 @@ 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 { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { AntDesign, Feather, Ionicons } from "@expo/vector-icons";
 import { router, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
@@ -32,7 +30,6 @@ type Props = {
 
 
 export default function DiscussionDivision() {
-   const { colors } = useTheme();
    const { id, active } = useLocalSearchParams<{ id: string, active?: string }>()
    const [data, setData] = useState<Props[]>([])
    const { token, decryptToken } = useAuthSession()
@@ -131,26 +128,26 @@ export default function DiscussionDivision() {
    })
 
    return (
-      <View style={[Styles.p15, { flex: 1, backgroundColor: colors.background }]}>
+      <View style={[Styles.p15, { flex: 1 }]}>
          {
             ((entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision) &&
             <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="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} />
-               </WrapTab>
+               </View>
                <InputSearch onChange={setSearch} />
             </View>
          }
@@ -177,7 +174,7 @@ export default function DiscussionDivision() {
                                  onPress={() => { router.push(`./discussion/${item.id}`) }}
                                  borderType="bottom"
                                  icon={
-                                    <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="xs" />
+                                    <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="sm" />
                                  }
                                  title={item.user_name}
                                  subtitle={
@@ -187,12 +184,11 @@ export default function DiscussionDivision() {
                                  desc={item.desc}
                                  leftBottomInfo={
                                     <View style={[Styles.rowItemsCenter]}>
-                                       <Ionicons name="chatbox-ellipses-outline" size={18} 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 }, Styles.mb05]}>Diskusikan</Text>
+                                       <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>Diskusikan</Text>
                                     </View>
                                  }
                                  rightBottomInfo={item.total_komentar + ' Komentar'}
-                                 bgColor="transparent"
                               />
                            )
                         }}
@@ -204,12 +200,11 @@ export default function DiscussionDivision() {
                            <RefreshControl
                               refreshing={refreshing}
                               onRefresh={handleRefresh}
-                              tintColor={colors.icon}
                            />
                         }
                      />
                      :
-                     (<Text style={[Styles.textDefault, Styles.mv10, { textAlign: "center", color: colors.dimmed }]}>Tidak ada diskusi</Text>)
+                     (<Text style={[Styles.textDefault, Styles.cGray, Styles.mv10, { textAlign: "center" }]}>Tidak ada diskusi</Text>)
             }
          </View>
       </View>

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

@@ -1,4 +1,4 @@
-import ModalConfirmation from "@/components/ModalConfirmation";
+import AlertKonfirmasi from "@/components/alertKonfirmasi";
 import AppHeader from "@/components/AppHeader";
 import { ButtonHeader } from "@/components/buttonHeader";
 import HeaderRightDocument from "@/components/document/headerDocument";
@@ -12,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,7 +24,6 @@ import {
 } from "@/lib/api";
 import { setUpdateDokumen } from "@/lib/dokumenUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import {
    AntDesign,
    MaterialCommunityIcons,
@@ -66,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()
@@ -89,7 +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 [bodyRename, setBodyRename] = useState({
       id: "",
       name: "",
@@ -235,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)
@@ -260,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 })
       }
    }
 
@@ -288,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);
       }
@@ -342,7 +334,7 @@ export default function DocumentDivision() {
    }, [path]);
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView style={{ flex: 1 }}>
          <Stack.Screen
             options={{
                // headerLeft: () =>
@@ -388,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();
                            }}
@@ -401,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();
@@ -421,7 +413,6 @@ export default function DocumentDivision() {
                <RefreshControl
                   refreshing={refreshing}
                   onRefresh={handleRefresh}
-                  tintColor={colors.icon}
                />
             }>
             <View style={[Styles.p15, Styles.mb100]}>
@@ -436,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>
                      ))
                   }
@@ -487,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>
                         )}
@@ -495,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={
@@ -507,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"
@@ -614,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,13 +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,
                         }}
                      />
                   </View>
@@ -213,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) }} />
                   </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

@@ -10,7 +10,6 @@ import SectionTanggalTugasTask from "@/components/task/sectionTanggalTugasTask";
 import Styles from "@/constants/Styles";
 import { apiGetDivisionOneFeature, apiGetTaskOne } 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";
@@ -26,7 +25,6 @@ type Props = {
 }
 
 export default function DetailTaskDivision() {
-   const { colors } = useTheme();
    const { id, detail } = useLocalSearchParams<{ id: string, detail: string }>();
    const { token, decryptToken } = useAuthSession()
    const [data, setData] = useState<Props>()
@@ -99,7 +97,7 @@ export default function DetailTaskDivision() {
    };
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -127,7 +125,6 @@ export default function DetailTaskDivision() {
                <RefreshControl
                   refreshing={refreshing}
                   onRefresh={handleRefresh}
-                  tintColor={colors.icon}
                />
             }
          >

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/create.tsx

@@ -16,7 +16,6 @@ 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";
@@ -27,7 +26,6 @@ import { useDispatch, useSelector } from "react-redux";
 
 
 export default function CreateTaskDivision() {
-   const { colors } = useTheme();
    const { id } = useLocalSearchParams();
    const { token, decryptToken } = useAuthSession();
    const dispatch = useDispatch();
@@ -105,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)
       }
@@ -117,7 +113,7 @@ export default function CreateTaskDivision() {
 
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => (
@@ -165,7 +161,6 @@ 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`); }} />
@@ -176,13 +171,13 @@ export default function CreateTaskDivision() {
                   fileForm.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]}>
                            {
                               fileForm.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.name}
                                     titleWeight="normal"
                                     onPress={() => { setIndexDelFile(index); setModal(true) }}
@@ -200,7 +195,7 @@ export default function CreateTaskDivision() {
                         <Text>Total {entitiesMember.length} Anggota</Text>
                      </View>
 
-                     <View style={[Styles.borderAll, Styles.round05, Styles.p10, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                     <View style={[Styles.borderAll, Styles.round10, Styles.p10]}>
                         {entitiesMember.map(
                            (item: { img: any; name: any }, index: any) => {
                               return (
@@ -228,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,13 +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,
                         }}
                      />
                   </View>
@@ -184,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) }} />
                   </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,
@@ -32,7 +31,6 @@ 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()
@@ -112,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
@@ -123,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}
                      />
                   }
@@ -137,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}
                      />
                   }
@@ -151,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}
                      />
                   }
@@ -165,7 +163,7 @@ export default function ListTask() {
                   icon={
                      <AntDesign
                         name="closecircleo"
-                        color={statusFix == "3" ? "white" : colors.dimmed}
+                        color={statusFix == "3" ? "white" : "black"}
                         size={20}
                      />
                   }
@@ -181,7 +179,7 @@ export default function ListTask() {
                >
                   <MaterialCommunityIcons
                      name={isList ? "format-list-bulleted" : "view-grid"}
-                     color={colors.text}
+                     color={"black"}
                      size={30}
                   />
                </Pressable>
@@ -190,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 }]}>
@@ -235,7 +233,6 @@ export default function ListTask() {
                                  <RefreshControl
                                     refreshing={refreshing}
                                     onRefresh={handleRefresh}
-                                    tintColor={colors.icon}
                                  />
                               }
                            />
@@ -277,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' :
@@ -302,7 +299,6 @@ export default function ListTask() {
                                  <RefreshControl
                                     refreshing={refreshing}
                                     onRefresh={handleRefresh}
-                                    tintColor={colors.icon}
                                  />
                               }
                            />
@@ -342,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,13 +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,
                            }}
                         />
                      )}
@@ -263,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) }} />
                   </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}
@@ -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,4 +1,4 @@
-import ModalConfirmation from "@/components/ModalConfirmation"
+import AlertKonfirmasi from "@/components/alertKonfirmasi"
 import AppHeader from "@/components/AppHeader"
 import BorderBottomItem from "@/components/borderBottomItem"
 import HeaderRightDivisionInfo from "@/components/division/headerDivisionInfo"
@@ -13,7 +13,6 @@ 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 { router, Stack, useLocalSearchParams } from "expo-router"
 import { useEffect, useState } from "react"
@@ -40,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 }>()
@@ -59,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() {
@@ -78,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)
       }
@@ -98,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)
       }
@@ -166,7 +161,7 @@ export default function InformationDivision() {
    }
 
    return (
-      <SafeAreaView style={{ flex: 1, backgroundColor: colors.background }}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -190,10 +185,9 @@ export default function InformationDivision() {
                <RefreshControl
                   refreshing={refreshing}
                   onRefresh={handleRefresh}
-                  tintColor={colors.icon}
                />
             }
-            style={[Styles.h100, { backgroundColor: colors.background }]}
+            style={[Styles.h100]}
          >
             <View style={[Styles.p15]}>
                {
@@ -203,7 +197,7 @@ export default function InformationDivision() {
                }
                <View style={[Styles.mb15]}>
                   <Text style={[Styles.textDefaultSemiBold, Styles.mb05]}>Deskripsi Divisi</Text>
-                  <View style={[Styles.wrapPaper, Styles.noShadow, { backgroundColor: colors.card, borderWidth: 1, borderColor: colors.icon + '20' }]}>
+                  <View style={[Styles.wrapPaper]}>
                      {loading ?
                         arrSkeleton.map((item, index) => {
                            return (
@@ -217,7 +211,7 @@ export default function InformationDivision() {
                </View>
                <View style={[Styles.mb15]}>
                   <Text style={[Styles.textDefault, Styles.mv05]}>{dataMember.length} Anggota</Text>
-                  <View style={[Styles.wrapPaper, Styles.noShadow, { backgroundColor: colors.card, borderWidth: 1, borderColor: colors.icon + '20' }]}>
+                  <View style={[Styles.wrapPaper]}>
                      {
                         ((entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision) &&
                         dataDetail?.isActive && (
@@ -225,8 +219,8 @@ export default function InformationDivision() {
                               onPress={() => { router.push(`/division/${id}/add-member`) }}
                               borderType="none"
                               icon={
-                                 <View style={[Styles.iconContent]}>
+                                 <View style={[Styles.iconContent, ColorsStatus.gray]}>
-                                    <Feather name="user-plus" size={25} color={'black'} />
+                                    <Feather name="user-plus" size={25} color={'#384288'} />
                                  </View>
                               }
                               title="Tambah Anggota"
@@ -266,8 +260,8 @@ export default function InformationDivision() {
             <View>
                <Pressable style={[Styles.wrapItemBorderBottom]} onPress={() => { handleMemberAdmin() }}>
                   <View style={[Styles.rowItemsCenter]}>
-                     <View style={[Styles.iconContent]}>
+                     <View style={[Styles.iconContent, ColorsStatus.info]}>
-                        <MaterialIcons name="verified-user" size={25} color={'black'} />
+                        <MaterialIcons name="verified-user" size={25} color='#19345E' />
                      </View>
                      <View style={[Styles.rowSpaceBetween, { width: '88%' }]}>
                         <View style={[Styles.ml10]}>
@@ -280,7 +274,7 @@ export default function InformationDivision() {
                <Pressable style={[Styles.wrapItemBorderBottom]} onPress={() => { handleMemberOut() }}>
                   <View style={[Styles.rowItemsCenter]}>
                      <View style={[Styles.iconContent, ColorsStatus.info]}>
-                        <MaterialCommunityIcons name="close-circle" size={25} color={colors.primary} />
+                        <MaterialCommunityIcons name="close-circle" size={25} color='#19345E' />
                      </View>
                      <View style={[Styles.rowSpaceBetween, { width: '88%' }]}>
                         <View style={[Styles.ml10]}>
@@ -291,19 +285,6 @@ export default function InformationDivision() {
                </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 ?
@@ -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}
@@ -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,16 +6,16 @@ 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 { router, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
@@ -38,11 +38,9 @@ export default function ListDivision() {
    const [isList, setList] = useState(false);
    const entityUser = useSelector((state: any) => state.user)
    const { token, decryptToken } = useAuthSession()
-   const { colors } = useTheme();
    const [search, setSearch] = useState("")
    const [nameGroup, setNameGroup] = useState("")
    const [data, setData] = useState<Props[]>([])
-   // ... state same ...
    const update = useSelector((state: any) => state.divisionUpdate)
    const arrSkeleton = Array.from({ length: 3 }, (_, index) => index)
    const [loading, setLoading] = useState(false)
@@ -116,11 +114,11 @@ export default function ListDivision() {
 
 
    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"
@@ -129,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}
                            />
                         }
@@ -143,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"
@@ -160,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}
                            />
                         }
@@ -174,13 +172,13 @@ 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' }]}>
@@ -192,7 +190,7 @@ export default function ListDivision() {
                >
                   <MaterialCommunityIcons
                      name={isList ? "format-list-bulleted" : "view-grid"}
-                     color={colors.text}
+                     color={"black"}
                      size={30}
                   />
                </Pressable>
@@ -204,7 +202,7 @@ export default function ListDivision() {
                </View>
             )}
          </View>
-         <View style={[{ flex: 2 }, Styles.mt10]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   isList ?
@@ -218,7 +216,7 @@ export default function ListDivision() {
                   :
                   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 ? (
@@ -234,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"
                                     />
                                  )
                               }}
@@ -252,7 +250,6 @@ export default function ListDivision() {
                                  <RefreshControl
                                     refreshing={refreshing}
                                     onRefresh={handleRefresh}
-                                    tintColor={colors.icon}
                                  />
                               }
                            />
@@ -288,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',
@@ -24,26 +22,32 @@ export default function Feature() {
          />
          <View style={[Styles.p15]}>
             <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') }} />
             </View>
             <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-group-outline" size={30} color={colors.icon} />} text="Anggota" onPress={() => { router.push('/member') }} />
+               <ButtonFiturMenu icon={<MaterialIcons name="groups" size={35} color="black" />} text="Anggota" onPress={() => { router.push('/member') }} />
-               <ButtonFiturMenu icon={<MaterialCommunityIcons name="account-tie-outline" size={30} color={colors.icon} />} text="Jabatan" onPress={() => { router.push('/position') }} />
+               <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="color-palette-sharp" size={30} color={colors.icon} />} text="Tema" onPress={() => { }} /> */}
+                     {/* <ButtonFiturMenu icon={<Ionicons name="color-palette-sharp" size={35} color="black" />} text="Tema" onPress={() => { }} /> */}
-                     <ButtonFiturMenu icon={<Ionicons name="images-outline" size={30} color={colors.icon} />} text="Banner" onPress={() => { router.push('/banner') }} />
+                     <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,4 +1,4 @@
-import ModalConfirmation from "@/components/ModalConfirmation";
+import AlertKonfirmasi from "@/components/alertKonfirmasi";
 import BorderBottomItem from "@/components/borderBottomItem";
 import { ButtonForm } from "@/components/buttonForm";
 import ButtonTab from "@/components/buttonTab";
@@ -8,13 +8,12 @@ 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 { 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 { RefreshControl, View, VirtualizedList } from "react-native";
 import Toast from "react-native-toast-message";
@@ -28,14 +27,12 @@ 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 arrSkeleton = Array.from({ length: 5 }, (_, index) => index)
    const [loading, setLoading] = useState(true)
-   const [showDeleteModal, setShowDeleteModal] = useState(false)
    const [status, setStatus] = useState<'true' | 'false'>('true')
    const [loadingSubmit, setLoadingSubmit] = useState(false)
    const [idChoose, setIdChoose] = useState('')
@@ -130,27 +127,27 @@ export default function Index() {
 
 
    return (
-      <View style={[Styles.p15, { flex: 1, backgroundColor: colors.background }]}>
+      <View style={[Styles.p15, { flex: 1 }]}>
          <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]}>
             {
                loading ?
                   arrSkeleton.map((item, index) => {
@@ -176,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}
@@ -190,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)
@@ -234,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>
@@ -243,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,11 +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 { LinearGradient } from "expo-linear-gradient";
 import { Stack } from "expo-router";
 import { useEffect, useState } from "react";
-import { 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,7 +23,6 @@ export default function Home() {
    const entities = useSelector((state: any) => state.entities)
    const dispatch = useDispatch()
    const { token, decryptToken, signOut } = useAuthSession()
-   const { colors } = useTheme();
    const insets = useSafeAreaInsets()
    const [refreshing, setRefreshing] = useState(false)
 
@@ -49,13 +47,13 @@ export default function Home() {
    };
 
    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>
@@ -67,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

@@ -10,8 +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 { 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";
@@ -35,7 +33,6 @@ type Props = {
 
 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)
@@ -55,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)
       }
@@ -79,11 +74,13 @@ 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}
@@ -96,19 +93,15 @@ export default function MemberDetail() {
             }}
          />
          <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 ?
                      <>
@@ -121,15 +114,15 @@ export default function MemberDetail() {
                         <Pressable onPress={() => setPreview(true)}>
                            <ImageUser src={`${ConstEnv.url_storage}/files/${data?.img}`} size="lg" onError={setErrorImg} />
                         </Pressable>
-                        <Text style={[Styles.textSubtitle, Styles.cWhite, Styles.mt10, Styles.textCenter]}>{data?.name}</Text>
+                        <Text style={[Styles.textSubtitle, Styles.cWhite, Styles.mt10, { textAlign: 'center' }]}>{data?.name}</Text>
                         <Text style={[Styles.textMediumNormal, Styles.cWhite]}>{data?.role}</Text>
                      </>
 
                }
-            </LinearGradient>
+            </View>
             <View style={[Styles.p15]}>
                <View style={[Styles.rowSpaceBetween]}>
-                  <Text style={[Styles.textDefaultSemiBold, { color: colors.text }]}>Informasi</Text>
+                  <Text style={[Styles.textDefaultSemiBold]}>Informasi</Text>
                   <LabelStatus
                      size="small"
                      category={data?.isActive ? 'success' : 'error'}

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: "" });
@@ -211,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)
       }
@@ -241,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"
@@ -264,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}>
@@ -314,7 +325,6 @@ export default function EditMember() {
                      placeholder="Pilih Jabatan"
                      value={choosePosition.label}
                      required
-                     bg={colors.card}
                      onPress={() => {
                         setValChoose(choosePosition.val);
                         setValSelect("position");
@@ -328,7 +338,6 @@ export default function EditMember() {
                      placeholder="Pilih Role"
                      value={chooseRole.label}
                      required
-                     bg={colors.card}
                      onPress={() => {
                         setValChoose(chooseRole.val);
                         setValSelect("role");
@@ -343,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 => {
@@ -356,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 => {
@@ -369,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 => {
@@ -381,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 => {
@@ -395,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

@@ -5,12 +5,10 @@ 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 { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { AntDesign, Feather } from "@expo/vector-icons";
 import { router, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
@@ -35,7 +33,6 @@ 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[]>([])
@@ -107,24 +104,24 @@ export default function Index() {
    });
 
    return (
-      <View style={[Styles.p15, { flex: 1, backgroundColor: colors.background }]}>
+      <View style={[Styles.p15, { flex: 1 }]}>
          <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") &&
@@ -134,7 +131,7 @@ export default function Index() {
                </View>
             }
          </View>
-         <View style={[{ flex: 2 }, Styles.mt10]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   arrSkeleton.map((item, index) => {
@@ -171,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,5 +1,4 @@
 import BorderBottomItem from "@/components/borderBottomItem";
-import BorderBottomItemVertical from "@/components/borderBottomItemVertical";
 import SkeletonTwoItem from "@/components/skeletonTwoItem";
 import Text from "@/components/Text";
 import { ColorsStatus } from "@/constants/ColorsStatus";
@@ -8,7 +7,6 @@ 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 { useEffect, useState } from "react";
 import { RefreshControl, SafeAreaView, View, VirtualizedList } from "react-native";
@@ -26,7 +24,6 @@ type Props = {
 
 export default function Notification() {
    const { token, decryptToken } = useAuthSession()
-   const { colors } = useTheme();
    const [loading, setLoading] = useState(false)
    const [data, setData] = useState<Props[]>([])
    const [page, setPage] = useState(1)
@@ -100,7 +97,7 @@ export default function Notification() {
    };
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <View style={[Styles.p15]}>
             {
                loading ?
@@ -117,21 +114,21 @@ export default function Notification() {
                         getItem={getItem}
                         renderItem={({ item, index }: { item: Props, index: number }) => {
                            return (
-                              <BorderBottomItemVertical
+                              <BorderBottomItem
                                  borderType="bottom"
                                  icon={
-                                    <View style={[Styles.iconContent, item.isRead && ColorsStatus.secondary]}>
+                                    <View style={[Styles.iconContent, item.isRead ? ColorsStatus.secondary : ColorsStatus.primary]}>
-                                       <Feather name="bell" size={25} color="black" />
+                                       <Feather name="bell" size={25} color="white" />
                                     </View>
                                  }
                                  title={item.title}
                                  rightTopInfo={item.createdAt}
                                  desc={item.desc}
-                                 textColor={item.isRead ? 'gray' : colors.text}
+                                 textColor={item.isRead ? 'gray' : 'black'}
                                  onPress={() => {
                                     handleReadNotification(item.id, item.category, item.idContent)
+
                                  }}
-                                 bgColor={'transparent'}
                               />
                            )
                         }}
@@ -143,12 +140,11 @@ export default function Notification() {
                            <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>
       </SafeAreaView>

app/(application)/position/index.tsx

@@ -1,3 +1,4 @@
+import AlertKonfirmasi from "@/components/alertKonfirmasi";
 import BorderBottomItem from "@/components/borderBottomItem";
 import { ButtonForm } from "@/components/buttonForm";
 import ButtonTab from "@/components/buttonTab";
@@ -6,15 +7,13 @@ 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 { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { AntDesign, Feather, MaterialCommunityIcons } from "@expo/vector-icons";
 import { useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
@@ -34,7 +33,6 @@ 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 entityUser = useSelector((state: any) => state.user)
    const { active, group } = useLocalSearchParams<{ active?: string, group?: string }>()
@@ -49,7 +47,6 @@ export default function Index() {
       name: false,
    });
    const [refreshing, setRefreshing] = useState(false)
-   const [showDeleteModal, setShowDeleteModal] = useState(false)
 
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.positionUpdate)
@@ -88,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', })
@@ -110,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)
@@ -155,24 +146,24 @@ export default function Index() {
    });
 
    return (
-      <View style={[Styles.p15, Styles.flex1, { backgroundColor: colors.background }]}>
+      <View style={[Styles.p15, { flex: 1 }]}>
          <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") &&
@@ -182,7 +173,7 @@ export default function Index() {
                </View>
             }
          </View>
-         <View style={[Styles.flex2, Styles.mt10]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   arrSkeleton.map((item, index) => {
@@ -206,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}
@@ -221,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)
@@ -256,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}
@@ -275,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,3 +1,4 @@
+import AlertKonfirmasi from "@/components/alertKonfirmasi";
 import AppHeader from "@/components/AppHeader";
 import { ButtonHeader } from "@/components/buttonHeader";
 import ItemDetailMember from "@/components/itemDetailMember";
@@ -5,45 +6,23 @@ 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 } 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)
-   };
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                headerTitle: 'Profile',
@@ -55,31 +34,33 @@ 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')
+                              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}
-                  onRefresh={handleRefresh}
-                  tintColor={colors.icon}
-               />
-            }
-            style={[Styles.h100, { backgroundColor: colors.background }]}
-         >
-            <View style={[Styles.flexColumn]}>
-               <LinearGradient
-                  colors={[colors.header, colors.homeGradient]}
-                  style={[Styles.wrapHeadViewMember]}
-               >
                   <Pressable onPress={() => setPreview(true)}>
                      <Image
                         source={error ? require("../../assets/images/user.jpg") : { uri: `${ConstEnv.url_storage}/files/${entities.img}` }}
@@ -89,12 +70,14 @@ export default function Profile() {
                   </Pressable>
                   <Text style={[Styles.textSubtitle, Styles.cWhite, Styles.mt10]}>{entities.name}</Text>
                   <Text style={[Styles.textMediumNormal, Styles.cWhite]}>{entities.role}</Text>
-               </LinearGradient>
+               </View>
                <View style={[Styles.p15]}>
                   <View style={[Styles.rowSpaceBetween]}>
-                     <Text style={[Styles.textDefaultSemiBold, { color: colors.text }]}>Informasi</Text>
+                     <Text style={[Styles.textDefaultSemiBold]}>Informasi</Text>
+                     {
+                        entities.idUserRole != "developer" && <Text onPress={() => { router.push('/edit-profile') }} style={[Styles.textLink]}>Edit</Text>
+                     }
                   </View>
-                  {/* Note: ItemDetailMember might need updates to support dynamic colors if it uses default text colors */}
                   <ItemDetailMember category="nik" value={entities.nik} />
                   <ItemDetailMember category="group" value={entities.group} />
                   <ItemDetailMember category="position" value={entities.position} />
@@ -104,7 +87,6 @@ export default function Profile() {
                </View>
             </View>
          </ScrollView>
-
          <ImageViewing
             images={[{ uri: error ? assetUserImage.uri : `${ConstEnv.url_storage}/files/${entities.img}` }]}
             imageIndex={0}

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,53 +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,
                         }}
                      />
                   </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) }} />
                   </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

@@ -10,7 +10,6 @@ import SectionProgress from "@/components/sectionProgress";
 import Styles from "@/constants/Styles";
 import { apiGetProjectOne } from "@/lib/api";
 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";
@@ -33,7 +32,6 @@ 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)
@@ -93,7 +91,7 @@ export default function DetailProject() {
    };
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -113,12 +111,10 @@ export default function DetailProject() {
             }}
          />
          <ScrollView
-            style={[Styles.h100, { backgroundColor: colors.background }]}
             refreshControl={
                <RefreshControl
                   refreshing={refreshing}
                   onRefresh={handleRefresh}
-                  tintColor={colors.icon}
                />
             }
          >

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/create.tsx

@@ -5,7 +5,6 @@ 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";
@@ -19,7 +18,6 @@ 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";
@@ -33,7 +31,6 @@ import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function CreateProject() {
-   const { colors } = useTheme();
    const [loading, setLoading] = useState(false)
    const { token, decryptToken } = useAuthSession();
    const [chooseGroup, setChooseGroup] = useState({ val: "", label: "" });
@@ -151,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)
       }
@@ -195,7 +190,7 @@ export default function CreateProject() {
 
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => (
@@ -233,12 +228,9 @@ export default function CreateProject() {
                )
             }}
          />
-         {
-            loading && <LoadingCenter />
-         }
          <ScrollView
             showsVerticalScrollIndicator={false}
-            style={[Styles.h100, { backgroundColor: colors.background }]}
+            style={[Styles.h100]}
          >
             <View style={[Styles.p15]}>
                {
@@ -250,7 +242,6 @@ export default function CreateProject() {
                         placeholder="Pilih Lembaga Desa"
                         value={chooseGroup.label}
                         required
-                        bg={colors.card}
                         onPress={() => {
                            setValChoose(chooseGroup.val);
                            setValSelect("group");
@@ -266,7 +257,6 @@ export default function CreateProject() {
                   type="default"
                   placeholder="Nama Kegiatan"
                   required
-                  bg={colors.card}
                   value={dataForm.title}
                   error={error.title}
                   errorText="Nama kegiatan tidak boleh kosong"
@@ -304,13 +294,13 @@ export default function CreateProject() {
                   fileForm.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]}>
                            {
                               fileForm.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.name}
                                     titleWeight="normal"
                                     onPress={() => { setIndexDelFile(index); setModal(true) }}
@@ -328,7 +318,7 @@ export default function CreateProject() {
                         <Text>Total {entitiesMember.length} Anggota</Text>
                      </View>
 
-                     <View style={[Styles.borderAll, Styles.round05, Styles.p10, { borderColor: colors.icon + '20', backgroundColor: colors.card }]}>
+                     <View style={[Styles.borderAll, Styles.round10, Styles.p10]}>
                         {entitiesMember.map(
                            (item: { img: any; name: any }, index: any) => {
                               return (
@@ -354,7 +344,7 @@ export default function CreateProject() {
          <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,53 +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,
                         }}
                      />
                   </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>
                      }
-                     {/* <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) }} />
                   </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,12 +7,10 @@ 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,
@@ -42,11 +40,9 @@ export default function ListProject() {
    }>();
    const [statusFix, setStatusFix] = useState<'0' | '1' | '2' | '3'>('0')
    const { token, decryptToken } = useAuthSession();
-   const { colors } = useTheme();
    const entityUser = useSelector((state: any) => state.user)
    const [search, setSearch] = useState("")
    const [nameGroup, setNameGroup] = useState("")
-   // ... state same ...
    const [isYear, setYear] = useState("")
    const [data, setData] = useState<Props[]>([])
    const [isList, setList] = useState(false)
@@ -126,70 +122,67 @@ export default function ListProject() {
    })
 
    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={() => {
@@ -198,26 +191,26 @@ export default function ListProject() {
                >
                   <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" />
@@ -227,7 +220,7 @@ export default function ListProject() {
                }
             </View>
          </View>
-         <View style={[Styles.flex2, Styles.mt10]}>
+         <View style={[{ flex: 2 }]}>
             {
                loading ?
                   isList ?
@@ -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,7 +267,6 @@ export default function ListProject() {
                                  <RefreshControl
                                     refreshing={refreshing}
                                     onRefresh={handleRefresh}
-                                    tintColor={colors.icon}
                                  />
                               }
                            />
@@ -319,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' :
@@ -355,7 +345,6 @@ export default function ListProject() {
                                  <RefreshControl
                                     refreshing={refreshing}
                                     onRefresh={handleRefresh}
-                                    tintColor={colors.icon}
                                  />
                               }
                            />
@@ -372,7 +361,7 @@ export default function ListProject() {
                                  >
                                     <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
@@ -400,7 +389,7 @@ export default function ListProject() {
                      )
                      :
                      <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>

app/(application)/project/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 ModalAddDetailTugasProject from "@/components/project/modalAddDetailTugasProject";
 import Text from "@/components/Text";
@@ -10,20 +9,18 @@ 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';
 import 'intl/locale-data/jsonp/id';
 import moment from "moment";
 import React, { useEffect, useState } from "react";
-import { KeyboardAvoidingView, Platform, SafeAreaView, ScrollView, View } from "react-native";
+import { KeyboardAvoidingView, Platform, Pressable, SafeAreaView, ScrollView, View } from "react-native";
 import Toast from "react-native-toast-message";
 import DateTimePicker, { DateType } from "react-native-ui-datepicker";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function UpdateProjectTask() {
-   const { colors } = useTheme();
    const headerHeight = useHeaderHeight();
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.projectUpdate)
@@ -118,11 +115,9 @@ export default function UpdateProjectTask() {
          } 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)
       }
@@ -174,7 +169,7 @@ export default function UpdateProjectTask() {
    }, [range])
 
    return (
-      <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+      <SafeAreaView>
          <Stack.Screen
             options={{
                // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -205,9 +200,9 @@ export default function UpdateProjectTask() {
             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]}>
                      {
                         !loading
                         &&
@@ -222,51 +217,50 @@ export default function UpdateProjectTask() {
                               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,
                            }}
                         />
                      }
 
                   </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></Text>
+                           <Text style={[Styles.mb05]}>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></Text>
+                           <Text style={[Styles.mb05]}>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) }} />
                   </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)/search.tsx

@@ -8,14 +8,12 @@ import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { apiGetSearch } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import { AntDesign, MaterialIcons } from "@expo/vector-icons";
 import { router, Stack } from "expo-router";
 import React, { useState } from "react";
 import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
 import Toast from "react-native-toast-message";
 
-// ... types ...
 type PropsUser = {
    id: string
    name: string
@@ -45,7 +43,6 @@ export default function Search() {
    const [dataProject, setDataProject] = useState<PropProject[]>([])
    const [refreshing, setRefreshing] = useState(false)
    const [search, setSearch] = useState('')
-   const { colors } = useTheme();
 
    async function handleSearch(cari: string) {
       try {
@@ -65,14 +62,9 @@ export default function Search() {
             setDataDivisi([])
             setDataProject([])
          }
-      } catch (error: any) {
+      } catch (error) {
-         console.error(error);
+         console.error(error)
-         const message = error?.response?.data?.message || "Gagal melakukan pencarian"
+         return Toast.show({ type: 'small', text1: 'Gagal melakukan pencarian', })
-
-         Toast.show({
-            type: 'small',
-            text1: message
-         })
       }
    }
 
@@ -87,7 +79,7 @@ export default function Search() {
 
    return (
       <>
-         <SafeAreaView style={[Styles.flex1, { backgroundColor: colors.background }]}>
+         <SafeAreaView>
             <Stack.Screen
                options={{
                   headerTitle: 'Pencarian',
@@ -108,7 +100,6 @@ export default function Search() {
                            <RefreshControl
                               refreshing={refreshing}
                               onRefresh={handleRefresh}
-                              tintColor={colors.icon}
                            />
                         }
                      >
@@ -186,7 +177,7 @@ export default function Search() {
                      </ScrollView>
                      :
                      <View style={[Styles.contentItemCenter, Styles.mt10]}>
-                        <Text style={[Styles.textInformation, { color: colors.icon }]}>Tidak ada data</Text>
+                        <Text style={[Styles.textInformation, Styles.cGray]}>Tidak ada data</Text>
                      </View>
                }
 

app/(application)/setting/index.tsx

@@ -1,201 +0,0 @@
-import ModalConfirmation from "@/components/ModalConfirmation";
-import Text from "@/components/Text";
-import ButtonSetting from "@/components/buttonSetting";
-import DrawerBottom from "@/components/drawerBottom";
-import Styles from "@/constants/Styles";
-import { apiGetCheckToken, apiRegisteredToken, apiUnregisteredToken } from "@/lib/api";
-import { checkPermission, getToken, openSettings } from "@/lib/useNotification";
-import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
-import { Feather, Ionicons } from "@expo/vector-icons";
-import AsyncStorage from "@react-native-async-storage/async-storage";
-import { router } from "expo-router";
-import { useCallback, useEffect, useRef, useState } from "react";
-import { AppState, AppStateStatus, Pressable, View } from "react-native";
-import { useSelector } from "react-redux";
-
-export default function ListSetting() {
-   const { theme, setTheme, colors } = useTheme()
-   const { signOut } = useAuthSession()
-   const [isNotificationEnabled, setIsNotificationEnabled] = useState<boolean | null>(null);
-   const entities = useSelector((state: any) => state.entities)
-   const [modalVisible, setModalVisible] = useState(false);
-   const [modalConfig, setModalConfig] = useState({
-      title: '',
-      message: '',
-      confirmText: 'Buka Pengaturan',
-      onConfirm: () => { }
-   });
-
-   const [showLogoutModal, setShowLogoutModal] = useState(false)
-   const [showThemeModal, setShowThemeModal] = useState(false)
-   const prevOsPermission = useRef<boolean | undefined>(undefined);
-
-   const registerToken = async () => {
-      try {
-         await AsyncStorage.setItem('@notification_permission', "true");
-         const token = await getToken();
-         if (token) {
-            await apiRegisteredToken({ user: entities.id, token, category: "register" });
-         }
-      } catch (error) {
-         console.warn('Error registering token:', error);
-      }
-   };
-
-   const unregisterToken = async () => {
-      try {
-         await AsyncStorage.setItem('@notification_permission', "false");
-         const token = await getToken();
-         if (token) {
-            await apiUnregisteredToken({ user: entities.id, token, category: "unregister" });
-         }
-      } catch (error) {
-         console.warn('Error unregistering token:', error);
-      }
-   };
-
-   const checkNotif = useCallback(async () => {
-      const osPermission = await checkPermission();
-
-      // Jika dari tidak diijinkan sistem kemudian diijinkan (setelah balik dari pengaturan device)
-      if (prevOsPermission.current === false && osPermission === true) {
-         await registerToken();
-      }
-      prevOsPermission.current = osPermission;
-
-      if (!osPermission) {
-         setIsNotificationEnabled(false);
-         return;
-      }
-
-      try {
-         const token = await getToken();
-         if (token) {
-            const response = await apiGetCheckToken({ user: entities.id, token });
-            setIsNotificationEnabled(!!response.data);
-         } else {
-            setIsNotificationEnabled(false);
-         }
-      } catch (error) {
-         console.warn('Error checking token status:', error);
-         setIsNotificationEnabled(false);
-      }
-   }, [entities.id]);
-
-   useEffect(() => {
-      checkNotif();
-
-      const subscription = AppState.addEventListener('change', (nextAppState: AppStateStatus) => {
-         if (nextAppState === 'active') {
-            checkNotif();
-         }
-      });
-
-      return () => {
-         subscription.remove();
-      };
-   }, [checkNotif]);
-
-   const handleToggleNotif = async () => {
-      const osPermission = await checkPermission();
-
-      if (!osPermission) {
-         setModalConfig({
-            title: "Aktifkan Notifikasi?",
-            message: "Izin notifikasi tidak diberikan. Buka pengaturan sistem untuk mengaktifkannya?",
-            confirmText: "Buka Pengaturan",
-            onConfirm: () => {
-               setModalVisible(false);
-               openSettings();
-            }
-         });
-         setModalVisible(true);
-      } else {
-         // OS Permission is granted, perform in-app toggle
-         const targetState = !isNotificationEnabled;
-         if (targetState) {
-            await registerToken();
-         } else {
-            await unregisterToken();
-         }
-         // UI will be updated by checkNotif (triggered by state change or manually here)
-         setIsNotificationEnabled(targetState);
-      }
-   };
-
-   const ThemeOption = ({ label, value, icon }: { label: string, value: 'light' | 'dark' | 'system', icon: string }) => (
-      <Pressable
-         style={[Styles.itemSelectModal, { borderColor: colors.icon + '20' }]}
-         onPress={() => {
-            setTheme(value);
-         }}
-      >
-         <View style={Styles.rowItemsCenter}>
-            <Ionicons name={icon as any} size={20} color={colors.text} style={Styles.mr10} />
-            <Text style={{ color: colors.text }}>{label}</Text>
-         </View>
-         {theme === value && <Ionicons name="checkmark" size={20} color={colors.text} />}
-      </Pressable>
-   );
-
-   return (
-      <View style={[Styles.p15, Styles.flex1, { backgroundColor: colors.background }]}>
-         <View style={[Styles.wrapPaper, { backgroundColor: colors.card, borderColor: colors.icon + '20' }, Styles.p0, Styles.round05]}>
-            {
-               entities.idUserRole != "developer" &&
-               <ButtonSetting
-                  title="Edit Profile"
-                  icon={<Feather name="user" size={20} color={colors.text} />}
-                  onPress={() => { router.push('/edit-profile') }}
-               />
-            }
-            <ButtonSetting
-               title="Tema Aplikasi"
-               icon={<Ionicons name="color-palette-outline" size={20} color={colors.text} />}
-               onPress={() => setShowThemeModal(true)}
-               value={theme === 'light' ? 'Terang' : theme === 'dark' ? 'Gelap' : 'Sistem'}
-            />
-            <ButtonSetting
-               title="Notifikasi"
-               icon={<Feather name="bell" size={20} color={colors.text} />}
-               onPress={handleToggleNotif}
-               value={isNotificationEnabled === null ? 'Memuat...' : isNotificationEnabled ? 'Aktif' : 'Nonaktif'}
-            />
-            <ButtonSetting
-               title="Keluar"
-               icon={<Feather name="log-out" size={20} color={colors.text} />}
-               onPress={() => setShowLogoutModal(true)}
-               borderBottom={false}
-            />
-         </View>
-
-         <ModalConfirmation
-            visible={modalVisible}
-            title={modalConfig.title}
-            message={modalConfig.message}
-            confirmText={modalConfig.confirmText}
-            onConfirm={modalConfig.onConfirm}
-            onCancel={() => setModalVisible(false)}
-         />
-
-         <ModalConfirmation
-            visible={showLogoutModal}
-            title="Keluar"
-            message="Apakah anda yakin ingin keluar?"
-            onConfirm={() => {
-               setShowLogoutModal(false)
-               signOut()
-            }}
-            onCancel={() => setShowLogoutModal(false)}
-            confirmText="Keluar"
-            cancelText="Batal"
-         />
-         <DrawerBottom animation="slide" isVisible={showThemeModal} setVisible={setShowThemeModal} title="Tema Aplikasi">
-            <ThemeOption label="Terang" value="light" icon="sunny-outline" />
-            <ThemeOption label="Gelap" value="dark" icon="moon-outline" />
-            <ThemeOption label="Sistem" value="system" icon="phone-portrait-outline" />
-         </DrawerBottom>
-      </View>
-   )
-}

app/_layout.tsx

@@ -1,5 +1,4 @@
 import AuthProvider from '@/providers/AuthProvider';
-import ThemeProvider, { useTheme } from '@/providers/ThemeProvider';
 import { useFonts } from 'expo-font';
 import { Stack } from 'expo-router';
 import * as SplashScreen from 'expo-splash-screen';
@@ -8,27 +7,10 @@ import { useEffect } from 'react';
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import { NotifierWrapper } from 'react-native-notifier';
 import 'react-native-reanimated';
-import Styles from '@/constants/Styles';
 
 // Prevent the splash screen from auto-hiding before asset loading is complete.
 SplashScreen.preventAutoHideAsync();
 
-// Inner component - berada di dalam ThemeProvider, bisa pakai useTheme()
-function AppStack() {
-  const { colors } = useTheme();
-
-  return (
-    <>
-      <Stack screenOptions={{ contentStyle: { backgroundColor: colors.header } }}>
-        <Stack.Screen name="index" options={{ headerShown: false }} />
-        <Stack.Screen name="verification" options={{ headerShown: false }} />
-        <Stack.Screen name="(application)" options={{ headerShown: false }} />
-      </Stack>
-      <StatusBar style="auto" />
-    </>
-  );
-}
-
 export default function RootLayout() {
   const [loaded] = useFonts({
     SpaceMono: require('../assets/fonts/SpaceMono-Regular.ttf'),
@@ -45,13 +27,16 @@ export default function RootLayout() {
   }
 
   return (
-    <GestureHandlerRootView style={Styles.flex1}>
+    <GestureHandlerRootView style={{ flex: 1 }}>
       <NotifierWrapper>
-        <ThemeProvider>
+        <AuthProvider>
-          <AuthProvider>
+          <Stack>
-            <AppStack />
+            <Stack.Screen name="index" options={{ headerShown: false }} />
-          </AuthProvider>
+            <Stack.Screen name="verification" options={{ headerShown: false }} />
-        </ThemeProvider>
+            <Stack.Screen name="(application)" options={{ headerShown: false }} />
+          </Stack>
+          <StatusBar style="auto" />
+        </AuthProvider>
       </NotifierWrapper>
     </GestureHandlerRootView>
   );

app/verification.tsx

@@ -3,7 +3,6 @@ import Text from '@/components/Text';
 import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { useTheme } from "@/providers/ThemeProvider";
 import CryptoES from "crypto-es";
 import React, { useState } from "react";
 import { Image, View } from "react-native";
@@ -16,24 +15,17 @@ export default function Index() {
       value,
       setValue,
    });
-   const { colors } = useTheme();
 
    const { signIn } = useAuthSession();
    const login = (): void => {
-      // WARNING: This is a hardcoded bypass for development purposes.
+      const random: string = 'contohLoginMobileDarmasaba';
-      // It should be removed or secured before production release.
+      var mytexttoEncryption = "contohLoginMobileDarmasaba"
-      if (__DEV__) {
+      const encrypted = CryptoES.AES.encrypt(mytexttoEncryption, ConstEnv.pass_encrypt).toString();
-         const random: string = 'contohLoginMobileDarmasaba';
+      signIn(encrypted);
-         var mytexttoEncryption = "contohLoginMobileDarmasaba"
-         const encrypted = CryptoES.AES.encrypt(mytexttoEncryption, ConstEnv.pass_encrypt).toString();
-         signIn(encrypted);
-      } else {
-         console.warn("Bypass login disabled in production.");
-      }
    }
    return (
-      <View style={[Styles.wrapLogin, { backgroundColor: colors.background }]} >
+      <View style={Styles.wrapLogin} >
-         <View style={[Styles.rowItemsCenter, Styles.mv50]}>
+         <View style={{ alignItems: "center", marginVertical: 50 }}>
             <Image
                source={require("../assets/images/logo.png")}
                style={[{ width: 300, height: 150 }]}
@@ -58,7 +50,7 @@ export default function Index() {
             renderCell={({ index, symbol, isFocused }) => (
                <Text
                   key={index}
-                  style={[Styles.verificationCell, isFocused && Styles.verificationFocusCell, { borderColor: isFocused ? colors.tint : colors.icon, color: colors.text }]}
+                  style={[Styles.verificationCell, isFocused && Styles.verificationFocusCell]}
                   onLayout={getCellOnLayoutHandler(index)}>
                   {symbol || (isFocused ? <Cursor /> : null)}
                </Text>
@@ -69,7 +61,7 @@ export default function Index() {
             // onPress={() => { router.push("/home") }}
             onPress={login}
          />
-         <Text style={[Styles.textInformation, Styles.mt05, Styles.cDefault, { textAlign: 'center', color: colors.tint }]}>
+         <Text style={[Styles.textInformation, Styles.mt05, Styles.cDefault, { textAlign: 'center' }]}>
             Tidak Menerima kode verifikasi? Kirim Ulang
          </Text>
       </View>