join #19

Merged
amaliadwiy merged 222 commits from join into v1 2026-02-09 11:18:03 +08:00
81 changed files with 988 additions and 429 deletions
Showing only changes of commit edbeb30ebe - Show all commits

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" />

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

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={

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) }}

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" />

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 &&