diff --git a/core/designsystem/src/main/java/com/susu/core/designsystem/component/bottomsheet/datepicker/SusuDatePickerBottomSheet.kt b/core/designsystem/src/main/java/com/susu/core/designsystem/component/bottomsheet/datepicker/SusuDatePickerBottomSheet.kt index f2e70b6e..5d9293bd 100644 --- a/core/designsystem/src/main/java/com/susu/core/designsystem/component/bottomsheet/datepicker/SusuDatePickerBottomSheet.kt +++ b/core/designsystem/src/main/java/com/susu/core/designsystem/component/bottomsheet/datepicker/SusuDatePickerBottomSheet.kt @@ -1,6 +1,5 @@ package com.susu.core.designsystem.component.bottomsheet.datepicker -import android.util.Log import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxHeight diff --git a/core/designsystem/src/main/java/com/susu/core/designsystem/component/textfieldbutton/SusuTextFieldButton.kt b/core/designsystem/src/main/java/com/susu/core/designsystem/component/textfieldbutton/SusuTextFieldButton.kt index c5da7526..6188e66d 100644 --- a/core/designsystem/src/main/java/com/susu/core/designsystem/component/textfieldbutton/SusuTextFieldButton.kt +++ b/core/designsystem/src/main/java/com/susu/core/designsystem/component/textfieldbutton/SusuTextFieldButton.kt @@ -203,7 +203,7 @@ fun SusuTextFieldWrapContentButton( modifier = modifier .clip(shape) .background(backgroundColor) - .susuClickable (onClick = onClickButton) + .susuClickable(onClick = onClickButton) .padding(paddingValues), horizontalArrangement = Arrangement.spacedBy(iconSpacing), verticalAlignment = Alignment.CenterVertically, diff --git a/core/ui/src/main/java/com/susu/core/ui/extension/LazyGridState.kt b/core/ui/src/main/java/com/susu/core/ui/extension/LazyGridState.kt index fe21cb9b..0250605b 100644 --- a/core/ui/src/main/java/com/susu/core/ui/extension/LazyGridState.kt +++ b/core/ui/src/main/java/com/susu/core/ui/extension/LazyGridState.kt @@ -1,6 +1,5 @@ package com.susu.core.ui.extension -import android.util.Log import androidx.compose.foundation.lazy.grid.LazyGridState import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -8,7 +7,6 @@ import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.snapshotFlow import kotlinx.coroutines.flow.collectLatest -import kotlinx.coroutines.flow.distinctUntilChanged // https://manavtamboli.medium.com/infinite-list-paged-list-in-jetpack-compose-b10fc7e74768 @Composable diff --git a/data/src/main/java/com/susu/data/data/repository/LedgerRepositoryImpl.kt b/data/src/main/java/com/susu/data/data/repository/LedgerRepositoryImpl.kt index f8aea33c..92aeae34 100644 --- a/data/src/main/java/com/susu/data/data/repository/LedgerRepositoryImpl.kt +++ b/data/src/main/java/com/susu/data/data/repository/LedgerRepositoryImpl.kt @@ -28,13 +28,12 @@ class LedgerRepositoryImpl @Inject constructor( sort = sort, ).getOrThrow().toModel() - override suspend fun editLedger(ledger: Ledger): Ledger = ledgerService.editLedger( id = ledger.id, ledgerRequest = ledger.toData(), ).getOrThrow().toModel() override suspend fun deleteLedger(id: Int) = ledgerService.deleteLedgerList( - listOf(id) + listOf(id), ).getOrThrow() } diff --git a/data/src/main/java/com/susu/data/remote/api/CategoryService.kt b/data/src/main/java/com/susu/data/remote/api/CategoryService.kt index 912dd3b2..88a8a938 100644 --- a/data/src/main/java/com/susu/data/remote/api/CategoryService.kt +++ b/data/src/main/java/com/susu/data/remote/api/CategoryService.kt @@ -1,7 +1,6 @@ package com.susu.data.remote.api import com.susu.data.remote.model.response.CategoryConfigResponse -import com.susu.data.remote.model.response.CategoryInfo import com.susu.data.remote.retrofit.ApiResult import retrofit2.http.GET diff --git a/data/src/main/java/com/susu/data/remote/api/LedgerService.kt b/data/src/main/java/com/susu/data/remote/api/LedgerService.kt index a4d78f07..ae30275d 100644 --- a/data/src/main/java/com/susu/data/remote/api/LedgerService.kt +++ b/data/src/main/java/com/susu/data/remote/api/LedgerService.kt @@ -1,7 +1,6 @@ package com.susu.data.remote.api import com.susu.data.remote.model.request.LedgerRequest -import com.susu.data.remote.model.response.LedgerInfo import com.susu.data.remote.model.response.LedgerListResponse import com.susu.data.remote.model.response.LedgerResponse import com.susu.data.remote.retrofit.ApiResult diff --git a/data/src/main/java/com/susu/data/remote/model/response/LedgerListResponse.kt b/data/src/main/java/com/susu/data/remote/model/response/LedgerListResponse.kt index 5142a7b4..8f5729f2 100644 --- a/data/src/main/java/com/susu/data/remote/model/response/LedgerListResponse.kt +++ b/data/src/main/java/com/susu/data/remote/model/response/LedgerListResponse.kt @@ -1,8 +1,5 @@ package com.susu.data.remote.model.response -import com.susu.core.model.Category -import com.susu.core.model.Ledger -import kotlinx.datetime.LocalDateTime import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @@ -17,7 +14,6 @@ data class LedgerListResponse( val sort: SortInfo, ) - @Serializable data class SortInfo( val empty: Boolean, diff --git a/data/src/main/java/com/susu/data/remote/model/response/LedgerResponse.kt b/data/src/main/java/com/susu/data/remote/model/response/LedgerResponse.kt index 50ead87a..cf7d0450 100644 --- a/data/src/main/java/com/susu/data/remote/model/response/LedgerResponse.kt +++ b/data/src/main/java/com/susu/data/remote/model/response/LedgerResponse.kt @@ -43,7 +43,6 @@ internal fun LedgerResponse.toModel() = Ledger( totalCounts = totalCounts, ) - internal fun CategoryInfo.toModel() = Category( id = id, seq = seq, diff --git a/domain/src/main/java/com/susu/domain/repository/LedgerRepository.kt b/domain/src/main/java/com/susu/domain/repository/LedgerRepository.kt index 3761912b..d98b0d7c 100644 --- a/domain/src/main/java/com/susu/domain/repository/LedgerRepository.kt +++ b/domain/src/main/java/com/susu/domain/repository/LedgerRepository.kt @@ -18,6 +18,6 @@ interface LedgerRepository { ): Ledger suspend fun deleteLedger( - id: Int + id: Int, ) } diff --git a/domain/src/main/java/com/susu/domain/usecase/categoryconfig/GetCategoryConfigUseCase.kt b/domain/src/main/java/com/susu/domain/usecase/categoryconfig/GetCategoryConfigUseCase.kt index a9923e7a..f28af560 100644 --- a/domain/src/main/java/com/susu/domain/usecase/categoryconfig/GetCategoryConfigUseCase.kt +++ b/domain/src/main/java/com/susu/domain/usecase/categoryconfig/GetCategoryConfigUseCase.kt @@ -2,8 +2,6 @@ package com.susu.domain.usecase.categoryconfig import com.susu.core.common.runCatchingIgnoreCancelled import com.susu.domain.repository.CategoryConfigRepository -import com.susu.domain.repository.LedgerRepository -import java.time.LocalDateTime import javax.inject.Inject class GetCategoryConfigUseCase @Inject constructor( diff --git a/domain/src/main/java/com/susu/domain/usecase/ledger/DeleteLedgerUseCase.kt b/domain/src/main/java/com/susu/domain/usecase/ledger/DeleteLedgerUseCase.kt index 77b0443c..43d143ef 100644 --- a/domain/src/main/java/com/susu/domain/usecase/ledger/DeleteLedgerUseCase.kt +++ b/domain/src/main/java/com/susu/domain/usecase/ledger/DeleteLedgerUseCase.kt @@ -1,9 +1,7 @@ package com.susu.domain.usecase.ledger import com.susu.core.common.runCatchingIgnoreCancelled -import com.susu.core.model.Ledger import com.susu.domain.repository.LedgerRepository -import java.time.LocalDateTime import javax.inject.Inject class DeleteLedgerUseCase @Inject constructor( diff --git a/domain/src/main/java/com/susu/domain/usecase/ledger/EditLedgerUseCase.kt b/domain/src/main/java/com/susu/domain/usecase/ledger/EditLedgerUseCase.kt index ae37f54f..550c38d1 100644 --- a/domain/src/main/java/com/susu/domain/usecase/ledger/EditLedgerUseCase.kt +++ b/domain/src/main/java/com/susu/domain/usecase/ledger/EditLedgerUseCase.kt @@ -3,7 +3,6 @@ package com.susu.domain.usecase.ledger import com.susu.core.common.runCatchingIgnoreCancelled import com.susu.core.model.Ledger import com.susu.domain.repository.LedgerRepository -import java.time.LocalDateTime import javax.inject.Inject class EditLedgerUseCase @Inject constructor( diff --git a/feature/navigator/src/main/java/com/susu/feature/navigator/MainNavigator.kt b/feature/navigator/src/main/java/com/susu/feature/navigator/MainNavigator.kt index df47c24d..396ad16c 100644 --- a/feature/navigator/src/main/java/com/susu/feature/navigator/MainNavigator.kt +++ b/feature/navigator/src/main/java/com/susu/feature/navigator/MainNavigator.kt @@ -4,7 +4,6 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.graphics.Color import androidx.navigation.NavDestination -import androidx.navigation.NavGraph.Companion.findStartDestination import androidx.navigation.NavHostController import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.compose.rememberNavController diff --git a/feature/navigator/src/main/java/com/susu/feature/navigator/MainScreen.kt b/feature/navigator/src/main/java/com/susu/feature/navigator/MainScreen.kt index 0abbcb2b..3b66e1fc 100644 --- a/feature/navigator/src/main/java/com/susu/feature/navigator/MainScreen.kt +++ b/feature/navigator/src/main/java/com/susu/feature/navigator/MainScreen.kt @@ -50,7 +50,7 @@ internal fun MainScreen( message = "네트워크 오류가 발생했어요", onClickActionButton = sideEffect.retry, actionIcon = R.drawable.ic_refresh, - actionIconContentDescription = "새로고침 아이콘" + actionIconContentDescription = "새로고침 아이콘", ), ) } diff --git a/feature/navigator/src/main/java/com/susu/feature/navigator/MainViewModel.kt b/feature/navigator/src/main/java/com/susu/feature/navigator/MainViewModel.kt index 839a317a..3df958b8 100644 --- a/feature/navigator/src/main/java/com/susu/feature/navigator/MainViewModel.kt +++ b/feature/navigator/src/main/java/com/susu/feature/navigator/MainViewModel.kt @@ -46,7 +46,7 @@ class MainViewModel @Inject constructor( intent { copy(dialogVisible = false) } } - fun handleException(throwable: Throwable, retry: () -> Unit) = when(throwable) { + fun handleException(throwable: Throwable, retry: () -> Unit) = when (throwable) { is NetworkException -> postSideEffect(MainSideEffect.ShowNetworkErrorSnackbar(retry)) is UnknownHostException -> postSideEffect(MainSideEffect.ShowNetworkErrorSnackbar(retry)) else -> throwUnknownException(throwable) @@ -54,7 +54,7 @@ class MainViewModel @Inject constructor( fun initCategoryConfig() = viewModelScope.launch { getCategoryConfigUseCase() - .onFailure { } + .onFailure { } intent { copy(isInitializing = false) } } diff --git a/feature/received/src/main/java/com/susu/feature/received/ledgerdetail/LedgerDetailViewModel.kt b/feature/received/src/main/java/com/susu/feature/received/ledgerdetail/LedgerDetailViewModel.kt index 90b11925..e6f2ab24 100644 --- a/feature/received/src/main/java/com/susu/feature/received/ledgerdetail/LedgerDetailViewModel.kt +++ b/feature/received/src/main/java/com/susu/feature/received/ledgerdetail/LedgerDetailViewModel.kt @@ -14,7 +14,6 @@ import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch import kotlinx.datetime.toJavaLocalDateTime import kotlinx.serialization.json.Json -import timber.log.Timber import javax.inject.Inject @HiltViewModel @@ -75,7 +74,7 @@ class LedgerDetailViewModel @Inject constructor( ) } .onFailure { throwable -> - when(throwable) { + when (throwable) { is NotFoundLedgerException -> postSideEffect(LedgerDetailSideEffect.ShowSnackbar(throwable.message)) else -> postSideEffect(LedgerDetailSideEffect.HandleException(throwable, ::deleteLedger)) } diff --git a/feature/received/src/main/java/com/susu/feature/received/ledgeredit/LedgerEditContract.kt b/feature/received/src/main/java/com/susu/feature/received/ledgeredit/LedgerEditContract.kt index 3958650a..5e5cf597 100644 --- a/feature/received/src/main/java/com/susu/feature/received/ledgeredit/LedgerEditContract.kt +++ b/feature/received/src/main/java/com/susu/feature/received/ledgeredit/LedgerEditContract.kt @@ -1,7 +1,6 @@ package com.susu.feature.received.ledgeredit import com.susu.core.model.Category -import com.susu.core.model.Ledger import com.susu.core.ui.base.SideEffect import com.susu.core.ui.base.UiState import kotlinx.collections.immutable.PersistentList diff --git a/feature/received/src/main/java/com/susu/feature/received/ledgeredit/LedgerEditScreen.kt b/feature/received/src/main/java/com/susu/feature/received/ledgeredit/LedgerEditScreen.kt index 86d2bc12..fca24d9a 100644 --- a/feature/received/src/main/java/com/susu/feature/received/ledgeredit/LedgerEditScreen.kt +++ b/feature/received/src/main/java/com/susu/feature/received/ledgeredit/LedgerEditScreen.kt @@ -28,7 +28,6 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.susu.core.designsystem.component.appbar.SusuDefaultAppBar import com.susu.core.designsystem.component.appbar.icon.BackIcon -import com.susu.core.designsystem.component.bottomsheet.datepicker.SusuDatePickerBottomSheet import com.susu.core.designsystem.component.bottomsheet.datepicker.SusuLimitDatePickerBottomSheet import com.susu.core.designsystem.component.button.AddConditionButton import com.susu.core.designsystem.component.button.FilledButtonColor @@ -41,7 +40,6 @@ import com.susu.core.designsystem.component.textfieldbutton.TextFieldButtonColor import com.susu.core.designsystem.component.textfieldbutton.style.SmallTextFieldButtonStyle import com.susu.core.designsystem.theme.Gray80 import com.susu.core.designsystem.theme.SusuTheme -import com.susu.core.model.Ledger import com.susu.core.ui.extension.collectWithLifecycle import com.susu.core.ui.extension.susuClickable import com.susu.core.ui.util.AnnotatedText @@ -76,7 +74,6 @@ fun LedgerEditRoute( viewModel.initData() } - LedgerEditScreen( uiState = uiState, onClickBack = viewModel::popBackStack, @@ -260,7 +257,7 @@ fun LedgerEditScreen( afterDate = false, maximumContainerHeight = 346.dp, onDismissRequest = { _, _, _ -> onDismissStartDateBottomSheet() }, - onItemSelected = onStartDateItemSelected + onItemSelected = onStartDateItemSelected, ) } @@ -275,7 +272,7 @@ fun LedgerEditScreen( afterDate = true, maximumContainerHeight = 346.dp, onDismissRequest = { _, _, _ -> onDismissEndDateBottomSheet() }, - onItemSelected = onEndDateItemSelected + onItemSelected = onEndDateItemSelected, ) } } diff --git a/feature/received/src/main/java/com/susu/feature/received/ledgeredit/LedgerEditViewModel.kt b/feature/received/src/main/java/com/susu/feature/received/ledgeredit/LedgerEditViewModel.kt index 9158aa8d..08359bad 100644 --- a/feature/received/src/main/java/com/susu/feature/received/ledgeredit/LedgerEditViewModel.kt +++ b/feature/received/src/main/java/com/susu/feature/received/ledgeredit/LedgerEditViewModel.kt @@ -16,7 +16,6 @@ import kotlinx.coroutines.launch import kotlinx.datetime.toJavaLocalDateTime import kotlinx.datetime.toKotlinLocalDateTime import kotlinx.serialization.json.Json -import timber.log.Timber import java.time.LocalDateTime import javax.inject.Inject @@ -50,7 +49,6 @@ class LedgerEditViewModel @Inject constructor( postSideEffect(LedgerEditSideEffect.PopBackStackWithLedger(Json.encodeToUri(ledger))) } .onFailure { - } }