Skip to content

Commit b8cf38a

Browse files
committed
[Chore/#143] ktlint 적용
1 parent e4a931d commit b8cf38a

File tree

4 files changed

+17
-24
lines changed

4 files changed

+17
-24
lines changed

app/src/main/java/com/poti/android/presentation/party/component/MemberSelectBottomSheet.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ fun <T> MemberSelectBottomSheet(
8080
) {
8181
items(
8282
items = allMembers,
83-
key = { memberToId(it) }
83+
key = { memberToId(it) },
8484
) { member ->
8585
val isSelected = memberToId(member) in selectedMemberIds
8686

app/src/main/java/com/poti/android/presentation/party/create/PartyCreateScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ fun PartyCreateRoute(
109109
memberToId = { it.memberId },
110110
mainEnabled = uiState.isMemberBottomSheetTouched,
111111
subEnabled = true,
112-
autoCloseSubBtn = false
112+
autoCloseSubBtn = false,
113113
)
114114
}
115115

app/src/main/java/com/poti/android/presentation/party/create/PartyCreateViewModel.kt

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@ import com.poti.android.domain.usecase.party.GetDeliveryOptionsUseCase
1515
import com.poti.android.domain.usecase.party.SearchArtistUseCase
1616
import com.poti.android.domain.usecase.party.SearchProductUseCase
1717
import com.poti.android.presentation.party.create.model.CreateUiEffect
18+
import com.poti.android.presentation.party.create.model.CreateUiEffect.*
1819
import com.poti.android.presentation.party.create.model.CreateUiIntent
20+
import com.poti.android.presentation.party.create.model.CreateUiIntent.*
1921
import com.poti.android.presentation.party.create.model.CreateUiState
2022
import com.poti.android.presentation.party.create.model.FieldError
2123
import com.poti.android.presentation.party.create.model.MemberSettingStatus
2224
import com.poti.android.presentation.party.create.util.isTodayOrAfter
2325
import com.poti.android.presentation.party.create.util.toDashedDate
2426
import com.poti.android.presentation.party.create.util.toDateOrNull
2527
import dagger.hilt.android.lifecycle.HiltViewModel
28+
import kotlinx.collections.immutable.persistentListOf
2629
import kotlinx.collections.immutable.toPersistentList
2730
import kotlinx.coroutines.FlowPreview
28-
import kotlinx.coroutines.launch
29-
import javax.inject.Inject
30-
import com.poti.android.presentation.party.create.model.CreateUiIntent.*
31-
import com.poti.android.presentation.party.create.model.CreateUiEffect.*
32-
import kotlinx.collections.immutable.persistentListOf
3331
import kotlinx.coroutines.flow.collectLatest
3432
import kotlinx.coroutines.flow.debounce
3533
import kotlinx.coroutines.flow.distinctUntilChanged
3634
import kotlinx.coroutines.flow.map
35+
import kotlinx.coroutines.launch
36+
import javax.inject.Inject
3737
import kotlin.text.filter
3838

3939
const val IMAGE_TYPE = "POST"
@@ -48,8 +48,8 @@ class PartyCreateViewModel @Inject constructor(
4848
private val searchProductUseCase: SearchProductUseCase,
4949
private val createPartyUseCase: CreatePartyUseCase,
5050
) : BaseViewModel<CreateUiState, CreateUiIntent, CreateUiEffect>(
51-
initialState = CreateUiState(),
52-
) {
51+
initialState = CreateUiState(),
52+
) {
5353
override fun processIntent(intent: CreateUiIntent) {
5454
when (intent) {
5555
is InitializeScreen -> if (!uiState.value.isInitialized) {
@@ -271,7 +271,7 @@ class PartyCreateViewModel @Inject constructor(
271271
rawMembers = members,
272272
selectedMembers = members,
273273
memberSettingStatus = MemberSettingStatus.EDITABLE,
274-
memberError = null
274+
memberError = null,
275275
)
276276
}
277277
}
@@ -384,8 +384,11 @@ class PartyCreateViewModel @Inject constructor(
384384

385385
private fun handleMemberPriceChange(newMember: MemberPriceOption) {
386386
val newMembers = uiState.value.selectedMembers.map { member ->
387-
if (member.memberId == newMember.memberId) newMember
388-
else member
387+
if (member.memberId == newMember.memberId) {
388+
newMember
389+
} else {
390+
member
391+
}
389392
}.toPersistentList()
390393

391394
updateState {

app/src/main/java/com/poti/android/presentation/party/create/model/Contracts.kt

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,35 +34,28 @@ enum class FieldError(
3434
ACCOUNT_NUMBER_ERROR(R.string.create_error_need_account_number),
3535
BANK_ERROR(R.string.create_error_need_bank),
3636
MEMBER_EMPTY_ERROR(R.string.create_error_need_member),
37-
MEMBER_PRICE_ERROR(R.string.create_error_need_price)
37+
MEMBER_PRICE_ERROR(R.string.create_error_need_price),
3838
}
3939

4040
data class CreateUiState(
4141
val imageUris: List<Uri> = emptyList(),
4242
val imageError: FieldError? = null,
43-
4443
val selectedArtist: ArtistSearchResult? = null,
4544
val artistQuery: String = "",
4645
val artistSearchState: ApiState<List<ArtistSearchResult>> = ApiState.Init,
4746
val artistError: FieldError? = null,
48-
4947
val selectedProduct: String = "",
5048
val productName: String = "",
5149
val productSearchState: ApiState<List<String>> = ApiState.Init,
5250
val productError: FieldError? = null,
53-
5451
val deadline: String = "",
5552
val deadlineError: FieldError? = null,
56-
5753
val description: String = "",
5854
val descriptionError: FieldError? = null,
59-
6055
val accountNumber: String = "",
6156
val accountNumberError: FieldError? = null,
62-
6357
val bank: String = "",
6458
val bankError: FieldError? = null,
65-
6659
val membersState: ApiState<List<MemberPriceOption>> = ApiState.Init,
6760
val rawMembers: ImmutableList<MemberPriceOption> = persistentListOf(),
6861
val selectedMembers: ImmutableList<MemberPriceOption> = persistentListOf(),
@@ -72,13 +65,10 @@ data class CreateUiState(
7265
val showMemberBottomSheet: Boolean = false,
7366
val isMemberBottomSheetTouched: Boolean = false,
7467
val memberError: FieldError? = null,
75-
7668
val deliveriesState: ApiState<List<DeliveryOption>> = ApiState.Init,
7769
val rawDeliveries: ImmutableList<DeliveryOption> = persistentListOf(),
7870
val selectedDeliveries: ImmutableList<DeliveryOption> = persistentListOf(),
79-
8071
val createPartyState: ApiState<Long> = ApiState.Init,
81-
8272
val isInitialized: Boolean = false,
8373
val isArtistAutoFilled: Boolean = false,
8474
val isFieldTouched: Boolean = false,
@@ -101,7 +91,7 @@ sealed interface CreateUiIntent : UiIntent {
10191

10292
data object OnBackConfirm : CreateUiIntent
10393

104-
data object OnBackToCreate: CreateUiIntent
94+
data object OnBackToCreate : CreateUiIntent
10595

10696
data class OnImagesChanged(val uris: List<Uri>) : CreateUiIntent
10797

0 commit comments

Comments
 (0)