Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Created by https://www.toptal.com/developers/gitignore/api/android,androidstudio,macos,windows,linux,kotlin
# Edit at https://www.toptal.com/developers/gitignore?templates=android,androidstudio,macos,windows,linux,kotlin

GEMINI.md

### Android ###
# Gradle files
.gradle/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ import com.poti.android.domain.type.ParticipantStatusType

data class ParticipantDetail(
val participationId: Long,
val partyId: Long,
val orderNumber: String,
val partySummary: PartySummary,
val memberPayments: List<MemberPayment>,
val paymentInfo: PaymentInfo,
val shippingInfo: ShippingInfo,
val shippingInfo: ParticipantShippingInfo,
)

data class MemberPayment(
Expand All @@ -19,7 +21,18 @@ data class PaymentInfo(
val shippingFee: Int,
val totalAmount: Int,
val depositStatus: ParticipantStatusType,
val bank: String,
val accountNumber: String,
val depositDeadline: String,
val bank: String?,
val accountNumber: String?,
val depositDeadline: String?,
)

data class ParticipantShippingInfo(
val shippingMethod: String,
val receiver: String,
val zipcode: String,
val address: String,
val phone: String,
val carrier: String?,
val trackingNumber: String?,
val shippingStatus: ParticipantStatusType,
)

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.poti.android.presentation.history.recruiter.component
package com.poti.android.presentation.history.component

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
Expand All @@ -11,7 +11,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.poti.android.R
Expand All @@ -20,68 +19,48 @@ import com.poti.android.core.common.util.screenWidthDp
import com.poti.android.core.designsystem.theme.PotiTheme

@Composable
fun ParticipantManagementHeader(
participantCount: Int,
onHeaderClick: () -> Unit,
fun HistoryDetailContentHeader(
text: String,
modifier: Modifier = Modifier,
onHeaderClick: (() -> Unit)? = null,
) {
Row(
modifier = modifier
.fillMaxWidth()
.padding(
start = screenWidthDp(16.dp),
end = screenWidthDp(4.dp),
)
.padding(vertical = 8.dp),
),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween,
) {
Text(
text = stringResource(id = R.string.history_recruiter_participant_management_title, participantCount),
text = text,
style = PotiTheme.typography.body16sb,
color = PotiTheme.colors.black,
modifier = Modifier.padding(vertical = 20.dp),
)

Icon(
painter = painterResource(id = R.drawable.ic_arrow_right_lg),
contentDescription = null,
tint = PotiTheme.colors.gray700,
modifier = Modifier
.padding(10.dp)
.size(24.dp)
.noRippleClickable(onHeaderClick),
)
onHeaderClick?.let {
Icon(
painter = painterResource(id = R.drawable.ic_arrow_right_lg),
contentDescription = null,
tint = PotiTheme.colors.gray700,
modifier = Modifier
.padding(10.dp)
.size(24.dp)
.noRippleClickable(onHeaderClick),
)
}
}
}

@Preview(showBackground = true, name = "Participants 0")
@Composable
private fun ParticipantManagementHeaderEmptyPreview() {
PotiTheme {
ParticipantManagementHeader(
participantCount = 0,
onHeaderClick = {},
)
}
}

@Preview(showBackground = true, name = "Participants 5")
@Composable
private fun ParticipantManagementHeaderMultiPreview() {
PotiTheme {
ParticipantManagementHeader(
participantCount = 5,
onHeaderClick = {},
)
}
}

@Preview(showBackground = true, name = "Participants 99+")
@Composable
private fun ParticipantManagementHeaderManyPreview() {
PotiTheme {
ParticipantManagementHeader(
participantCount = 100,
HistoryDetailContentHeader(
text = "입금 정보",
onHeaderClick = {},
)
}
Expand Down

This file was deleted.

Loading