fix: ganti warna desc diskusi dan pindahkan inline styles ke styles.ts
- Ganti warna teks deskripsi dari dimmed ke text pada list diskusi umum dan divisi - Tambah class discussionHeaderPadding, discussionListPadding, discussionTitleCol, discussionDescMargin, discussionEmptyText ke component.styles.ts - Ganti semua inline style dengan themed object (warna dinamis) dan Styles.* (statis)
This commit is contained in:
@@ -98,11 +98,23 @@ export default function DiscussionDivision() {
|
||||
|
||||
const isOpen = (item: Props) => item.status === 1
|
||||
|
||||
const themed = {
|
||||
background: { backgroundColor: colors.background },
|
||||
card: { backgroundColor: colors.card, borderColor: colors.icon + '20' },
|
||||
cardPressed: { backgroundColor: colors.icon + '10' },
|
||||
title: { color: colors.text },
|
||||
dimmed: { color: colors.dimmed },
|
||||
statusOpen: { borderColor: '#10B981' as const },
|
||||
statusClosed: { borderColor: colors.dimmed + '80' },
|
||||
statusTextOpen: { color: '#10B981' as const },
|
||||
statusTextClosed: { color: colors.dimmed },
|
||||
}
|
||||
|
||||
return (
|
||||
<View style={[Styles.flex1, { backgroundColor: colors.background }]}>
|
||||
<View style={[Styles.flex1, themed.background]}>
|
||||
<GuideOverlay visible={guideVisible} steps={GUIDE_DIVISION_DISCUSSION} onDismiss={dismissGuide} />
|
||||
{((entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision) && (
|
||||
<View style={[Styles.ph15, { paddingTop: 12 }]}>
|
||||
<View style={[Styles.ph15, Styles.discussionHeaderPadding]}>
|
||||
<WrapTab>
|
||||
<ButtonTab
|
||||
active={status == "false" ? "false" : "true"}
|
||||
@@ -125,13 +137,13 @@ export default function DiscussionDivision() {
|
||||
</View>
|
||||
)}
|
||||
|
||||
<View style={[Styles.flex1, Styles.ph15, { paddingTop: 8 }]}>
|
||||
<View style={[Styles.flex1, Styles.ph15, Styles.discussionListPadding]}>
|
||||
{loading ? (
|
||||
arrSkeleton.map((_, i) => <SkeletonContent key={i} />)
|
||||
) : data.length === 0 ? (
|
||||
<View style={[Styles.contentItemCenter, Styles.mt30]}>
|
||||
<Feather name="message-circle" size={42} color={colors.icon + '40'} />
|
||||
<Text style={[Styles.mt10, { color: colors.dimmed, fontSize: 14 }]}>
|
||||
<Text style={[Styles.mt10, Styles.discussionEmptyText, themed.dimmed]}>
|
||||
Tidak ada diskusi
|
||||
</Text>
|
||||
</View>
|
||||
@@ -151,18 +163,19 @@ export default function DiscussionDivision() {
|
||||
onPress={() => router.push(`./discussion/${item.id}`)}
|
||||
style={({ pressed }) => [
|
||||
Styles.discussionCard,
|
||||
{ backgroundColor: pressed ? colors.icon + '10' : colors.card, borderColor: colors.icon + '20' }
|
||||
themed.card,
|
||||
pressed && themed.cardPressed,
|
||||
]}
|
||||
>
|
||||
<View style={[Styles.rowItemsCenter, Styles.mb08]}>
|
||||
<ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="xs" />
|
||||
<View style={[Styles.flex1, { marginLeft: 10 }]}>
|
||||
<Text style={[Styles.textDefaultSemiBold, { color: colors.text }]} numberOfLines={1}>
|
||||
<View style={[Styles.flex1, Styles.discussionTitleCol]}>
|
||||
<Text style={[Styles.textDefaultSemiBold, themed.title]} numberOfLines={1}>
|
||||
{item.user_name}
|
||||
</Text>
|
||||
{status === "true" && (
|
||||
<View style={[Styles.discussionStatusPill, { borderColor: isOpen(item) ? '#10B981' : colors.dimmed + '80' }]}>
|
||||
<Text style={[Styles.discussionStatusText, { color: isOpen(item) ? '#10B981' : colors.dimmed }]}>
|
||||
<View style={[Styles.discussionStatusPill, isOpen(item) ? themed.statusOpen : themed.statusClosed]}>
|
||||
<Text style={[Styles.discussionStatusText, isOpen(item) ? themed.statusTextOpen : themed.statusTextClosed]}>
|
||||
{isOpen(item) ? 'Buka' : 'Tutup'}
|
||||
</Text>
|
||||
</View>
|
||||
@@ -171,7 +184,7 @@ export default function DiscussionDivision() {
|
||||
</View>
|
||||
|
||||
{item.desc ? (
|
||||
<Text style={[Styles.textMediumNormal, Styles.discussionCardIndent, { color: colors.dimmed, marginBottom: 10 }]} numberOfLines={2}>
|
||||
<Text style={[Styles.textMediumNormal, Styles.discussionCardIndent, Styles.discussionDescMargin, themed.title]} numberOfLines={2}>
|
||||
{item.desc}
|
||||
</Text>
|
||||
) : null}
|
||||
@@ -179,11 +192,11 @@ export default function DiscussionDivision() {
|
||||
<View style={[Styles.rowItemsCenter, Styles.rowSpaceBetween, Styles.discussionCardIndent]}>
|
||||
<View style={Styles.rowItemsCenter}>
|
||||
<Feather name="message-square" size={14} color={colors.dimmed} />
|
||||
<Text style={[Styles.discussionCommentText, { color: colors.dimmed }]}>
|
||||
<Text style={[Styles.discussionCommentText, themed.dimmed]}>
|
||||
{item.total_komentar} Komentar
|
||||
</Text>
|
||||
</View>
|
||||
<Text style={[Styles.discussionDateText, { color: colors.dimmed }]}>
|
||||
<Text style={[Styles.discussionDateText, themed.dimmed]}>
|
||||
{item.createdAt}
|
||||
</Text>
|
||||
</View>
|
||||
|
||||
Reference in New Issue
Block a user