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

redesign aplikasi #22

Merged
amaliadwiy merged 1 commits from amalia/11-feb-26 into join 2026-02-11 17:07:41 +08:00
Conversation 0 Commits 1 Files Changed 49 +128 -116
49 changed files with 128 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/(application)/announcement/create.tsx
View File

@@ -270,7 +270,7 @@ export default function CreateAnnouncement() {
<DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
<View style={Styles.rowItemsCenter}>
<MenuItemRow
icon={<Ionicons name="trash" color={colors.text} size={25} />}
icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
title="Hapus"
onPress={() => { deleteFile(indexDelFile) }}
/>

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

@@ -334,7 +334,7 @@ export default function EditAnnouncement() {
<DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
<View style={Styles.rowItemsCenter}>
<MenuItemRow
icon={<Ionicons name="trash" color={colors.text} size={25} />}
icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
title="Hapus"
onPress={() => { deleteFile(indexDelFile.id, indexDelFile.cat) }}
/>

4
app/(application)/banner/index.tsx
View File

@@ -163,7 +163,7 @@ export default function BannerList() {
</View>
:
<View style={[Styles.p15, Styles.mb100]}>
<Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
<Text style={[Styles.textDefault, { textAlign: 'center' }]}>Tidak ada data</Text>
</View>
}
@@ -192,7 +192,7 @@ export default function BannerList() {
}}
/>
<MenuItemRow
icon={<Ionicons name="trash" color={colors.text} size={25} />}
icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
title="Hapus"
onPress={() => {
setModal(false)

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

@@ -261,8 +261,8 @@ export default function DetailDiscussionGeneral() {
descEllipsize={false}
borderType="bottom"
icon={
<View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
<MaterialIcons name="chat" size={25} color={'#384288'} />
<View style={[Styles.iconContent]}>
<MaterialIcons name="chat" size={25} color={'black'} />
</View>
}
title={data?.title}
@@ -276,13 +276,13 @@ export default function DetailDiscussionGeneral() {
desc={data?.desc}
leftBottomInfo={
<View style={[Styles.rowItemsCenter]}>
<Ionicons name="chatbox-ellipses-outline" size={18} color="grey" style={Styles.mr05} />
<Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>{dataKomentar.length} Komentar</Text>
<Ionicons name="chatbox-ellipses-outline" size={18} color={colors.dimmed} style={Styles.mr05} />
<Text style={[Styles.textInformation, { color: colors.dimmed }, Styles.mb05]}>{dataKomentar.length} Komentar</Text>
</View>
}
rightBottomInfo={
<View style={[Styles.rowItemsCenter]}>
<Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>{data?.createdAt}</Text>
<Text style={[Styles.textInformation, { color: colors.dimmed }, Styles.mb05]}>{data?.createdAt}</Text>
</View>
}
/>
@@ -310,6 +310,7 @@ export default function DetailDiscussionGeneral() {
desc={item.comment}
rightBottomInfo={item.isEdited ? "Edited" : ""}
descEllipsize={detailMore.includes(item.id) ? false : true}
bgColor="transparent"
onPress={() => {
setDetailMore((prev: any) => {
if (prev.includes(item.id)) {
@@ -336,7 +337,7 @@ export default function DetailDiscussionGeneral() {
<View style={[
Styles.contentItemCenter,
Styles.w100,
{ backgroundColor: colors.card },
{ backgroundColor: colors.background },
viewEdit && Styles.borderTop
]}>
{
@@ -356,7 +357,6 @@ export default function DetailDiscussionGeneral() {
type="default"
round
placeholder="Kirim Komentar"
bg="white"
onChange={(val: string) => setSelectKomentar({ ...selectKomentar, comment: val })}
value={selectKomentar.comment}
multiline
@@ -370,7 +370,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"))) ? Styles.cGray : Styles.cDefault} />
<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}} />
</Pressable>
}
/>
@@ -383,7 +383,6 @@ export default function DetailDiscussionGeneral() {
type="default"
round
placeholder="Kirim Komentar"
bg="white"
onChange={setKomentar}
value={komentar}
multiline
@@ -397,7 +396,7 @@ 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"))) ? Styles.cGray : Styles.cDefault} />
<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}} />
</Pressable>
}
/>
@@ -423,7 +422,7 @@ export default function DetailDiscussionGeneral() {
onPress={() => { handleViewEditKomentar() }}
/>
<MenuItemRow
icon={<MaterialIcons name="delete" color={colors.text} size={25} />}
icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
title="Hapus"
onPress={() => {
AlertKonfirmasi({

6
app/(application)/discussion/add-member/[id].tsx
View File

@@ -149,7 +149,7 @@ export default function AddMemberDiscussionDetail() {
</View>
:
<Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
<Text style={[Styles.textDefault, Styles.pv05, { textAlign: 'center', color: colors.dimmed }]}>Tidak ada member yang dipilih</Text>
}
<ScrollView
showsVerticalScrollIndicator={false}
@@ -162,7 +162,7 @@ export default function AddMemberDiscussionDetail() {
return (
<Pressable
key={index}
style={[Styles.itemSelectModal]}
style={[Styles.itemSelectModal, { borderColor: colors.icon + '20' }]}
onPress={() => {
!found && onChoose(item.id, item.name, item.img)
}}
@@ -172,7 +172,7 @@ export default function AddMemberDiscussionDetail() {
<View style={[Styles.ml10]}>
<Text style={[Styles.textDefault]}>{item.name}</Text>
{
found && <Text style={[Styles.textInformation, Styles.cGray]}>sudah menjadi anggota</Text>
found && <Text style={[Styles.textInformation, {color: colors.dimmed}]}>sudah menjadi anggota</Text>
}
</View>
</View>

2
app/(application)/discussion/create.tsx
View File

@@ -332,7 +332,7 @@ export default function CreateDiscussionGeneral() {
<DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
<View style={Styles.rowItemsCenter}>
<MenuItemRow
icon={<Ionicons name="trash" color={colors.text} size={25} />}
icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
title="Hapus"
onPress={() => { deleteFile(indexDelFile) }}
/>

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

@@ -229,8 +229,8 @@ export default function EditDiscussionGeneral() {
{
(fileForm.length > 0 || dataFile.filter((val) => !val.delete).length > 0)
&&
<View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10, { borderColor: colors.icon }]}>
<Text style={[Styles.textDefaultSemiBold]}>File</Text>
<View>
<Text style={[Styles.textDefault]}>File</Text>
{
dataFile.filter((val) => !val.delete).map((item, index) => (
<BorderBottomItem
@@ -263,7 +263,7 @@ export default function EditDiscussionGeneral() {
<DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
<View style={Styles.rowItemsCenter}>
<MenuItemRow
icon={<Ionicons name="trash" color={colors.text} size={25} />}
icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
title="Hapus"
onPress={() => { deleteFile(indexDelFile.id, indexDelFile.cat) }}
/>

9
app/(application)/discussion/index.tsx
View File

@@ -148,12 +148,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, ColorsStatus.lightGreen]}>
<MaterialIcons name="chat" size={25} color={'#384288'} />
<View style={[Styles.iconContent]}>
<MaterialIcons name="chat" size={25} color={'black'} />
</View>
}
title={item.title}
@@ -164,8 +165,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="grey" style={Styles.mr05} />
<Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>Diskusikan</Text>
<Ionicons name="chatbox-ellipses-outline" size={18} color={colors.dimmed} style={Styles.mr05} />
<Text style={[Styles.textInformation, {color: colors.dimmed}, Styles.mb05]}>Diskusikan</Text>
</View>
}
rightBottomInfo={`${item.total_komentar} Komentar`}

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

@@ -221,7 +221,7 @@ export default function DiscussionDivisionEdit() {
<DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
<View style={Styles.rowItemsCenter}>
<MenuItemRow
icon={<Ionicons name="trash" color={colors.text} size={25} />}
icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
title="Hapus"
onPress={() => { deleteFile(indexDelFile.id, indexDelFile.cat) }}
/>

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

@@ -538,7 +538,7 @@ export default function DiscussionDetail() {
onPress={() => { handleViewEditKomentar() }}
/>
<MenuItemRow
icon={<MaterialIcons name="delete" color={colors.text} size={25} />}
icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
title="Hapus"
onPress={() => {
AlertKonfirmasi({

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

@@ -157,7 +157,7 @@ export default function CreateDiscussionDivision() {
<DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
<View style={Styles.rowItemsCenter}>
<MenuItemRow
icon={<Ionicons name="trash" color={colors.text} size={25} />}
icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
title="Hapus"
onPress={() => { deleteFile(indexDelFile) }}
/>

2
app/(application)/division/[id]/(fitur-division)/task/[detail]/add-file.tsx
View File

@@ -199,7 +199,7 @@ export default function TaskDivisionAddFile() {
<DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title="Menu">
<View style={Styles.rowItemsCenter}>
<MenuItemRow
icon={<Ionicons name="trash" color={colors.text} size={25} />}
icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
title="Hapus"
onPress={() => { deleteFile(indexDelFile) }}
/>

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

@@ -226,7 +226,7 @@ export default function CreateTaskDivision() {
<DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title="Menu">
<View style={Styles.rowItemsCenter}>
<MenuItemRow
icon={<Ionicons name="trash" color={colors.text} size={25} />}
icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
title="Hapus"
onPress={() => { deleteFile(indexDelFile) }}
/>

2
app/(application)/feature.tsx
View File

@@ -38,7 +38,7 @@ export default function Feature() {
{
(entityUser.role == "supadmin" || entityUser.role == "developer") &&
<>
<ButtonFiturMenu icon={<Feather name="layers" size={30} color={colors.icon} />} text="Lembaga Desa" onPress={() => { router.push('/group') }} />
<ButtonFiturMenu icon={<Ionicons name="bookmarks-outline" size={30} color={colors.icon} />} 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="images-outline" size={30} color={colors.icon} />} text="Banner" onPress={() => { router.push('/banner') }} />
</>

8
app/(application)/group/index.tsx
View File

@@ -15,7 +15,7 @@ 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";
@@ -176,8 +176,8 @@ export default function Index() {
}}
borderType="all"
icon={
<View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
<MaterialCommunityIcons name="office-building-outline" size={25} color={'#384288'} />
<View style={[Styles.iconContent]}>
<Ionicons name="bookmark-outline" size={25} color={'black'} />
</View>
}
title={item.name}
@@ -236,7 +236,7 @@ export default function Index() {
label="Lembaga Desa"
value={titleChoose}
error={error.title}
bg={colors.card}
bg={"transparent"}
errorText="Lembaga Desa tidak boleh kosong & minimal 3 karakter"
onChange={(val) => { validationForm(val, 'title') }} />
</View>

6
app/(application)/position/index.tsx
View File

@@ -200,8 +200,8 @@ export default function Index() {
}}
borderType="all"
icon={
<View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
<MaterialCommunityIcons name="account-tie" size={25} color={'#384288'} />
<View style={[Styles.iconContent]}>
<MaterialCommunityIcons name="account-tie-outline" size={25} color={'black'} />
</View>
}
title={item.name}
@@ -259,7 +259,7 @@ export default function Index() {
placeholder="Nama Jabatan"
required
label="Jabatan"
bg={colors.card}
bg={"transparent"}
value={chooseData.name}
onChange={(val) => { validationForm(val) }}
error={error.name}

2
app/(application)/project/[id]/add-file.tsx
View File

@@ -190,7 +190,7 @@ export default function ProjectAddFile() {
<DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title="Menu">
<View style={Styles.rowItemsCenter}>
<MenuItemRow
icon={<Ionicons name="trash" color={colors.text} size={25} />}
icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
title="Hapus"
onPress={() => { deleteFile(indexDelFile) }}
/>

2
app/(application)/project/create.tsx
View File

@@ -348,7 +348,7 @@ export default function CreateProject() {
<DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title="Menu">
<View style={Styles.rowItemsCenter}>
<MenuItemRow
icon={<Ionicons name="trash" color={colors.text} size={25} />}
icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
title="Hapus"
onPress={() => { deleteFile(indexDelFile) }}
/>

2
components/announcement/headerAnnouncementDetail.tsx
View File

@@ -56,7 +56,7 @@ export default function HeaderRightAnnouncementDetail({ id }: Props) {
}}
/>
<MenuItemRow
icon={<Ionicons name="trash" color={colors.text} size={25} />}
icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
title="Hapus"
onPress={() => {
setVisible(false)

12
components/borderBottomItem.tsx
View File

@@ -39,13 +39,13 @@ export default function BorderBottomItem({ title, subtitle, icon, desc, onPress,
onPressOut={() => setIsTap(false)}
style={({ pressed }) => [
borderType == 'bottom'
? [Styles.wrapItemBorderBottom, { borderBottomColor: colors.icon }]
? [Styles.wrapItemBorderBottom, { borderBottomColor: colors.icon + '20' }]
: borderType == 'all'
? [Styles.wrapItemBorderAll, { borderColor: colors.icon }]
? [Styles.wrapItemBorderAll, { borderColor: colors.icon + '20' }]
: Styles.wrapItemBorderNone,
{ backgroundColor: bgColor },
bgColor == "transparent" ? { backgroundColor: 'transparent' } : { backgroundColor: colors.card },
// efek warna saat ditekan (sementara)
isTap && colorPress && ColorsStatus.pressedGray,
isTap && colorPress && { backgroundColor: colors.icon + '20' },
]}
>
<View style={[Styles.rowItemsCenter]}>
@@ -75,13 +75,13 @@ export default function BorderBottomItem({ 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
}

8
components/borderBottomItem2.tsx
View File

@@ -117,9 +117,9 @@ export default function BorderBottomItem2({ title, subtitle, icon, desc, onPress
onPressOut={() => setIsTap(false)}
style={({ pressed }) => [
borderType == 'bottom'
? [Styles.wrapItemBorderBottom, { borderBottomColor: colors.icon }]
? [Styles.wrapItemBorderBottom, { borderBottomColor: colors.icon + '20' }]
: borderType == 'all'
? [Styles.wrapItemBorderAll, { borderColor: colors.icon }]
? [Styles.wrapItemBorderAll, { borderColor: colors.icon + '20' }]
: Styles.wrapItemBorderNone,
bgColor && bgColor == 'white' && { backgroundColor: colors.card },
// efek warna saat ditekan (sementara)
@@ -153,7 +153,7 @@ export default function BorderBottomItem2({ title, subtitle, icon, desc, onPress
{dataFile.map((item, index) => (
<Pressable
key={index}
style={[Styles.rowItemsCenter, Styles.borderAll, Styles.round10, Styles.ph05, Styles.pv03, Styles.mr05, { borderColor: colors.icon }]}
style={[Styles.rowItemsCenter, Styles.borderAll, Styles.round05, Styles.ph05, Styles.pv03, Styles.mr05, { borderColor: colors.icon }]}
onPress={() => {
isImageFile(item.extension) ?
handleChooseFile(item)
@@ -164,7 +164,7 @@ export default function BorderBottomItem2({ title, subtitle, icon, desc, onPress
name={isImageFile(item.extension) ? "file-image-outline" : "file-document-outline"}
size={18}
color={colors.icon} />
<Text style={[Styles.textInformation, Styles.cGray]}>{item.name}.{item.extension}</Text>
<Text style={[Styles.textInformation]}>{item.name}.{item.extension}</Text>
</Pressable>
))}
</ScrollView>

2
components/buttonMenuHeader.tsx
View File

@@ -9,7 +9,7 @@ export default function ButtonMenuHeader({ onPress }: Props) {
return (
<>
<ButtonHeader
item={<Feather name="menu" size={20} color="white" />}
item={<Feather name="menu" size={25} color="white" />}
onPress={() => onPress()}
/>
</>

2
components/buttonSaveHeader.tsx
View File

@@ -12,7 +12,7 @@ export default function ButtonSaveHeader({ category, onPress, disable }: Props)
return (
<>
<ButtonHeader
item={<Feather name="check" size={20} color={disable ? "grey" : "white"} />}
item={<Feather name="check" size={25} color={disable ? "grey" : "white"} />}
onPress={() => {
if (!disable) {
AlertKonfirmasi({

2
components/buttonSelect.tsx
View File

@@ -22,7 +22,7 @@ export default function ButtonSelect({ value, onPress, round, error, errorText }
Styles.inputRoundFormRight,
round && Styles.round30,
Styles.pv10,
{ borderColor: colors.icon, backgroundColor: colors.card },
{ borderColor: colors.icon + '20', backgroundColor: colors.input },
error && { borderColor: "red" }
]}>
<Feather name="arrow-right-circle" size={20} color={colors.text} />

4
components/calendar/headerCalendarDetail.tsx
View File

@@ -51,7 +51,7 @@ export default function HeaderRightCalendarDetail({ id, idReminder }: Props) {
<DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu">
<View style={Styles.rowItemsCenter}>
<MenuItemRow
icon={<MaterialIcons name="groups" color={colors.text} size={25} />}
icon={<MaterialCommunityIcons name="account-group-outline" color={colors.text} size={25} />}
title="Tambah Anggota"
onPress={() => {
setVisible(false)
@@ -67,7 +67,7 @@ export default function HeaderRightCalendarDetail({ id, idReminder }: Props) {
}}
/>
<MenuItemRow
icon={<Ionicons name="trash" color={colors.text} size={25} />}
icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
title="Hapus"
onPress={() => {
setVisible(false)

2
components/discussion_general/headerDiscussionDetail.tsx
View File

@@ -61,7 +61,7 @@ export default function HeaderRightDiscussionGeneralDetail({ id, active, status
<DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu">
<View style={Styles.rowItemsCenter}>
<MenuItemRow
icon={<MaterialIcons name="groups" color={colors.text} size={25} />}
icon={<MaterialCommunityIcons name="account-group-outline" color={colors.text} size={25} />}
title="Anggota"
onPress={() => {
setVisible(false)

2
components/discussion_general/headerDiscussionGeneral.tsx
View File

@@ -25,7 +25,7 @@ export default function HeaderDiscussionGeneral() {
<DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu">
<View style={Styles.rowItemsCenter}>
<MenuItemRow
icon={<AntDesign name="pluscircle" color={colors.text} size={25} />}
icon={<AntDesign name="pluscircleo" color={colors.text} size={25} />}
title="Tambah Diskusi"
onPress={() => {
setVisible(false)

12
components/drawerBottom.tsx
View File

@@ -45,9 +45,9 @@ export default function DrawerBottom({ isVisible, setVisible, title, children, a
behavior={Platform.OS === 'ios' ? 'padding' : undefined}
keyboardVerticalOffset={0}
>
<View style={[Styles.modalContentNew, { height: tinggiFix, backgroundColor: colors.background }]}>
<View style={[Styles.titleContainerNew, { borderBottomColor: colors.icon + '20' }]}>
<Text numberOfLines={1} ellipsizeMode='tail' style={[Styles.textDefault, Styles.w90]}>{title}</Text>
<View style={[Styles.modalContentNew, { height: tinggiFix, backgroundColor: colors.modalBackground }]}>
<View style={[Styles.titleContainerNew]}>
<Text numberOfLines={1} ellipsizeMode='tail' style={[Styles.textDefaultSemiBold, Styles.w90]}>{title}</Text>
<Pressable onPress={() => setVisible(false)}>
<MaterialIcons name="close" color={colors.text} size={22} />
</Pressable>
@@ -58,9 +58,9 @@ export default function DrawerBottom({ isVisible, setVisible, title, children, a
</View>
</KeyboardAvoidingView>
:
<View style={[Styles.modalContentNew, { height: tinggiFix, backgroundColor: colors.background }]}>
<View style={[Styles.titleContainerNew, { borderBottomColor: colors.icon + '20' }]}>
<Text numberOfLines={1} ellipsizeMode='tail' style={[Styles.textDefault, Styles.w90]}>{title}</Text>
<View style={[Styles.modalContentNew, { height: tinggiFix, backgroundColor: colors.modalBackground }]}>
<View style={[Styles.titleContainerNew]}>
<Text numberOfLines={1} ellipsizeMode='tail' style={[Styles.textDefaultSemiBold, Styles.w90]}>{title}</Text>
<Pressable onPress={() => setVisible(false)}>
<MaterialIcons name="close" color={colors.text} size={22} />
</Pressable>

4
components/group/headerGroupList.tsx
View File

@@ -64,7 +64,7 @@ export default function HeaderRightGroupList() {
<DrawerBottom animation="slide" isVisible={isVisible} setVisible={() => setVisible(false)} title="Menu">
<View style={Styles.rowItemsCenter}>
<MenuItemRow
icon={<AntDesign name="pluscircle" color={colors.text} size={25} />}
icon={<AntDesign name="pluscircleo" color={colors.text} size={25} />}
title="Tambah Lembaga"
onPress={() => {
setVisible(false);
@@ -88,7 +88,7 @@ export default function HeaderRightGroupList() {
placeholder="Nama Lembaga Desa"
required label="Lembaga Desa"
error={error.title}
bg={colors.card}
bg={"transparent"}
errorText="Lembaga Desa tidak boleh kosong & minimal 3 karakter"
onChange={(val) => { validationForm(val, 'title') }}
/>

28
components/inputForm.tsx
View File

@@ -34,9 +34,9 @@ export function InputForm({ label, value, placeholder, onChange, info, disable,
<View style={[mb && Styles.mb10]}>
{
label != undefined && (
<Text style={[{ marginBottom: 5, textTransform: "capitalize", color: colors.text }, error && Styles.cError]}>
<Text style={[{ marginBottom: 5, textTransform: "capitalize", color: colors.text }, error && { color: colors.error }]}>
{label}
{required && (<Text style={Styles.cError}>*</Text>)}
{required && (<Text style={{ color: colors.error }}>*</Text>)}
</Text>
)
}
@@ -46,12 +46,9 @@ export function InputForm({ label, value, placeholder, onChange, info, disable,
multiline && { alignItems: 'flex-end' },
round && Styles.round30,
{
backgroundColor: bg
? (bg === 'white' ? (colors.background === '#151718' ? '#2d2e2f' : 'white') : bg)
: 'transparent',
borderColor: colors.icon
backgroundColor: bg=="transparent" ? "transparent" : colors.input,
},
error && { borderColor: "red" },
error ? { borderColor: colors.error } : { borderColor: colors.icon + '20' },
Platform.OS == 'ios' ? { paddingVertical: 10 } : { paddingVertical: 0, minHeight: 40 },
{ alignItems: 'center' },
multiline
@@ -65,7 +62,7 @@ export function InputForm({ label, value, placeholder, onChange, info, disable,
placeholder={placeholder}
keyboardType={type}
onChangeText={onChange}
placeholderTextColor={colors.icon}
placeholderTextColor={colors.dimmed}
multiline={multiline}
numberOfLines={3}
style={[
@@ -76,7 +73,7 @@ export function InputForm({ label, value, placeholder, onChange, info, disable,
]}
/>
</View>
{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, { color: colors.icon }, Styles.mt05]}>{info}</Text>)}
</View>
)
@@ -88,9 +85,9 @@ export function InputForm({ label, value, placeholder, onChange, info, disable,
<View style={[Styles.mb10]}>
{
label != undefined && (
<Text style={[Styles.mb05, error && Styles.cError, { color: colors.text }]}>
<Text style={[Styles.mb05, error && { color: colors.error }, { color: colors.text }]}>
{label}
{required && (<Text style={Styles.cError}>*</Text>)}
{required && (<Text style={{ color: colors.error }}>*</Text>)}
</Text>
)
}
@@ -102,19 +99,16 @@ export function InputForm({ label, value, placeholder, onChange, info, disable,
style={[
Styles.inputRoundForm,
Platform.OS == 'ios' ? { paddingVertical: 11 } : { paddingVertical: 6 },
error && { borderColor: "red" },
error ? { borderColor: colors.error } : { borderColor: colors.icon + '20' },
round && Styles.round30,
{
backgroundColor: bg
? (bg === 'white' ? (colors.background === '#151718' ? '#2d2e2f' : 'white') : bg)
: 'transparent',
borderColor: colors.icon
backgroundColor: bg=="transparent" ? "transparent" : colors.input,
},
{ color: colors.text },
multiline && { height: 150, textAlignVertical: 'top' }
]}
onChangeText={onChange}
placeholderTextColor={colors.icon}
placeholderTextColor={colors.dimmed}
multiline={multiline}
numberOfLines={multiline ? 5 : undefined}
/>

4
components/inputSearch.tsx
View File

@@ -1,13 +1,15 @@
import { useTheme } from "@/providers/ThemeProvider";
import { Feather } from "@expo/vector-icons";
import { InputForm } from "./inputForm";
export default function InputSearch({ onChange, width, value }: { onChange?: (val: string) => void, width?: number, value?: string }) {
const { colors } = useTheme();
return (
<InputForm
type="default"
placeholder="Pencarian"
round
itemLeft={<Feather name="search" size={20} color="grey" />}
itemLeft={<Feather name="search" size={20} color={colors.dimmed} />}
onChange={onChange}
width={width}
bg="white"

2
components/labelStatus.tsx
View File

@@ -17,7 +17,7 @@ export default function LabelStatus({ category, text, size, style }: Props) {
success: colors.success,
warning: colors.warning,
error: colors.error,
secondary: colors.dimmed,
secondary: 'gray',
}[category] || 'gray'; // Removed ColorsStatus[category]?.backgroundColor as ColorsStatus is removed
return (

2
components/member/headerMemberList.tsx
View File

@@ -25,7 +25,7 @@ export default function HeaderMemberList() {
<DrawerBottom animation="slide" isVisible={isVisible} setVisible={() => setVisible(false)} title="Menu">
<View style={Styles.rowItemsCenter}>
<MenuItemRow
icon={<AntDesign name="pluscircle" color={colors.text} size={25} />}
icon={<AntDesign name="pluscircleo" color={colors.text} size={25} />}
title="Tambah Anggota"
onPress={() => {
setVisible(false)

15
components/modalFilter.tsx
View File

@@ -2,6 +2,7 @@ import Styles from "@/constants/Styles"
import { apiGetGroup, apiGetTahunProject, apiGetTahunTask } from "@/lib/api"
import { setEntityFilterGroup } from "@/lib/filterSlice"
import { useAuthSession } from "@/providers/AuthProvider"
import { useTheme } from "@/providers/ThemeProvider"
import { router } from "expo-router"
import { useEffect, useState } from "react"
import { ScrollView, TouchableOpacity, View } from "react-native"
@@ -40,6 +41,7 @@ export default function ModalFilter({ open, close, page, category, valueGroup, v
const [chooseYear, setChooseYear] = useState(valueYear || '')
const [dataTahun, setDataTahun] = useState<{ id: string, name: string }[]>([])
const [passingData, setPassingData] = useState(dataPassing)
const { colors } = useTheme()
async function handleLoad() {
const hasil = await decryptToken(String(token?.current))
@@ -80,9 +82,9 @@ export default function ModalFilter({ open, close, page, category, valueGroup, v
key={index}
style={[
Styles.chip,
chooseGroup == item.id && Styles.chipSelected,
{ borderColor: colors.dimmed },
chooseGroup == item.id && { backgroundColor: colors.primary },
]}
activeOpacity={0.8}
onPress={() => { setChooseGroup(item.id) }}
>
{/* {chooseGroup == item.id && (
@@ -94,6 +96,7 @@ export default function ModalFilter({ open, close, page, category, valueGroup, v
<Text
style={[
Styles.chipText,
{ color: colors.text },
chooseGroup == item.id && Styles.chipTextSelected,
]}
>
@@ -113,7 +116,8 @@ export default function ModalFilter({ open, close, page, category, valueGroup, v
key={index}
style={[
Styles.chip,
chooseGroup == item.id && Styles.chipSelected,
{ borderColor: colors.dimmed },
chooseGroup == item.id && { backgroundColor: colors.primary },
]}
activeOpacity={0.8}
onPress={() => { setChooseGroup(item.id) }}
@@ -127,6 +131,7 @@ export default function ModalFilter({ open, close, page, category, valueGroup, v
<Text
style={[
Styles.chipText,
{ color: colors.text },
chooseGroup == item.id && Styles.chipTextSelected,
]}
>
@@ -155,7 +160,8 @@ export default function ModalFilter({ open, close, page, category, valueGroup, v
key={index}
style={[
Styles.chip,
chooseYear == item.id && Styles.chipSelected,
{ borderColor: colors.dimmed },
chooseGroup == item.id && { backgroundColor: colors.primary },
]}
activeOpacity={0.8}
onPress={() => { setChooseYear(item.id) }}
@@ -163,6 +169,7 @@ export default function ModalFilter({ open, close, page, category, valueGroup, v
<Text
style={[
Styles.chipText,
{ color: colors.text },
chooseYear == item.id && Styles.chipTextSelected,
]}
>

2
components/position/headerRightPositionList.tsx
View File

@@ -23,7 +23,7 @@ export default function HeaderRightPositionList() {
<DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu">
<View style={Styles.rowItemsCenter}>
<MenuItemRow
icon={<AntDesign name="pluscircle" color={colors.text} size={25} />}
icon={<AntDesign name="pluscircleo" color={colors.text} size={25} />}
title="Tambah Jabatan"
onPress={() => {
setVisible(false)

3
components/position/modalFormCreatePosition.tsx
View File

@@ -97,6 +97,7 @@ export default function ModalFormCreatePosition({ onClose }: { onClose: () => vo
}}
error={error.idGroup}
errorText="Lembaga Desa harus diisi"
bg="transparent"
/>
}
<InputForm
@@ -106,7 +107,7 @@ export default function ModalFormCreatePosition({ onClose }: { onClose: () => vo
label="Jabatan"
onChange={(value) => { validationForm(value, 'name') }}
error={error.name}
bg={colors.card}
bg={"transparent"}
errorText="Nama jabatan harus diisi"
value={dataForm.name}
/>

4
components/project/headerProjectDetail.tsx
View File

@@ -119,7 +119,7 @@ export default function HeaderRightProjectDetail({ id, status }: Props) {
entityUser.role != "user" && entityUser.role != "coadmin" &&
<>
<MenuItemRow
icon={<MaterialIcons name="groups" color={colors.text} size={25} />}
icon={<MaterialCommunityIcons name="account-group-outline" color={colors.text} size={25} />}
title="Tambah Anggota"
onPress={() => {
if (status == 3) return
@@ -148,7 +148,7 @@ export default function HeaderRightProjectDetail({ id, status }: Props) {
status == 3
?
<MenuItemRow
icon={<Ionicons name="trash" color={colors.text} size={25} />}
icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
title="Hapus"
onPress={() => {
setVisible(false)

2
components/project/sectionFile.tsx
View File

@@ -179,7 +179,7 @@ export default function SectionFile({ status, member, refreshing }: { status: nu
!member && (entityUser.role == "user" || entityUser.role == "coadmin") ? <></>
:
<MenuItemRow
icon={<Ionicons name="trash" color={colors.text} size={25} />}
icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
title="Hapus"
disabled={status == 3}
onPress={() => {

2
components/project/sectionLink.tsx
View File

@@ -116,7 +116,7 @@ export default function SectionLink({ status, member, refreshing }: { status: nu
!member && (entityUser.role == "user" || entityUser.role == "coadmin") ? <></>
:
<MenuItemRow
icon={<Ionicons name="trash" color={colors.text} size={25} />}
icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
title="Hapus"
disabled={status == 3}
onPress={() => {

2
components/project/sectionListAddTask.tsx
View File

@@ -60,7 +60,7 @@ export default function SectionListAddTask() {
>
<View style={Styles.rowItemsCenter}>
<MenuItemRow
icon={<Ionicons name="trash" color={colors.text} size={25} />}
icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
title="Hapus Tugas"
onPress={() => { handleDelete() }}
/>

2
components/project/sectionTanggalTugas.tsx
View File

@@ -211,7 +211,7 @@ export default function SectionTanggalTugasProject({ status, member, refreshing
</View>
<View style={[Styles.rowItemsCenter, Styles.mt15]}>
<MenuItemRow
icon={<Ionicons name="trash" color={colors.text} size={25} />}
icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
title="Hapus Tugas"
onPress={() => {
setModal(false)

12
components/selectForm.tsx
View File

@@ -25,9 +25,9 @@ export default function SelectForm({ label, value, placeholder, onPress, info, e
<View style={[Styles.mb10]}>
{
label != undefined && (
<Text style={[Styles.mb05, { textTransform: "capitalize" }, error && Styles.cError]}>
<Text style={[Styles.mb05, { textTransform: "capitalize" }, error && { color: colors.error }]}>
{label}
{required && (<Text style={Styles.cError}>*</Text>)}
{required && (<Text style={{ color: colors.error }}>*</Text>)}
</Text>
)
}
@@ -35,22 +35,22 @@ export default function SelectForm({ label, value, placeholder, onPress, info, e
<View style={[
Styles.inputRoundForm,
Styles.inputRoundFormRight,
error && { borderColor: "red" },
error ? { borderColor: colors.error } : { borderColor: colors.icon + '20' },
round && Styles.round30,
Styles.pv10,
{ backgroundColor: bg ? bg : 'transparent', borderColor: colors.icon }
{ backgroundColor: bg == 'transparent' ? 'transparent' : colors.input }
]}>
<Feather name="chevron-right" size={20} color={colors.icon} />
{
value ? (
<Text numberOfLines={1} ellipsizeMode='tail' style={[Styles.w90]}>{value}</Text>
) : (
<Text numberOfLines={1} ellipsizeMode='tail' style={[{ color: colors.icon }, Styles.w90]}>{placeholder}</Text>
<Text numberOfLines={1} ellipsizeMode='tail' style={[{ color: colors.dimmed }, Styles.w90]}>{placeholder}</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>)
}
{info != undefined && (<Text style={[Styles.textInformation, Styles.mt05, { color: colors.icon }]}>{info}</Text>)}
</View >

4
components/task/headerTaskDetail.tsx
View File

@@ -124,7 +124,7 @@ export default function HeaderRightTaskDetail({ id, division, status, isAdminDiv
&&
<>
<MenuItemRow
icon={<MaterialIcons name="groups" color={colors.text} size={25} />}
icon={<MaterialCommunityIcons name="account-group-outline" color={colors.text} size={25} />}
title="Tambah Anggota"
onPress={() => {
if (status == 3) return
@@ -154,7 +154,7 @@ export default function HeaderRightTaskDetail({ id, division, status, isAdminDiv
status == 3
?
<MenuItemRow
icon={<Ionicons name="trash" color={colors.text} size={25} />}
icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
title="Hapus"
onPress={() => {
setVisible(false)

2
components/task/sectionFileTask.tsx
View File

@@ -170,7 +170,7 @@ export default function SectionFileTask({ refreshing, isMemberDivision }: { refr
(entityUser.role != "user" && entityUser.role != "coadmin") || isMemberDivision
?
<MenuItemRow
icon={<Ionicons name="trash" color={colors.text} size={25} />}
icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
title="Hapus"
onPress={() => {
setModal(false)

2
components/task/sectionLinkTask.tsx
View File

@@ -108,7 +108,7 @@ export default function SectionLinkTask({ refreshing, isMemberDivision }: { refr
(entityUser.role != "user" && entityUser.role != "coadmin") || isMemberDivision
?
<MenuItemRow
icon={<Ionicons name="trash" color={colors.text} size={25} />}
icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
title="Hapus"
onPress={() => {
setModal(false)

2
components/task/sectionTanggalTugasTask.tsx
View File

@@ -207,7 +207,7 @@ export default function SectionTanggalTugasTask({ refreshing, isMemberDivision }
?
<View style={[Styles.rowItemsCenter, Styles.mt15]}>
<MenuItemRow
icon={<Ionicons name="trash" color={colors.text} size={25} />}
icon={<Ionicons name="trash-outline" color={colors.text} size={25} />}
title="Hapus Tugas"
onPress={() => {
setModal(false)

4
components/toastCustom.tsx
View File

@@ -1,13 +1,15 @@
import Styles from "@/constants/Styles";
import { useTheme } from "@/providers/ThemeProvider";
import { View } from "react-native";
import Toast from "react-native-toast-message";
import Text from "./Text";
export default function ToastCustom({ position }: { position?: 'top' | 'bottom' }) {
const { colors } = useTheme()
return (
<Toast autoHide onPress={() => Toast.hide()} visibilityTime={1500} position={position || 'bottom'} config={{
small: ({ text1 }) => (
<View style={[Styles.toastContainer]}>
<View style={[Styles.toastContainer, { backgroundColor: colors.card, borderColor: colors.icon + '20' }]}>
<Text style={{ fontSize: 12 }}>{text1}</Text>
</View>
)

6
constants/Colors.ts
View File

@@ -13,10 +13,12 @@ export const Colors = {
tabActive: '#2563EB',
header: '#234881',
homeGradient: '#346CC4',
dimmed: '#6B7280',
dimmed: '#707887ff',
success: '#40C057',
warning: '#FBBF24',
error: '#F87171',
input:'#FFFFFF',
modalBackground: '#ffffff',
},
dark: {
text: '#ECEDEE',
@@ -33,5 +35,7 @@ export const Colors = {
success: '#1F6F43',
warning: '#D97706',
error: '#DC2626',
input:'#14243dff',
modalBackground: '#1a1a1aff',
},
};

10
constants/Styles.ts
View File

@@ -319,7 +319,7 @@ const Styles = StyleSheet.create({
marginHorizontal: 10
},
inputRoundForm: {
borderRadius: 10,
borderRadius: 5,
borderColor: '#d6d8f6',
borderWidth: 1,
paddingVertical: 10,
@@ -460,7 +460,7 @@ const Styles = StyleSheet.create({
borderColor: '#d6d8f6',
borderWidth: 1,
borderRadius: 10,
marginBottom: 10
marginBottom: 5
},
wrapItemBorderNone: {
padding: 10,
@@ -489,6 +489,7 @@ const Styles = StyleSheet.create({
iconContent: {
padding: 10,
borderRadius: 100,
backgroundColor:'#E5E7EB'
},
wrapHeadViewMember: {
backgroundColor: '#19345E',
@@ -670,7 +671,7 @@ const Styles = StyleSheet.create({
paddingVertical: 5,
paddingHorizontal: 15,
borderRadius: 5,
backgroundColor: "#F3F4F6",
// backgroundColor: "#F3F4F6",
borderWidth: 1,
borderColor: "transparent",
marginRight: 10,
@@ -679,13 +680,14 @@ const Styles = StyleSheet.create({
chipSelected: {
backgroundColor: "#f2f6ffff",
borderColor: "#384288",
borderWidth: 1,
},
chipText: {
fontSize: 16,
color: "#222",
},
chipTextSelected: {
color: "#384288",
color: "white",
},
checkIcon: {
position: "absolute",