Release 3.1.1 (#54)

wjshim2003 · eastshine2741 · web-flow · commit 1dbc1409e435 · 2024-01-14T18:06:29.000+09:00
* release Siksha 3.1.0-rc1

* release Siksha 3.1.0

* fix sementicVersionToSerializedCode

* give change to sikshaVersion

* release Siksha 3.1.0

* api fix

* release 3.1.1

* 하드코딩 피하기

* ktlint reformat

---------

Co-authored-by: eastshine2741 &lt;eastshine@snu.ac.kr&gt;
diff --git a/app/src/main/java/com/wafflestudio/siksha2/network/SikshaApi.kt b/app/src/main/java/com/wafflestudio/siksha2/network/SikshaApi.kt
@@ -20,14 +20,14 @@ interface SikshaApi {
     suspend fun fetchReviews(
         @Query("menu_id") menuId: Long,
         @Query("page") page: Long,
-        @Query("perPage") perPage: Long
+        @Query("per_page") perPage: Long
     ): FetchReviewsResult
 
     @GET("/reviews/filter")
     suspend fun fetchReviewsWithImage(
         @Query("menu_id") menuId: Long,
         @Query("page") page: Long,
-        @Query("perPage") perPage: Long,
+        @Query("per_page") perPage: Long,
         @Query("etc") etc: Boolean = true
     ): FetchReviewsResult
 
diff --git a/app/src/main/java/com/wafflestudio/siksha2/ui/menuDetail/MenuReviewPagingSource.kt b/app/src/main/java/com/wafflestudio/siksha2/ui/menuDetail/MenuReviewPagingSource.kt
@@ -18,7 +18,7 @@ class MenuReviewPagingSource(
         return try {
             val response = api.fetchReviews(menuId, key, params.loadSize.toLong())
             val prevKey = if (key == 1L) null else key - 1
-            val nextKey = if (response.result.isEmpty()) null else key + 1
+            val nextKey = if (response.result.isEmpty()) null else if (key == STARTING_PAGE_INDEX) key + params.loadSize / PAGE_LOAD_SIZE else key + 1
 
             LoadResult.Page(
                 response.result,
diff --git a/app/src/main/java/com/wafflestudio/siksha2/ui/menuDetail/MenuReviewWithImagePagingSource.kt b/app/src/main/java/com/wafflestudio/siksha2/ui/menuDetail/MenuReviewWithImagePagingSource.kt
@@ -18,7 +18,7 @@ class MenuReviewWithImagePagingSource(
         return try {
             val response = api.fetchReviewsWithImage(menuId, key, params.loadSize.toLong())
             val prevKey = if (key == 1L) null else key - 1
-            val nextKey = if (response.result.isEmpty()) null else key + 1
+            val nextKey = if (response.result.isEmpty()) null else if (key == STARTING_PAGE_INDEX) key + params.loadSize / PAGE_LOAD_SIZE else key + 1
 
             LoadResult.Page(
                 response.result,
diff --git a/version.properties b/version.properties
@@ -1 +1 @@
-sikshaVersion=3.1.0
+sikshaVersion=3.1.1

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-sikshaVersion=3.1.0`
	`1`	`+sikshaVersion=3.1.1`