Merge pull request 'amalia/11-agustus-25' (#21) from amalia/11-agustus-25 into join

Reviewed-on: bip/mobile-darmasaba#21

app/(application)/group/index.tsx

@@ -15,7 +15,7 @@ import { setUpdateGroup } from "@/lib/groupSlice";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign, Feather, MaterialCommunityIcons } from "@expo/vector-icons";
 import { useEffect, useState } from "react";
-import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
+import { RefreshControl, View, VirtualizedList } from "react-native";
 import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
@@ -116,9 +116,17 @@ export default function Index() {
    }
 
 
+   const getItem = (_data: unknown, index: number): Props => ({
+      id: data[index].id,
+      name: data[index].name,
+      isActive: data[index].isActive,
+   });
+
+
+
    return (
-      <SafeAreaView>
-         <View style={[Styles.p15]}>
+      <View style={[Styles.p15, { flex: 1 }]}>
+         <View>
             <View style={[Styles.wrapBtnTab]}>
                <ButtonTab
                   active={status == "false" ? "false" : "true"}
@@ -136,51 +144,53 @@ export default function Index() {
                   n={2} />
             </View>
             <InputSearch onChange={setSearch} />
-            <ScrollView
-               refreshControl={
-                  <RefreshControl
-                     refreshing={refreshing}
-                     onRefresh={handleRefresh}
-                  />
-               }
-               style={[Styles.h100]}
-            >
-               <View>
-                  {
-
-                     loading ?
-                        arrSkeleton.map((item, index) => {
+         </View>
+         <View style={{ flex: 2 }}>
+            {
+               loading ?
+                  arrSkeleton.map((item, index) => {
+                     return (
+                        <SkeletonTwoItem key={index} />
+                     )
+                  })
+                  :
+                  data.length > 0 ?
+                     <VirtualizedList
+                        data={data}
+                        getItemCount={() => data.length}
+                        getItem={getItem}
+                        renderItem={({ item, index }: { item: Props, index: number }) => {
                            return (
-                              <SkeletonTwoItem key={index} />
+                              <BorderBottomItem
+                                 key={index}
+                                 onPress={() => {
+                                    setIdChoose(item.id)
+                                    setActiveChoose(item.isActive)
+                                    setTitleChoose(item.name)
+                                    setModal(true)
+                                 }}
+                                 borderType="all"
+                                 icon={
+                                    <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
+                                       <MaterialCommunityIcons name="office-building-outline" size={25} color={'#384288'} />
+                                    </View>
+                                 }
+                                 title={item.name}
+                              />
                            )
-                        })
-                        :
-                        data.length > 0 ?
-                           data.map((item, index) => {
-                              return (
-                                 <BorderBottomItem
-                                    key={index}
-                                    onPress={() => {
-                                       setIdChoose(item.id)
-                                       setActiveChoose(item.isActive)
-                                       setTitleChoose(item.name)
-                                       setModal(true)
-                                    }}
-                                    borderType="all"
-                                    icon={
-                                       <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                                          <MaterialCommunityIcons name="office-building-outline" size={25} color={'#384288'} />
-                                       </View>
-                                    }
-                                    title={item.name}
-                                 />
-                              )
-                           })
-                           :
-                           <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
-                  }
-               </View>
-            </ScrollView>
+                        }}
+                        keyExtractor={(item, index) => String(index)}
+                        showsVerticalScrollIndicator={false}
+                        refreshControl={
+                           <RefreshControl
+                              refreshing={refreshing}
+                              onRefresh={handleRefresh}
+                           />
+                        }
+                     />
+                     :
+                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
+            }
          </View>
 
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={() => setModal(false)} title={titleChoose}>
@@ -228,8 +238,7 @@ export default function Index() {
                </View>
             </View>
          </DrawerBottom>
+      </View >
 
-
-      </SafeAreaView>
    )
 }

app/(application)/position/index.tsx

@@ -16,7 +16,7 @@ import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign, Feather, MaterialCommunityIcons } from "@expo/vector-icons";
 import { useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
+import { RefreshControl, View, VirtualizedList } from "react-native";
 import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
@@ -129,9 +129,18 @@ export default function Index() {
       setRefreshing(false)
    };
 
+
+   const getItem = (_data: unknown, index: number): Props => ({
+      id: data[index].id,
+      name: data[index].name,
+      idGroup: data[index].idGroup,
+      group: data[index].group,
+      isActive: data[index].isActive,
+   });
+
    return (
-      <SafeAreaView>
-         <View style={[Styles.p15]}>
+      <View style={[Styles.p15, { flex: 1 }]}>
+         <View>
             <View style={[Styles.wrapBtnTab]}>
                <ButtonTab
                   active={status == "false" ? "false" : "true"}
@@ -155,47 +164,50 @@ export default function Index() {
                   <Text>Filter : {nameGroup}</Text>
                </View>
             }
-            <ScrollView
-               style={[Styles.h100]}
-               refreshControl={
-                  <RefreshControl
-                     refreshing={refreshing}
-                     onRefresh={handleRefresh}
-                  />
-               }>
-               <View>
-                  {
-                     loading ?
-                        arrSkeleton.map((item, index) => {
-                           return (
-                              <SkeletonTwoItem key={index} />
-                           )
-                        })
-                        :
-                        data.length > 0 ?
-                           data.map((item, index) => {
-                              return (
-                                 <BorderBottomItem
-                                    key={index}
-                                    onPress={() => { handleChooseData(item.id, item.name, item.isActive, item.idGroup) }}
-                                    borderType="all"
-                                    icon={
-                                       <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                                          <MaterialCommunityIcons name="account-tie" size={25} color={'#384288'} />
-                                       </View>
-                                    }
-                                    title={item.name}
-                                    subtitle={item.group}
-                                 />
-                              )
-                           })
-                           :
-                           <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
-                  }
-               </View>
-            </ScrollView>
          </View>
-
+         <View style={[{ flex: 2 }]}>
+            {
+               loading ?
+                  arrSkeleton.map((item, index) => {
+                     return (
+                        <SkeletonTwoItem key={index} />
+                     )
+                  })
+                  :
+                  data.length > 0 ?
+                     <VirtualizedList
+                        data={data}
+                        getItemCount={() => data.length}
+                        getItem={getItem}
+                        renderItem={({ item, index }: { item: Props, index: number }) => {
+                           return (
+                              <BorderBottomItem
+                                 key={index}
+                                 onPress={() => { handleChooseData(item.id, item.name, item.isActive, item.idGroup) }}
+                                 borderType="all"
+                                 icon={
+                                    <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
+                                       <MaterialCommunityIcons name="account-tie" size={25} color={'#384288'} />
+                                    </View>
+                                 }
+                                 title={item.name}
+                                 subtitle={item.group}
+                              />
+                           )
+                        }}
+                        keyExtractor={(item, index) => String(index)}
+                        showsVerticalScrollIndicator={false}
+                        refreshControl={
+                           <RefreshControl
+                              refreshing={refreshing}
+                              onRefresh={handleRefresh}
+                           />
+                        }
+                     />
+                     :
+                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
+            }
+         </View>
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={() => setModal(false)} title={chooseData.name}>
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
@@ -243,7 +255,6 @@ export default function Index() {
                </View>
             </View>
          </DrawerBottom>
-
-      </SafeAreaView>
+      </View>
    )
 }

components/auth/viewLogin.tsx

@@ -44,7 +44,7 @@ export default function ViewLogin({ onValidate }: Props) {
    return (
       <SafeAreaView>
          <ToastCustom />
-         <View style={Styles.p20}>
+         <View style={[Styles.p20, Styles.h100]}>
             <View style={{ alignItems: "center", marginVertical: 50 }}>
                <Image
                   source={require("../../assets/images/splash-icon.png")}

components/auth/viewVerification.tsx

@@ -35,7 +35,7 @@ export default function ViewVerification({ phone, otp }: Props) {
       if (value === otpFix.toString()) {
          login()
       } else {
-         return Toast.show({ type: 'error', text1: 'Kode OTP tidak sesuai' });
+         return Toast.show({ type: 'small', text1: 'Kode OTP tidak sesuai' });
       }
    }
 

lib/api.ts

@@ -3,7 +3,7 @@ import axios from 'axios';
 const api = axios.create({
    // baseURL: 'http://10.0.2.2:3000/api',
    // baseURL: 'https://stg-darmasaba.wibudev.com/api',
-   baseURL: 'http://192.168.1.89:3000/api',
+   baseURL: 'http://192.168.1.110:3000/api',
 });
 
 export const apiCheckPhoneLogin = async (body: { phone: string }) => {