InsanusMokrassar/MicroUtils
1
0
Fork 0
mirror of https://github.com/InsanusMokrassar/MicroUtils.git synced 2025-09-03 23:29:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 0.25.0

Browse Source
This commit is contained in:
InsanusMokrassar
2025-03-04 09:49:26 +06:00
parent 2006a8cdd0 bac256e93e
commit 9c94348a15
7 changed files with 61 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@@ -6,6 +6,15 @@
* `Cache`:
* All cache repos now do not have `open` vals - to avoid collisions in runtime
## 0.24.9
* `Pagination`:
* Make alternative constructor parameter `size` of `PaginationResult` with default value
* Add `Pagination.previousPage` extension
* `Compose`:
* Rework of `InfinityPagedComponentContext`
* Rework of `PagedComponent`
## 0.24.8
* `Versions`:

2
gradle.properties
View File

@@ -16,4 +16,4 @@ crypto_js_version=4.1.1
group=dev.inmo
version=0.25.0
android_code_version=289
android_code_version=290

2
pagination/common/src/commonMain/kotlin/dev/inmo/micro_utils/pagination/PaginationResult.kt
View File

@@ -32,7 +32,7 @@ data class PaginationResult<T>(
page: Int,
results: List<T>,
pagesNumber: Int,
size: Int
size: Int = results.size
) : this(
page,
size,

10
pagination/common/src/commonMain/kotlin/dev/inmo/micro_utils/pagination/SimplePagination.kt
View File

@@ -26,6 +26,16 @@ inline fun Pagination.nextPage() =
size
)
/**
* This method DO NOT check [Pagination.page] of receiver. Returns pagination for previous page
*/
@Suppress("NOTHING_TO_INLINE")
inline fun Pagination.previousPage() =
SimplePagination(
page - 1,
size
)
/**
* @param page Current page number
* @param size Current page size

39
pagination/compose/src/commonMain/kotlin/InfinityPagedComponent.kt
View File

@@ -1,6 +1,7 @@
package dev.inmo.micro_utils.pagination.compose
import androidx.compose.runtime.*
import dev.inmo.micro_utils.coroutines.SpecialMutableStateFlow
import dev.inmo.micro_utils.pagination.*
/**
@@ -18,32 +19,27 @@ class InfinityPagedComponentContext<T> internal constructor(
size: Int
) {
internal val startPage = SimplePagination(page, size)
internal val iterationState: MutableState<Pair<Int, Pagination?>> = mutableStateOf(0 to null)
internal val dataState: MutableState<List<T>?> = mutableStateOf(null)
internal var lastPageLoaded = false
internal val currentlyLoadingPage = SpecialMutableStateFlow<Pagination?>(startPage)
internal val latestLoadedPage = SpecialMutableStateFlow<PaginationResult<T>?>(null)
internal val dataState = SpecialMutableStateFlow<List<T>?>(null)
/**
* Loads the next page of data. If the current page is the last one, the function returns early.
*/
fun loadNext() {
if (lastPageLoaded) return
if (iterationState.value.second is SimplePagination) return // Data loading has been inited but not loaded yet
if (latestLoadedPage.value ?.isLastPage == true) return
if (currentlyLoadingPage.value != null) return // Data loading has been inited but not loaded yet
iterationState.value = iterationState.value.let {
if ((it.second as? PaginationResult<*>) ?.isLastPage == true) return
(it.first + 1) to (it.second ?: startPage).nextPage()
}
currentlyLoadingPage.value = latestLoadedPage.value ?.nextPage() ?: startPage
}
/**
* Reloads the pagination from the first page, clearing previously loaded data.
*/
fun reload() {
dataState.value = null
lastPageLoaded = false
iterationState.value = iterationState.value.let {
(it.first + 1) to null
}
latestLoadedPage.value = null
currentlyLoadingPage.value = null
loadNext()
}
}
@@ -66,16 +62,17 @@ internal fun <T> InfinityPagedComponent(
) {
val context = remember { InfinityPagedComponentContext<T>(page, size) }
LaunchedEffect(context.iterationState.value.first) {
val paginationResult = loader(context, context.iterationState.value.second ?: context.startPage)
if (paginationResult.isLastPage) {
context.lastPageLoaded = true
}
context.iterationState.value = context.iterationState.value.copy(second = paginationResult)
val currentlyLoadingState = context.currentlyLoadingPage.collectAsState()
LaunchedEffect(currentlyLoadingState.value) {
val paginationResult = loader(context, currentlyLoadingState.value ?: return@LaunchedEffect)
context.latestLoadedPage.value = paginationResult
context.currentlyLoadingPage.value = null
context.dataState.value = (context.dataState.value ?: emptyList()) + paginationResult.results
}
context.block(context.dataState.value)
val dataState = context.dataState.collectAsState()
context.block(dataState.value)
}
/**

90
pagination/compose/src/commonMain/kotlin/PagedComponent.kt
View File

@@ -1,9 +1,7 @@
package dev.inmo.micro_utils.pagination.compose
import androidx.compose.runtime.*
import dev.inmo.micro_utils.common.Optional
import dev.inmo.micro_utils.common.dataOrThrow
import dev.inmo.micro_utils.common.optional
import dev.inmo.micro_utils.coroutines.SpecialMutableStateFlow
import dev.inmo.micro_utils.pagination.*
/**
@@ -19,23 +17,21 @@ import dev.inmo.micro_utils.pagination.*
* @param size Number of items per page.
*/
class PagedComponentContext<T> internal constructor(
preset: PaginationResult<T>? = null,
initialPage: Int,
size: Int
) {
internal val iterationState: MutableState<Pair<Int, Pagination>> = mutableStateOf(0 to SimplePagination(preset?.page ?: initialPage, preset?.size ?: size))
internal var dataOptional: PaginationResult<T>? = preset
private set
internal val dataState: MutableState<PaginationResult<T>?> = mutableStateOf(dataOptional)
internal val startPage = SimplePagination(initialPage, size)
internal val currentlyLoadingPageState = SpecialMutableStateFlow<Pagination?>(startPage)
internal val latestLoadedPage = SpecialMutableStateFlow<PaginationResult<T>?>(null)
/**
* Loads the next page of data. If the last page is reached, this function returns early.
*/
fun loadNext() {
iterationState.value = iterationState.value.let {
if (dataState.value ?.isLastPage == true) return
(it.first + 1) to it.second.nextPage()
when {
currentlyLoadingPageState.value != null -> return
latestLoadedPage.value ?.isLastPage == true -> return
else -> currentlyLoadingPageState.value = (latestLoadedPage.value ?.nextPage()) ?: startPage
}
}
@@ -43,12 +39,10 @@ class PagedComponentContext<T> internal constructor(
* Loads the previous page of data if available.
*/
fun loadPrevious() {
iterationState.value = iterationState.value.let {
if (it.second.isFirstPage) return
(it.first - 1) to SimplePagination(
it.second.page - 1,
it.second.size
)
when {
currentlyLoadingPageState.value != null -> return
latestLoadedPage.value ?.isFirstPage == true -> return
else -> currentlyLoadingPageState.value = (latestLoadedPage.value ?.previousPage()) ?: startPage
}
}
@@ -56,9 +50,7 @@ class PagedComponentContext<T> internal constructor(
* Reloads the current page, refreshing the data.
*/
fun reload() {
iterationState.value = iterationState.value.let {
it.copy(it.first + 1)
}
currentlyLoadingPageState.value = latestLoadedPage.value
}
}
@@ -74,46 +66,26 @@ class PagedComponentContext<T> internal constructor(
*/
@Composable
internal fun <T> PagedComponent(
preload: PaginationResult<T>?,
initialPage: Int,
size: Int,
loader: suspend PagedComponentContext<T>.(Pagination) -> PaginationResult<T>,
block: @Composable PagedComponentContext<T>.(PaginationResult<T>) -> Unit
) {
val context = remember { PagedComponentContext(preload, initialPage, size) }
val context = remember { PagedComponentContext<T>(initialPage, size) }
LaunchedEffect(context.iterationState.value) {
context.dataState.value = loader(context, context.iterationState.value.second)
val currentlyLoadingState = context.currentlyLoadingPageState.collectAsState()
LaunchedEffect(currentlyLoadingState.value) {
val paginationResult = loader(context, currentlyLoadingState.value ?: return@LaunchedEffect)
context.latestLoadedPage.value = paginationResult
context.currentlyLoadingPageState.value = null
}
context.dataState.value ?.let {
val pageState = context.latestLoadedPage.collectAsState()
pageState.value ?.let {
context.block(it)
}
}
/**
* Overloaded composable function for paginated components with preloaded data.
*
* @param T The type of paginated data.
* @param preload Preloaded pagination result.
* @param loader Suspended function that loads paginated data.
* @param block Composable function that renders the UI with the loaded data.
*/
@Composable
fun <T> PagedComponent(
preload: PaginationResult<T>,
loader: suspend PagedComponentContext<T>.(Pagination) -> PaginationResult<T>,
block: @Composable PagedComponentContext<T>.(PaginationResult<T>) -> Unit
) {
PagedComponent(
preload,
preload.page,
preload.size,
loader,
block
)
}
/**
* Overloaded composable function for paginated components with pagination info.
*
@@ -129,7 +101,6 @@ fun <T> PagedComponent(
block: @Composable PagedComponentContext<T>.(PaginationResult<T>) -> Unit
) {
PagedComponent(
null,
pageInfo.page,
pageInfo.size,
loader,
@@ -137,25 +108,6 @@ fun <T> PagedComponent(
)
}
/**
* Overloaded composable function for paginated components with an initial page.
*
* @param T The type of paginated data.
* @param initialPage Initial page number.
* @param size Number of items per page.
* @param loader Suspended function that loads paginated data.
* @param block Composable function that renders the UI with the loaded data.
*/
@Composable
fun <T> PagedComponent(
initialPage: Int,
size: Int,
loader: suspend PagedComponentContext<T>.(Pagination) -> PaginationResult<T>,
block: @Composable PagedComponentContext<T>.(PaginationResult<T>) -> Unit
) {
PagedComponent(null, initialPage, size, loader, block)
}
/**
* Overloaded composable function for paginated components with only a size parameter.
*

4
pagination/compose/src/jvmTest/kotlin/InfinityPagedComponentTests.kt
View File

@@ -30,9 +30,7 @@ class InfinityPagedComponentTests {
}
) {
if (it == null) {
if (this.iterationState.value.second != null) {
assertEquals(0, (this.iterationState.value.second as? SimplePagination) ?.page)
}
assertEquals(0, this.currentlyLoadingPage.value ?.page)
} else {
assertEquals(expectedList, it)
}