From 1087558670777791fbdcae929737f7456aa1fe57 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 12 Apr 2020 20:26:05 +0600 Subject: [PATCH] hotfix for calculating of pages size in pagination --- gradle.properties | 2 +- .../postssystem/core/utils/pagination/Pagination.kt | 4 +--- .../postssystem/core/utils/pagination/PaginationResult.kt | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index de5763e4..40ff97b7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,4 +8,4 @@ uuidVersion=0.1.0 gradle_bintray_plugin_version=1.8.4 -core_version=0.4.0 +core_version=0.4.1 diff --git a/postssystem.core/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/utils/pagination/Pagination.kt b/postssystem.core/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/utils/pagination/Pagination.kt index 87e37032..d4810f13 100644 --- a/postssystem.core/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/utils/pagination/Pagination.kt +++ b/postssystem.core/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/utils/pagination/Pagination.kt @@ -45,6 +45,4 @@ fun calculatePagesNumber(datasetSize: Long, pageSize: Int): Int { /** * Calculates pages count for given [datasetSize] */ -fun calculatePagesNumber(datasetSize: Int, pageSize: Int): Int { - return ceil(datasetSize.toDouble() / pageSize).toInt() -} +fun calculatePagesNumber(datasetSize: Int, pageSize: Int): Int = calculatePagesNumber(datasetSize.toLong(), pageSize) diff --git a/postssystem.core/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/utils/pagination/PaginationResult.kt b/postssystem.core/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/utils/pagination/PaginationResult.kt index 846bf83e..dfd3c490 100644 --- a/postssystem.core/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/utils/pagination/PaginationResult.kt +++ b/postssystem.core/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/utils/pagination/PaginationResult.kt @@ -15,7 +15,7 @@ fun List.createPaginationResult( commonObjectsNumber: Long ) = PaginationResult( pagination.page, - calculatePagesNumber(commonObjectsNumber, size), + calculatePagesNumber(commonObjectsNumber, pagination.size), this, - size + pagination.size )