upd: redesign

This commit is contained in:
2026-02-13 17:22:15 +08:00
parent 4df0a44ac9
commit acacf9c125
58 changed files with 200 additions and 204 deletions

View File

@@ -176,13 +176,13 @@ export default function BorderBottomItem2({ title, subtitle, icon, desc, onPress
<View style={[rightBottomInfo && !leftBottomInfo ? Styles.rowSpaceBetweenReverse : Styles.rowSpaceBetween, Styles.mt05]}>
{
typeof leftBottomInfo == 'string' ?
<Text style={[Styles.textInformation, Styles.cGray]}>{leftBottomInfo}</Text>
<Text style={[Styles.textInformation, { color: colors.dimmed }]}>{leftBottomInfo}</Text>
:
leftBottomInfo
}
{
typeof rightBottomInfo == 'string' ?
<Text style={[Styles.textInformation, Styles.cGray]}>{rightBottomInfo}</Text>
<Text style={[Styles.textInformation, { color: colors.dimmed }]}>{rightBottomInfo}</Text>
:
rightBottomInfo
}

View File

@@ -29,7 +29,7 @@ export default function ButtonSelect({ value, onPress, round, error, errorText }
<Text style={[{ color: colors.text }]}>{value}</Text>
</View>
</Pressable>
{error && (<Text style={[Styles.textInformation, Styles.mt05, Styles.cError]}>{errorText}</Text>)}
{error && (<Text style={[Styles.textInformation, Styles.mt05, { color: colors.error }]}>{errorText}</Text>)}
</View>
)
}

View File

@@ -40,7 +40,7 @@ export default function ItemHistoryEvent({ data }: { data: Props }) {
))
) : (
<View style={[Styles.p15]}>
<Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
<Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada data</Text>
</View>
)
}

View File

@@ -75,9 +75,7 @@ export default function DiscussionDivisionDetail({ refreshing }: { refreshing: b
/>
))
) : (
<Text
style={[Styles.textDefault, Styles.cGray, { textAlign: "center" }]}
>
<Text style={[Styles.textDefault, { textAlign: "center", color: colors.dimmed }]} >
Tidak ada diskusi
</Text>
)

View File

@@ -154,7 +154,7 @@ export default function FileDivisionDetail({ refreshing }: { refreshing: boolean
// )}
// />
:
<Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada file</Text>
<Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada file</Text>
}
</View>
)

View File

@@ -90,7 +90,7 @@ export default function TaskDivisionDetail({ refreshing }: { refreshing: boolean
// )}
// />
:
<Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada tugas</Text>
<Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada tugas</Text>
}
</View>
)

View File

@@ -98,7 +98,7 @@ export default function ModalInformasi({ data }: { data: any }) {
)
: (
<View style={[Styles.ml10, Styles.mt02]}>
<Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
<Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada data</Text>
</View>
)
}

View File

@@ -99,14 +99,14 @@ export default function ModalSalinMove({ open, close, category, onConfirm, dataC
if (found) return;
setPath(item.id);
}}
subtitle={found ? <Text style={[Styles.textInformation, Styles.cGray]}>Tidak dapat memilih folder ini</Text> : ''}
subtitle={found ? <Text style={[Styles.textInformation, { color: colors.dimmed }]}>Tidak dapat memilih folder ini</Text> : ''}
/>
)
}
)
:
<Text style={[Styles.textDefault, Styles.cGray, Styles.mt15, { textAlign: 'center' }]}>Tidak ada data</Text>
<Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }, Styles.mt15]}>Tidak ada data</Text>
}
</View>
<View style={[Styles.rowOnly, Styles.mt15, Styles.absolute0, { backgroundColor: colors.modalBackground }]}>

View File

@@ -64,7 +64,7 @@ export default function DisccussionHome({ refreshing }: { refreshing: boolean })
<DiscussionItem key={index} title={item.desc} user={item.user} date={item.date} onPress={() => { router.push(`/division/${item.idDivision}/discussion/${item.id}`) }} />
)
})
: <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada diskusi</Text>
: <Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada diskusi</Text>
}
</View>
</View>

View File

@@ -92,7 +92,7 @@ export default function DivisionHome({ refreshing }: { refreshing: boolean }) {
// )}
// />
:
<Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
<Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada data</Text>
}
</View>
)

View File

@@ -69,7 +69,7 @@ export default function EventHome({ refreshing }: { refreshing: boolean }) {
<EventItem key={index} category={index % 2 == 0 ? 'purple' : 'orange'} onPress={() => { router.push(`/division/${item.idDivision}/calendar/${item.id}`) }} title={item.title} user={item.user_name} jamAwal={item.timeStart} jamAkhir={item.timeEnd} />
)
})
: <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada acara hari ini</Text>
: <Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada acara hari ini</Text>
}
</View>
</View>

View File

@@ -97,7 +97,7 @@ export default function ProjectHome({ refreshing }: { refreshing: boolean }) {
)}
/>
:
<Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
<Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada data</Text>
}
</View>

View File

@@ -46,7 +46,7 @@ export function InputForm({ label, value, placeholder, onChange, info, disable,
multiline && { alignItems: 'flex-end' },
round && Styles.round30,
{
backgroundColor: bg=="transparent" ? "transparent" : colors.input,
backgroundColor: bg == "transparent" ? "transparent" : colors.input,
},
error ? { borderColor: colors.error } : { borderColor: colors.icon + '20' },
Platform.OS == 'ios' ? { paddingVertical: 10 } : { paddingVertical: 0, minHeight: 40 },
@@ -102,7 +102,7 @@ export function InputForm({ label, value, placeholder, onChange, info, disable,
error ? { borderColor: colors.error } : { borderColor: colors.icon + '20' },
round && Styles.round30,
{
backgroundColor: bg=="transparent" ? "transparent" : colors.input,
backgroundColor: bg == "transparent" ? "transparent" : colors.input,
},
{ color: colors.text },
multiline && { height: 150, textAlignVertical: 'top' }
@@ -112,7 +112,7 @@ export function InputForm({ label, value, placeholder, onChange, info, disable,
multiline={multiline}
numberOfLines={multiline ? 5 : undefined}
/>
{error && (<Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>{errorText}</Text>)}
{error && (<Text style={[Styles.textInformation, { color: colors.error }, Styles.mt05]}>{errorText}</Text>)}
{info != undefined && (<Text style={[Styles.textInformation, Styles.mt05, { color: colors.icon }]}>{info}</Text>)}
</View>
)

View File

@@ -16,26 +16,26 @@ export default function ItemSectionTanggalTugas({ done, title, dateStart, dateEn
const { colors } = useTheme();
return (
<Pressable style={[Styles.mb15, { borderBottomColor: colors.icon, borderBottomWidth: 1 }]} onPress={onPress}>
<Pressable style={[Styles.mb15, { borderBottomColor: colors.icon + '20', borderBottomWidth: 1 }]} onPress={onPress}>
<View style={[Styles.rowItemsCenter]}>
{
done != undefined ?
done ?
<>
<MaterialCommunityIcons name="checkbox-marked-circle-outline" size={22} color={colors.text} style={[Styles.mr10]} />
<Text style={[Styles.cGray]}>Selesai</Text>
<Text>Selesai</Text>
</>
:
<>
<MaterialCommunityIcons name="checkbox-blank-circle-outline" size={22} color={colors.text} style={[Styles.mr10]} />
<Text style={[Styles.cGray]}>Belum Selesai</Text>
<Text>Belum Selesai</Text>
</>
:
<></>
}
</View>
<View style={[Styles.wrapPaper, Styles.mv10, Styles.p10, { backgroundColor: colors.card, borderColor: colors.background }]}>
<View style={[Styles.wrapPaper, Styles.noShadow, Styles.borderAll, Styles.mv10, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
<View style={[Styles.rowItemsCenter, { alignItems: 'flex-start' }]}>
<MaterialCommunityIcons name="file-table-outline" size={25} color={colors.text} style={[Styles.mr10]} />
<View style={[Styles.w90]}>
@@ -46,13 +46,13 @@ export default function ItemSectionTanggalTugas({ done, title, dateStart, dateEn
<View style={[Styles.rowSpaceBetween, Styles.mb15]}>
<View style={[{ width: '48%' }]}>
<Text style={[Styles.mb05]}>Tanggal Mulai</Text>
<View style={[Styles.wrapPaper, Styles.p10, { backgroundColor: colors.card, borderColor: colors.background }]}>
<View style={[Styles.wrapPaper, Styles.noShadow, Styles.borderAll, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
<Text style={{ textAlign: 'center' }}>{dateStart}</Text>
</View>
</View>
<View style={[{ width: '48%' }]}>
<Text style={[Styles.mb05]}>Tanggal Berakhir</Text>
<View style={[Styles.wrapPaper, Styles.p10, { backgroundColor: colors.card, borderColor: colors.background }]}>
<View style={[Styles.wrapPaper, Styles.noShadow, Styles.borderAll, Styles.p10, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
<Text style={{ textAlign: 'center' }}>{dateEnd}</Text>
</View>
</View>

View File

@@ -161,7 +161,7 @@ export default function ModalFilter({ open, close, page, category, valueGroup, v
style={[
Styles.chip,
{ borderColor: colors.dimmed },
chooseGroup == item.id && { backgroundColor: colors.primary },
chooseYear == item.id && { backgroundColor: colors.primary },
]}
activeOpacity={0.8}
onPress={() => { setChooseYear(item.id) }}

View File

@@ -152,7 +152,7 @@ export default function ModalSelect({ open, close, title, category, idParent, on
</View>
:
<Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
<Text style={[Styles.textDefault, { color: colors.dimmed }, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
}
</>
}

View File

@@ -98,7 +98,7 @@ export default function ModalAddDetailTugasProject({ isVisible, setVisible, data
getItem={getItem}
renderItem={({ item, index }: { item: Props, index: number }) => {
return (
<View key={index} style={[Styles.borderBottom, Styles.pv05, { borderBottomColor: colors.icon }]}>
<View key={index} style={[Styles.borderBottom, Styles.pv05, { borderBottomColor: colors.icon + "20" }]}>
<Text style={[Styles.textDefaultSemiBold]}>{item.date}</Text>
<View style={[Styles.rowSpaceBetween]}>
<View style={[{ width: "48%" }]}>

View File

@@ -109,7 +109,7 @@ export default function ModalListDetailTugasProject({ isVisible, setVisible, idT
/>
)
:
<Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]} >Tidak ada data</Text>
<Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]} >Tidak ada data</Text>
}
</View>

View File

@@ -161,7 +161,7 @@ export default function SectionFile({ status, member, refreshing }: { status: nu
)
})
:
<Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada file</Text>
<Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada file</Text>
}
</View>
</View>

View File

@@ -129,7 +129,7 @@ export default function SectionMember({ status, refreshing }: { status: number |
);
})
:
<Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada anggota</Text>
<Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada anggota</Text>
}
</View>
</View>

View File

@@ -149,7 +149,7 @@ export default function SectionTanggalTugasProject({ status, member, refreshing
);
})
:
<Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada tugas</Text>
<Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada tugas</Text>
}
</View>
</View>

View File

@@ -14,7 +14,7 @@ export default function SectionCancel({ text, title }: Props) {
const { colors } = useTheme();
return (
<View style={[Styles.p10, Styles.round05, Styles.mb15, { backgroundColor: colors.card }]}>
<View style={[Styles.p10, Styles.round05, Styles.mb15, { backgroundColor: colors.error + '70' }]}>
<View style={[Styles.rowItemsCenter]}>
<AntDesign name="warning" size={22} style={[Styles.mr10]} color={colors.text} />
<Text style={[Styles.textDefaultSemiBold]}>{title ? title : 'Kegiatan Dibatalkan'}</Text>

View File

@@ -1,10 +1,9 @@
import { ColorsStatus } from "@/constants/ColorsStatus";
import Styles from "@/constants/Styles";
import { useTheme } from "@/providers/ThemeProvider";
import { AntDesign } from "@expo/vector-icons";
import Text from "./Text";
import { View } from "react-native";
import ProgressBar from "./progressBar";
import Text from "./Text";
type Props = {
text: string,
@@ -15,9 +14,9 @@ export default function SectionProgress({ text, progress }: Props) {
const { colors } = useTheme();
return (
<View style={[Styles.p15, { flexDirection: 'row', borderRadius: 10, alignItems: 'center', backgroundColor: colors.card }]}>
<View style={[Styles.iconContent, { alignItems: 'center', justifyContent: 'center', backgroundColor: colors.primary }]}>
<AntDesign name="areachart" size={30} color={'#384288'} />
<View style={[Styles.wrapPaper, Styles.rowItemsCenter, { backgroundColor: colors.card }]}>
<View style={[Styles.iconContent]}>
<AntDesign name="areachart" size={30} color={'black'} />
</View>
<View style={[Styles.ml10, { flex: 1 }]}>
<Text style={[Styles.mb05]}>{text}</Text>

View File

@@ -109,7 +109,7 @@ export default function ModalListDetailTugasTask({ isVisible, setVisible, idTask
/>
)
:
<Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]} >Tidak ada data</Text>
<Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]} >Tidak ada data</Text>
}
</View>

View File

@@ -152,7 +152,7 @@ export default function SectionFileTask({ refreshing, isMemberDivision }: { refr
)
})
:
<Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada file</Text>
<Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada file</Text>
}
</View>
</View>

View File

@@ -132,13 +132,7 @@ export default function SectionMemberTask({ refreshing, isAdminDivision }: { ref
);
})
) : (
<Text
style={[
Styles.textDefault,
Styles.cGray,
{ textAlign: "center" },
]}
>
<Text style={[ Styles.textDefault, { textAlign: "center", color:colors.dimmed }, ]} >
Tidak ada anggota
</Text>
)

View File

@@ -151,7 +151,7 @@ export default function SectionTanggalTugasTask({ refreshing, isMemberDivision }
);
})
:
<Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada tugas</Text>
<Text style={[Styles.textDefault, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada tugas</Text>
}
</View>
</View>