Merge pull request 'amalia/06-agustus-25' (#15) from amalia/06-agustus-25 into join

Reviewed-on: bip/mobile-darmasaba#15

app/(application)/announcement/create.tsx

@@ -149,7 +149,7 @@ export default function CreateAnnouncement() {
                                  <Text style={[Styles.textDefaultSemiBold]}>{item.name}</Text>
                                  {
                                     item.Division.map((division: any, i: any) => (
-                                       <View key={i} style={[Styles.rowItemsCenter, Styles.mv05]}>
+                                       <View key={i} style={[Styles.rowItemsCenter]}>
                                           <Entypo name="dot-single" size={24} color="black" />
                                           <Text style={[Styles.textDefault]}>{division.name}</Text>
                                        </View>

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

@@ -193,7 +193,7 @@ export default function EditAnnouncement() {
                                  <Text style={[Styles.textDefaultSemiBold]}>{item.name}</Text>
                                  {
                                     item.Division.map((division: any, i: any) => (
-                                       <View key={i} style={[Styles.rowItemsCenter, Styles.mv05]}>
+                                       <View key={i} style={[Styles.rowItemsCenter]}>
                                           <Entypo name="dot-single" size={24} color="black" />
                                           <Text style={[Styles.textDefault]}>{division.name}</Text>
                                        </View>

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

@@ -43,8 +43,6 @@ export default function EditBanner() {
       if (!result.canceled) {
          setSelectedImage(result.assets[0].uri);
          setImgForm(result.assets[0]);
-      } else {
-         alert("Tidak ada gambar yang dipilih");
       }
    };
 

app/(application)/banner/create.tsx

@@ -42,8 +42,6 @@ export default function CreateBanner() {
          if (result.assets?.[0].uri) {
             setSelectedImage(result.assets[0].uri);
             setImgForm(result.assets[0]);
-         } else {
-            alert("Tidak ada gambar yang dipilih");
          }
       }
    };

app/(application)/banner/index.tsx

@@ -155,7 +155,7 @@ export default function BannerList() {
                />
                <MenuItemRow
                   icon={<MaterialCommunityIcons name="file-eye" color="black" size={25} />}
-                  title="Lihat File"
+                  title="Lihat / Share"
                   onPress={() => { openFile() }}
                />
                <MenuItemRow

app/(application)/edit-profile.tsx

@@ -201,7 +201,6 @@ export default function EditProfile() {
          setSelectedImage(result.assets[0].uri);
          setImgForm(result.assets[0]);
       } else {
-         alert("Tidak ada gambar yang dipilih");
          setErrorImg(false)
       }
    };

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

@@ -1,6 +1,7 @@
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import ImageUser from "@/components/imageNew";
 import ItemDetailMember from "@/components/itemDetailMember";
+import LabelStatus from "@/components/labelStatus";
 import HeaderRightMemberDetail from "@/components/member/headerMemberDetail";
 import Skeleton from "@/components/skeleton";
 import Text from "@/components/Text";
@@ -102,6 +103,11 @@ export default function MemberDetail() {
             <View style={[Styles.p15]}>
                <View style={[Styles.rowSpaceBetween]}>
                   <Text style={[Styles.textDefaultSemiBold]}>Informasi</Text>
+                  <LabelStatus
+                     size="small"
+                     category={data?.isActive ? 'success' : 'error'}
+                     text={data?.isActive ? 'AKTIF' : 'TIDAK AKTIF'}
+                  />
                </View>
                {
                   loading ?

app/(application)/member/create.tsx

@@ -201,9 +201,6 @@ export default function CreateMember() {
       if (!result.canceled) {
          setSelectedImage(result.assets[0].uri);
          setImgForm(result.assets[0]);
-
-      } else {
-         alert("Tidak ada gambar yang dipilih");
       }
    };
 

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

@@ -228,7 +228,6 @@ export default function EditMember() {
          setSelectedImage(result.assets[0].uri);
          setImgForm(result.assets[0]);
       } else {
-         alert("Tidak ada gambar yang dipilih");
          setErrorImg(false)
       }
    };

components/division/fileDivisionDetail.tsx

@@ -51,7 +51,7 @@ export default function FileDivisionDetail() {
 
 
    const openFile = (item: Props) => {
-      setLoadingOpen(true)
+      if (Platform.OS == 'android') setLoadingOpen(true)
       let remoteUrl = 'https://wibu-storage.wibudev.com/api/files/' + item.idStorage;
       const fileName = item.name + '.' + item.extension;
       let localPath = `${FileSystem.documentDirectory}/${fileName}`;
@@ -59,6 +59,7 @@ export default function FileDivisionDetail() {
 
       FileSystem.downloadAsync(remoteUrl, localPath).then(async ({ uri }) => {
          const contentURL = await FileSystem.getContentUriAsync(uri);
+         setLoadingOpen(false)
          try {
             if (Platform.OS == 'android') {
                // open with android intent
@@ -79,7 +80,7 @@ export default function FileDivisionDetail() {
          } catch (error) {
             Alert.alert('INFO', 'Gagal membuka file, tidak ada aplikasi yang dapat membuka file ini');
          } finally {
-            setLoadingOpen(false)
+            if (Platform.OS == 'android') setLoadingOpen(false)
          }
       });
    };

components/inputForm.tsx

@@ -78,11 +78,11 @@ export function InputForm({ label, value, placeholder, onChange, info, disable,
             placeholder={placeholder}
             keyboardType={type}
             editable={!disable}
-            style={[Styles.inputRoundForm, error && { borderColor: "red" }, round && Styles.round30, { backgroundColor: bg && bg == 'white' ? 'white' : 'transparent' }, { color: 'black' }, multiline && { height: 100, textAlignVertical: 'top' }]}
+            style={[Styles.inputRoundForm, error && { borderColor: "red" }, round && Styles.round30, { backgroundColor: bg && bg == 'white' ? 'white' : 'transparent' }, { color: 'black' }, multiline && { height: 150, textAlignVertical: 'top' }]}
             onChangeText={onChange}
             placeholderTextColor={'gray'}
             multiline={multiline}
-            numberOfLines={multiline ? 4 : undefined}
+            numberOfLines={multiline ? 5 : undefined}
          />
          {error && (<Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>{errorText}</Text>)}
          {info != undefined && (<Text style={[Styles.textInformation, Styles.mt05, Styles.cGray]}>{info}</Text>)}

components/labelStatus.tsx

@@ -10,7 +10,7 @@ type Props = {
 }
 export default function LabelStatus({ category, text, size }: Props) {
    return (
-      <View style={[size == "small" ? Styles.labelStatusSmall : Styles.labelStatus, ColorsStatus[category], Styles.round10]}>
+      <View style={[size == "small" ? Styles.labelStatusSmall : Styles.labelStatus, ColorsStatus[category], Styles.round10, Styles.contentItemCenter]}>
          <Text style={[size == "small" ? Styles.textSmallSemiBold : Styles.textMediumSemiBold, Styles.cWhite, { textAlign: 'center' }]}>{text}</Text>
       </View>
    )

components/project/sectionFile.tsx

@@ -173,7 +173,7 @@ export default function SectionFile({ status, member, refreshing }: { status: nu
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
                   icon={<MaterialCommunityIcons name="file-eye" color="black" size={25} />}
-                  title="Lihat File"
+                  title="Lihat / Share"
                   onPress={() => {
                      openFile()
                   }}

components/task/sectionFileTask.tsx

@@ -157,7 +157,7 @@ export default function SectionFileTask({refreshing}: {refreshing: boolean}) {
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
                   icon={<MaterialCommunityIcons name="file-eye" color="black" size={25} />}
-                  title="Lihat File"
+                  title="Lihat / Share"
                   onPress={() => {
                      openFile()
                      // setModal(false)