Merge pull request #75 from frogobox/release/2.3.4

amirisback · web-flow · commit c7199bb9ff9d · 2025-10-02T14:23:31.000+07:00
Release/2.3.4
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@
 
 This Is Latest Release
 
-    $version_release = 2.3.3
+    $version_release = 2.3.4
 
 What's New??
 
@@ -54,7 +54,7 @@ allprojects {
 ```groovy
 dependencies {
     // library frogo-sdk
-    implementation 'com.github.frogobox:frogo-sdk:2.3.3'
+    implementation 'com.github.frogobox:frogo-sdk:2.3.4'
 }
 ```
 
@@ -63,14 +63,14 @@ dependencies {
 ```groovy
 dependencies {
     // library frogo-sdk
-    implementation("com.github.frogobox:frogo-sdk:2.3.3")
+    implementation("com.github.frogobox:frogo-sdk:2.3.4")
 }
 ```
 
 #### <Option 3> libs.versions.toml
 ```yml
 [versions]
-frogoAndroid = "2.3.3"
+frogoAndroid = "2.3.4"
 
 [libraries]
 frogo-android = { group = "com.github.frogobox", name = "frogo-sdk", version.ref = "frogoAndroid" }
diff --git a/buildSrc/src/main/kotlin/ProjectSetting.kt b/buildSrc/src/main/kotlin/ProjectSetting.kt
@@ -36,7 +36,7 @@ object ProjectSetting {
 
     const val VERSION_MAJOR = 2
     const val VERSION_MINOR = 3
-    const val VERSION_PATCH = 3
+    const val VERSION_PATCH = 4
 
     // ---------------------------------------------------------------------------------------------
 
diff --git a/frogorecyclerview/src/main/java/com/frogobox/recycler/core/FrogoRecyclerBindingAdapter.kt b/frogorecyclerview/src/main/java/com/frogobox/recycler/core/FrogoRecyclerBindingAdapter.kt
@@ -45,12 +45,13 @@ abstract class FrogoRecyclerBindingAdapter<T, VB : ViewBinding> :
         )
     }
 
-    open fun setupData(data: List<T>?) {
-        this.asyncListDiffer.currentList.clear()
+    open fun getItem(): MutableList<T> = asyncListDiffer.currentList.toMutableList()
 
-        if (data != null) {
-            listData.addAll(data)
-            this.asyncListDiffer.submitList(listData)
+    open fun setItem(data: List<T>) {
+        if (data.isEmpty()) {
+            asyncListDiffer.submitList(listOf())
+        } else {
+            asyncListDiffer.submitList(data.map { it })
         }
     }
 
@@ -61,11 +62,11 @@ abstract class FrogoRecyclerBindingAdapter<T, VB : ViewBinding> :
     }
 
     open fun setupRequirement(
-        data: List<T>?,
+        data: List<T>,
         bindingListener: FrogoRecyclerBindingListener<T, VB>?
     ) {
         setupListener(bindingListener)
-        setupData(data)
+        setItem(data)
     }
 
 }
diff --git a/frogorecyclerview/src/main/java/com/frogobox/recycler/core/FrogoRecyclerViewAdapter.kt b/frogorecyclerview/src/main/java/com/frogobox/recycler/core/FrogoRecyclerViewAdapter.kt
@@ -62,7 +62,7 @@ abstract class FrogoRecyclerViewAdapter<T> :
         } else {
             if (hasMultiHolder) {
                 if (hasEmptyView) {
-                    listCount = if (frogoHolder.size == 0) {
+                    listCount = if (frogoHolder.isEmpty()) {
                         1
                     } else {
                         frogoHolder.size
@@ -73,7 +73,7 @@ abstract class FrogoRecyclerViewAdapter<T> :
                 }
             } else {
                 if (hasEmptyView) {
-                    listCount = if (asyncListDiffer.currentList.size == 0) {
+                    listCount = if (asyncListDiffer.currentList.isEmpty()) {
                         1
                     } else {
                         asyncListDiffer.currentList.size
@@ -92,7 +92,7 @@ abstract class FrogoRecyclerViewAdapter<T> :
         } else {
             if (hasMultiHolder) {
                 if (hasEmptyView) {
-                    if (frogoHolder.size != 0) {
+                    if (frogoHolder.isNotEmpty()) {
                         holder.bindItem(
                             data = frogoHolder[position].data,
                             position = position,
@@ -110,7 +110,7 @@ abstract class FrogoRecyclerViewAdapter<T> :
                 }
             } else {
                 if (hasEmptyView) {
-                    if (asyncListDiffer.currentList.size != 0) {
+                    if (asyncListDiffer.currentList.isNotEmpty()) {
                         holder.bindItem(
                             data = asyncListDiffer.currentList[position],
                             position = position,
@@ -206,12 +206,13 @@ abstract class FrogoRecyclerViewAdapter<T> :
         }
     }
 
-    open fun setupData(data: List<T>?) {
-        this.asyncListDiffer.currentList.clear()
+    open fun getItem(): MutableList<T> = asyncListDiffer.currentList.toMutableList()
 
-        if (data != null) {
-            listData.addAll(data)
-            this.asyncListDiffer.submitList(listData)
+    open fun setItem(data: List<T>) {
+        if (data.isEmpty()) {
+            asyncListDiffer.submitList(listOf())
+        } else {
+            asyncListDiffer.submitList(data.map { it })
         }
     }
 
@@ -227,11 +228,11 @@ abstract class FrogoRecyclerViewAdapter<T> :
 
     open fun setupRequirement(
         customViewId: Int,
-        data: List<T>?,
+        data: List<T>,
         listener: FrogoRecyclerViewListener<T>?
     ) {
         setupListener(listener)
-        setupData(data)
+        setItem(data)
         setupCustomLayout(customViewId)
         layoutHandling()
     }
diff --git a/frogorecyclerview/src/main/java/com/frogobox/recycler/ext/FrogoRecyclerViewExt.kt b/frogorecyclerview/src/main/java/com/frogobox/recycler/ext/FrogoRecyclerViewExt.kt
@@ -47,16 +47,24 @@ fun <T> RecyclerView.getAdapterExt(): FrogoViewAdapter<T> {
     return this.adapter as FrogoViewAdapter<T>
 }
 
-fun <T> RecyclerView.setupData(data: List<T>) {
-    this.getAdapterExt<T>().setupData(data)
+fun <T> RecyclerView.setItem(data: List<T>) {
+    this.getAdapterExt<T>().setItem(data)
+}
+
+fun <T> RecyclerView.getItem(): List<T> {
+    return this.getAdapterExt<T>().getItem()
 }
 
 fun <T, VB : ViewBinding> RecyclerView.getAdapterBindingExt(): FrogoBindingAdapter<T, VB> {
     return this.adapter as FrogoBindingAdapter<T, VB>
 }
 
-fun <T, VB : ViewBinding> RecyclerView.setupDataBinding(data: List<T>) {
-    this.getAdapterBindingExt<T, VB>().setupData(data)
+fun <T, VB : ViewBinding> RecyclerView.setItemBinding(data: List<T>) {
+    this.getAdapterBindingExt<T, VB>().setItem(data)
+}
+
+fun <T, VB : ViewBinding> RecyclerView.getItemBinding(): List<T> {
+    return this.getAdapterBindingExt<T, VB>().getItem()
 }
 
 fun RecyclerView.addOnBottomScrollListener(onBottomReached: () -> Unit = {}) {
diff --git a/frogorecyclerview/src/main/java/com/frogobox/recycler/widget/FrogoRecyclerView.kt b/frogorecyclerview/src/main/java/com/frogobox/recycler/widget/FrogoRecyclerView.kt
@@ -96,17 +96,24 @@ class FrogoRecyclerView : RecyclerView,
         return this.adapter as FrogoViewAdapter<T>
     }
 
-    override fun <T> setupData(data: List<T>) {
-        this.getAdapterExt<T>().setupData(data)
+    override fun <T> setItem(data: List<T>) {
+        this.getAdapterExt<T>().setItem(data)
+    }
+
+    override fun <T> getItem(): List<T> {
+        return this.getAdapterExt<T>().getItem()
     }
 
     override fun <T, VB : ViewBinding> getAdapterBindingExt(): FrogoBindingAdapter<T, VB> {
         return this.adapter as FrogoBindingAdapter<T, VB>
     }
 
-    override fun <T, VB : ViewBinding> setupDataBinding(data: List<T>) {
-        this.getAdapterBindingExt<T, VB>().setupData(data)
+    override fun <T, VB : ViewBinding> setItemBinding(data: List<T>) {
+        this.getAdapterBindingExt<T, VB>().setItem(data)
     }
 
+    override fun <T, VB : ViewBinding> getItemBinding(): List<T> {
+        return this.getAdapterBindingExt<T, VB>().getItem()
+    }
 
 }
diff --git a/frogorecyclerview/src/main/java/com/frogobox/recycler/widget/IFrogoRecyclerView.kt b/frogorecyclerview/src/main/java/com/frogobox/recycler/widget/IFrogoRecyclerView.kt
@@ -54,10 +54,14 @@ interface IFrogoRecyclerView {
 
     fun <T> getAdapterExt(): FrogoViewAdapter<T>
 
-    fun <T> setupData(data: List<T>)
+    fun <T> setItem(data: List<T>)
+
+    fun <T> getItem(): List<T>
 
     fun <T, VB : ViewBinding> getAdapterBindingExt(): FrogoBindingAdapter<T, VB>
 
-    fun <T, VB : ViewBinding> setupDataBinding(data: List<T>)
+    fun <T, VB : ViewBinding> setItemBinding(data: List<T>)
+
+    fun <T, VB : ViewBinding> getItemBinding(): List<T>
 
 }

Original file line number	Diff line number	Diff line change
`@@ -45,12 +45,13 @@ abstract class FrogoRecyclerBindingAdapter<T, VB : ViewBinding> :`
`45`	`45`	`)`
`46`	`46`	`}`
`47`	`47`
`48`		`- open fun setupData(data: List<T>?) {`
`49`		`- this.asyncListDiffer.currentList.clear()`
	`48`	`+ open fun getItem(): MutableList<T> = asyncListDiffer.currentList.toMutableList()`
`50`	`49`
`51`		`- if (data != null) {`
`52`		`- listData.addAll(data)`
`53`		`- this.asyncListDiffer.submitList(listData)`
	`50`	`+ open fun setItem(data: List<T>) {`
	`51`	`+ if (data.isEmpty()) {`
	`52`	`+ asyncListDiffer.submitList(listOf())`
	`53`	`+ } else {`
	`54`	`+ asyncListDiffer.submitList(data.map { it })`
`54`	`55`	`}`
`55`	`56`	`}`
`56`	`57`
`@@ -61,11 +62,11 @@ abstract class FrogoRecyclerBindingAdapter<T, VB : ViewBinding> :`
`61`	`62`	`}`
`62`	`63`
`63`	`64`	`open fun setupRequirement(`
`64`		`- data: List<T>?,`
	`65`	`+ data: List<T>,`
`65`	`66`	`bindingListener: FrogoRecyclerBindingListener<T, VB>?`
`66`	`67`	`) {`
`67`	`68`	`setupListener(bindingListener)`
`68`		`- setupData(data)`
	`69`	`+ setItem(data)`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,17 +96,24 @@ class FrogoRecyclerView : RecyclerView,`
`96`	`96`	`return this.adapter as FrogoViewAdapter<T>`
`97`	`97`	`}`
`98`	`98`
`99`		`- override fun <T> setupData(data: List<T>) {`
`100`		`- this.getAdapterExt<T>().setupData(data)`
	`99`	`+ override fun <T> setItem(data: List<T>) {`
	`100`	`+ this.getAdapterExt<T>().setItem(data)`
	`101`	`+ }`
	`102`	`+`
	`103`	`+ override fun <T> getItem(): List<T> {`
	`104`	`+ return this.getAdapterExt<T>().getItem()`
`101`	`105`	`}`
`102`	`106`
`103`	`107`	`override fun <T, VB : ViewBinding> getAdapterBindingExt(): FrogoBindingAdapter<T, VB> {`
`104`	`108`	`return this.adapter as FrogoBindingAdapter<T, VB>`
`105`	`109`	`}`
`106`	`110`
`107`		`- override fun <T, VB : ViewBinding> setupDataBinding(data: List<T>) {`
`108`		`- this.getAdapterBindingExt<T, VB>().setupData(data)`
	`111`	`+ override fun <T, VB : ViewBinding> setItemBinding(data: List<T>) {`
	`112`	`+ this.getAdapterBindingExt<T, VB>().setItem(data)`
`109`	`113`	`}`
`110`	`114`
	`115`	`+ override fun <T, VB : ViewBinding> getItemBinding(): List<T> {`
	`116`	`+ return this.getAdapterBindingExt<T, VB>().getItem()`
	`117`	`+ }`
`111`	`118`
`112`	`119`	`}`