diff --git a/core/feature/src/main/java/pokitmons/pokit/core/feature/model/paging/PagingLoadResult.kt b/core/feature/src/main/java/pokitmons/pokit/core/feature/model/paging/PagingLoadResult.kt index eab9712..e0f57b4 100644 --- a/core/feature/src/main/java/pokitmons/pokit/core/feature/model/paging/PagingLoadResult.kt +++ b/core/feature/src/main/java/pokitmons/pokit/core/feature/model/paging/PagingLoadResult.kt @@ -3,7 +3,7 @@ package pokitmons.pokit.core.feature.model.paging import pokitmons.pokit.domain.commom.PokitResult sealed interface PagingLoadResult { - data class Success(val result: List): PagingLoadResult + data class Success(val result: List) : PagingLoadResult data class Error(val errorCode: String) : PagingLoadResult companion object { diff --git a/core/feature/src/main/java/pokitmons/pokit/core/feature/model/paging/SimplePaging.kt b/core/feature/src/main/java/pokitmons/pokit/core/feature/model/paging/SimplePaging.kt index 0335b8e..22bb91b 100644 --- a/core/feature/src/main/java/pokitmons/pokit/core/feature/model/paging/SimplePaging.kt +++ b/core/feature/src/main/java/pokitmons/pokit/core/feature/model/paging/SimplePaging.kt @@ -18,11 +18,11 @@ class SimplePaging ( private val initPage: Int = 0, private val firstRequestPage: Int = 3, ) { - private val _pagingData : MutableStateFlow> = MutableStateFlow(emptyList()) - val pagingData : StateFlow> = _pagingData.asStateFlow() + private val _pagingData: MutableStateFlow> = MutableStateFlow(emptyList()) + val pagingData: StateFlow> = _pagingData.asStateFlow() - private val _pagingState : MutableStateFlow = MutableStateFlow(PagingState.IDLE) - val pagingState : StateFlow = _pagingState.asStateFlow() + private val _pagingState: MutableStateFlow = MutableStateFlow(PagingState.IDLE) + val pagingState: StateFlow = _pagingState.asStateFlow() private var pagingDataRequestJob: Job? = null private var currentPageIndex = 0 diff --git a/core/feature/src/test/java/pokitmons/pokit/core/feature/SimplePagingUnitTest.kt b/core/feature/src/test/java/pokitmons/pokit/core/feature/SimplePagingUnitTest.kt index 3475d28..a691446 100644 --- a/core/feature/src/test/java/pokitmons/pokit/core/feature/SimplePagingUnitTest.kt +++ b/core/feature/src/test/java/pokitmons/pokit/core/feature/SimplePagingUnitTest.kt @@ -25,8 +25,8 @@ class SimplePagingUnitTest : DescribeSpec({ loadTime = PAGE_LOAD_TIME, totalItemCount = TOTAL_ITEM_COUNT ), - getKeyFromItem = {it}, - firstRequestPage = FIRST_REQUEST_PAGE_SAMPLE, + getKeyFromItem = { it }, + firstRequestPage = FIRST_REQUEST_PAGE_SAMPLE ) context("새로고침을 한 상황에서") { diff --git a/core/feature/src/test/java/pokitmons/pokit/core/feature/model/TestPagingSource.kt b/core/feature/src/test/java/pokitmons/pokit/core/feature/model/TestPagingSource.kt index d3144f6..8d14f0b 100644 --- a/core/feature/src/test/java/pokitmons/pokit/core/feature/model/TestPagingSource.kt +++ b/core/feature/src/test/java/pokitmons/pokit/core/feature/model/TestPagingSource.kt @@ -21,7 +21,7 @@ class TestPagingSource( val startIndex = pageIndex * pageSize val lastIndex = min(((pageIndex + 1) * pageSize), totalItemCount) - val itemList = (startIndex until lastIndex).map { "${it}번째 아이템" } + val itemList = (startIndex until lastIndex).map { "${it}번째 아이템" } return PagingLoadResult.Success(itemList) } } diff --git a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkViewModel.kt b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkViewModel.kt index 36ab79c..327c339 100644 --- a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkViewModel.kt +++ b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkViewModel.kt @@ -56,7 +56,7 @@ class AddLinkViewModel @Inject constructor( ) : ContainerHost, ViewModel() { override val container: Container = container(AddLinkScreenState()) - private val pokitPagingSource = object: PagingSource { + private val pokitPagingSource = object : PagingSource { override suspend fun load(pageIndex: Int, pageSize: Int): PagingLoadResult { val response = getPokitsUseCase.getPokits(page = pageIndex, size = pageSize) return PagingLoadResult.fromPokitResult( diff --git a/feature/addpokit/src/main/java/com/strayalpaca/addpokit/AddPokitViewModel.kt b/feature/addpokit/src/main/java/com/strayalpaca/addpokit/AddPokitViewModel.kt index 40c8a6b..e3f5425 100644 --- a/feature/addpokit/src/main/java/com/strayalpaca/addpokit/AddPokitViewModel.kt +++ b/feature/addpokit/src/main/java/com/strayalpaca/addpokit/AddPokitViewModel.kt @@ -51,7 +51,7 @@ class AddPokitViewModel @Inject constructor( private val pokitId = savedStateHandle.get("pokit_id")?.toIntOrNull() - private val pokitPagingSource = object: PagingSource { + private val pokitPagingSource = object : PagingSource { override suspend fun load(pageIndex: Int, pageSize: Int): PagingLoadResult { val response = getPokitsUseCase.getPokits(page = pageIndex, size = pageSize) return PagingLoadResult.fromPokitResult( diff --git a/feature/alarm/src/main/java/pokitmons/pokit/alarm/AlarmViewModel.kt b/feature/alarm/src/main/java/pokitmons/pokit/alarm/AlarmViewModel.kt index d5d0bd2..0a37560 100644 --- a/feature/alarm/src/main/java/pokitmons/pokit/alarm/AlarmViewModel.kt +++ b/feature/alarm/src/main/java/pokitmons/pokit/alarm/AlarmViewModel.kt @@ -21,7 +21,7 @@ class AlarmViewModel @Inject constructor( private val deleteAlertUseCase: DeleteAlertUseCase, ) : ViewModel() { - private val alarmPagingSource = object: PagingSource { + private val alarmPagingSource = object : PagingSource { override suspend fun load(pageIndex: Int, pageSize: Int): PagingLoadResult { val response = getAlertsUseCase.getAlerts(page = pageIndex, size = pageSize) return PagingLoadResult.fromPokitResult( diff --git a/feature/home/src/main/java/pokitmons/pokit/home/pokit/PokitViewModel.kt b/feature/home/src/main/java/pokitmons/pokit/home/pokit/PokitViewModel.kt index da537a8..dfe94ae 100644 --- a/feature/home/src/main/java/pokitmons/pokit/home/pokit/PokitViewModel.kt +++ b/feature/home/src/main/java/pokitmons/pokit/home/pokit/PokitViewModel.kt @@ -121,7 +121,6 @@ class PokitViewModel @Inject constructor( pokitPaging.modifyItem(linkCountDecreasedPokit.copy(count = decreasedLinkCount)) } } - } } } @@ -154,7 +153,7 @@ class PokitViewModel @Inject constructor( var screenType = mutableStateOf(ScreenType.Pokit) private set - private val pokitPagingSource = object: PagingSource { + private val pokitPagingSource = object : PagingSource { override suspend fun load(pageIndex: Int, pageSize: Int): PagingLoadResult { val sort = when (pokitsSortOrder.value) { PokitsSortOrder.Latest -> PokitsSort.RECENT @@ -163,7 +162,7 @@ class PokitViewModel @Inject constructor( val response = getPokitsUseCase.getPokits(size = pageSize, page = pageIndex, sort = sort) return PagingLoadResult.fromPokitResult( pokitResult = response, - mapper = { domainPokits -> domainPokits.map { Pokit.fromDomainPokit(it) }} + mapper = { domainPokits -> domainPokits.map { Pokit.fromDomainPokit(it) } } ) } } @@ -174,9 +173,9 @@ class PokitViewModel @Inject constructor( coroutineScope = viewModelScope ) - private val linksPagingSource = object: PagingSource { + private val linksPagingSource = object : PagingSource { override suspend fun load(pageIndex: Int, pageSize: Int): PagingLoadResult { - val sort = when(linksSortOrder.value) { + val sort = when (linksSortOrder.value) { UncategorizedLinksSortOrder.Latest -> LinksSort.RECENT UncategorizedLinksSortOrder.Older -> LinksSort.OLDER } diff --git a/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/PokitDetailViewModel.kt b/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/PokitDetailViewModel.kt index b220c32..d4705ed 100644 --- a/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/PokitDetailViewModel.kt +++ b/feature/pokitdetail/src/main/java/com/strayalpaca/pokitdetail/PokitDetailViewModel.kt @@ -46,12 +46,12 @@ class PokitDetailViewModel @Inject constructor( private val getLinkUseCase: GetLinkUseCase, savedStateHandle: SavedStateHandle, ) : ViewModel() { - private val pokitPagingSource = object: PagingSource { + private val pokitPagingSource = object : PagingSource { override suspend fun load(pageIndex: Int, pageSize: Int): PagingLoadResult { val response = getPokitsUseCase.getPokits(size = pageSize, page = pageIndex) return PagingLoadResult.fromPokitResult( pokitResult = response, - mapper = { domainPokits -> domainPokits.map { Pokit.fromDomainPokit(it) }} + mapper = { domainPokits -> domainPokits.map { Pokit.fromDomainPokit(it) } } ) } } @@ -61,7 +61,7 @@ class PokitDetailViewModel @Inject constructor( coroutineScope = viewModelScope ) - private val linkPagingSource = object: PagingSource { + private val linkPagingSource = object : PagingSource { override suspend fun load(pageIndex: Int, pageSize: Int): PagingLoadResult { val currentPokit = state.value.currentPokit val currentFilter = state.value.currentFilter @@ -73,7 +73,7 @@ class PokitDetailViewModel @Inject constructor( categoryId = categoryId, sort = sort, isRead = if (currentFilter.notReadChecked) false else null, - favorite = if (currentFilter.bookmarkChecked) true else null, + favorite = if (currentFilter.bookmarkChecked) true else null ) return PagingLoadResult.fromPokitResult( pokitResult = response, diff --git a/feature/search/src/main/java/pokitmons/pokit/search/SearchViewModel.kt b/feature/search/src/main/java/pokitmons/pokit/search/SearchViewModel.kt index 0281d6e..7835fc7 100644 --- a/feature/search/src/main/java/pokitmons/pokit/search/SearchViewModel.kt +++ b/feature/search/src/main/java/pokitmons/pokit/search/SearchViewModel.kt @@ -57,7 +57,7 @@ class SearchViewModel @Inject constructor( initLinkRemoveEventDetector() } - private val linkPagingSource = object: PagingSource { + private val linkPagingSource = object : PagingSource { override suspend fun load(pageIndex: Int, pageSize: Int): PagingLoadResult { val currentFilter = state.value.filter ?: Filter() @@ -82,7 +82,6 @@ class SearchViewModel @Inject constructor( mapper = { domainLinks -> domainLinks.map { Link.fromDomainLink(it) } } ) } - } private val linkPaging = SimplePaging( @@ -91,7 +90,7 @@ class SearchViewModel @Inject constructor( coroutineScope = viewModelScope ) - private val pokitPagingSource = object: PagingSource { + private val pokitPagingSource = object : PagingSource { override suspend fun load(pageIndex: Int, pageSize: Int): PagingLoadResult { val response = getPokitsUseCase.getPokits(page = pageIndex, size = pageSize) return PagingLoadResult.fromPokitResult(