wibu/mobile-darmasaba
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'amalia/12-agustus-25' (#22) from amalia/12-agustus-25 into join

Browse Source 
Reviewed-on: bip/mobile-darmasaba#22
This commit is contained in:
amalia
2025-08-12 17:42:40 +08:00
parent 1089afb6aa edbeb30ebe
commit acc464bfc8
10 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/(application)/discussion/[id].tsx
View File

@@ -146,7 +146,6 @@ export default function DetailDiscussionGeneral() {
:
<BorderBottomItem
descEllipsize={false}
width={55}
borderType="bottom"
icon={
<View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
@@ -183,7 +182,6 @@ export default function DetailDiscussionGeneral() {
return (
<BorderBottomItem
key={i}
width={55}
borderType="bottom"
icon={
<ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} size="xs" />

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

@@ -217,7 +217,6 @@ export default function DiscussionDetail() {
:
<BorderBottomItem
descEllipsize={false}
width={55}
borderType="bottom"
icon={
<ImageUser
@@ -265,7 +264,6 @@ export default function DiscussionDetail() {
dataComment.map((item, index) => (
<BorderBottomItem
key={index}
width={55}
borderType="bottom"
icon={
<ImageUser

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

@@ -138,7 +138,6 @@ export default function DiscussionDivision() {
return (
<BorderBottomItem
key={index}
width={55}
onPress={() => { router.push(`./discussion/${item.id}`) }}
borderType="bottom"
icon={
@@ -174,7 +173,6 @@ export default function DiscussionDivision() {
// data.map((item, index) => (
// <BorderBottomItem
// key={index}
// width={55}
// onPress={() => { router.push(`./discussion/${item.id}`) }}
// borderType="bottom"
// icon={

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

@@ -184,7 +184,6 @@ export default function InformationDivision() {
dataMember.map((item, index) => {
return (
<BorderBottomItem
width={55}
key={index}
borderType="bottom"
onPress={() => { dataDetail?.isActive && handleChooseMember(item) }}

1
app/(application)/notification.tsx
View File

@@ -136,7 +136,6 @@ export default function Notification() {
return (
<BorderBottomItem
borderType="bottom"
width={55}
icon={
<View style={[Styles.iconContent, item.isRead ? ColorsStatus.secondary : ColorsStatus.primary]}>
<Feather name="bell" size={25} color="white" />

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

@@ -43,6 +43,8 @@ export default function EditProject() {
setJudul(val)
if (val == "" || val == "null") {
setError(true)
}else{
setError(false)
}
}

2
components/borderBottomItem.tsx
View File

@@ -31,7 +31,7 @@ export default function BorderBottomItem({ title, subtitle, icon, desc, onPress,
<View style={[Styles.rowItemsCenter]}>
{icon}
<View style={[Styles.rowSpaceBetween, width ? { width: lebar } : { width: '88%' }]}>
<View style={[Styles.ml10, rightTopInfo ? { width: lebar } : { width: '90%' },]}>
<View style={[Styles.ml10, rightTopInfo ? { width: '70%' } : { width: '90%' }]}>
<Text style={[titleWeight == 'normal' ? Styles.textDefault : Styles.textDefaultSemiBold, { color: textColorFix }]} numberOfLines={1} ellipsizeMode='tail'>{title}</Text>
{
subtitle &&

60
components/division/taskDivisionDetail.tsx
View File

@@ -2,12 +2,12 @@ import Styles from "@/constants/Styles";
import { apiGetDivisionOneFeature } from "@/lib/api";
import { useAuthSession } from "@/providers/AuthProvider";
import { Feather } from "@expo/vector-icons";
import { useLocalSearchParams } from "expo-router";
import { router, useLocalSearchParams } from "expo-router";
import React, { useEffect, useState } from "react";
import { Dimensions, View } from "react-native";
import Text from "../Text";
import Carousel, { ICarouselInstance } from "react-native-reanimated-carousel";
import { Dimensions, Pressable, View } from "react-native";
import { ICarouselInstance } from "react-native-reanimated-carousel";
import Skeleton from "../skeleton";
import Text from "../Text";
type Props = {
id: string
@@ -46,34 +46,42 @@ export default function TaskDivisionDetail() {
return (
<View>
<Text style={[Styles.textDefaultSemiBold, Styles.mb05]}>Tugas Hari Ini</Text>
{
loading ?
<Skeleton width={100} widthType="percent" height={60} borderRadius={10} />
:
data.length > 0 ?
<Carousel
ref={ref}
style={{ width: "100%" }}
width={width * 0.8}
height={100}
data={data}
loop={true}
autoPlay={false}
autoPlayReverse={false}
pagingEnabled={true}
snapEnabled={true}
vertical={false}
renderItem={({ index }) => (
<View style={[Styles.wrapPaper, { width: '95%' }]}>
<Text style={[Styles.textDefaultSemiBold]} numberOfLines={1} ellipsizeMode="tail">{data[index].title} - {data[index].projectTitle}</Text>
<View style={[Styles.rowItemsCenter, Styles.mt10]}>
<Feather name="clock" size={18} color="grey" style={Styles.mr05} />
<Text style={[Styles.textInformation]} numberOfLines={1} ellipsizeMode="tail">{data[index].dateStart} - {data[index].dateEnd}</Text>
</View>
data.map((item, index) => (
<Pressable key={index} style={[Styles.wrapPaper]} onPress={() => { router.push(`/division/${id}/task/${item.idProject}`) }}>
<Text style={[Styles.textDefaultSemiBold]} numberOfLines={1} ellipsizeMode="tail">{item.title} - {item.projectTitle}</Text>
<View style={[Styles.rowItemsCenter, Styles.mt10]}>
<Feather name="clock" size={18} color="grey" style={Styles.mr05} />
<Text style={[Styles.textInformation]} numberOfLines={1} ellipsizeMode="tail">{item.dateStart} - {item.dateEnd}</Text>
</View>
)}
/>
</Pressable>
))
// <Carousel
// ref={ref}
// style={{ width: "100%" }}
// width={width * 0.8}
// height={100}
// data={data}
// loop={true}
// autoPlay={false}
// autoPlayReverse={false}
// pagingEnabled={true}
// snapEnabled={true}
// vertical={false}
// renderItem={({ index }) => (
// <View style={[Styles.wrapPaper, { width: '95%' }]}>
// <Text style={[Styles.textDefaultSemiBold]} numberOfLines={1} ellipsizeMode="tail">{data[index].title} - {data[index].projectTitle}</Text>
// <View style={[Styles.rowItemsCenter, Styles.mt10]}>
// <Feather name="clock" size={18} color="grey" style={Styles.mr05} />
// <Text style={[Styles.textInformation]} numberOfLines={1} ellipsizeMode="tail">{data[index].dateStart} - {data[index].dateEnd}</Text>
// </View>
// </View>
// )}
// />
:
<Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada tugas</Text>
}

4
components/modalLoading.tsx
View File

@@ -13,7 +13,9 @@ export default function ModalLoading({ isVisible, setVisible }: Props) {
animationOut={"slideOutDown"}
isVisible={isVisible}
hideModalContentWhileAnimating={true}
onBackdropPress={() => { setVisible(false) }}
onBackdropPress={() => {
// setVisible(false)
}}
>
<ActivityIndicator size="large" />
</Modal>

13
ios/mobiledarmasaba.xcodeproj/project.pbxproj
View File

File diff suppressed because one or more lines are too long