feat: Enhance BaseAdapter and BaseBottomSheetDialogFragment

issever22 · issever22 · commit e17d754d9803 · 2024-07-26T18:00:47.000+03:00
- BaseAdapter: Improved click listener handling and added protected getters.
- BaseBottomSheetDialogFragment: Added functions for expand, collapse, set height, dismiss, enable/disable interaction, and state observation.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,26 @@
 # CHANGELOG
 
+## [1.1.2] - 2024-07-26
+### Changed
+- **BaseAdapter**:
+  - Refactored click listener handling to retain original click and long click listeners for views.
+  - Added protected getter functions for `onItemViewClickListener`, `onItemClickListener`, `onItemViewLongClickListener`, `onItemLongClickListener`, `onItemViewDoubleClickListener`, and `onItemDoubleClickListener`.
+  - Improved `setClickListenerForView` method to correctly manage existing click listeners on views.
+
+### Fixed
+- **BaseAdapter**:
+  - Fixed an issue where original click and long click listeners were overridden, leading to unexpected behavior.
+
+### Added
+- **BaseBottomSheetDialogFragment**:
+  - Added `setExpanded()` to expand the bottom sheet.
+  - Added `setCollapsed()` to collapse the bottom sheet.
+  - Added `setBottomSheetHeight(height: Int)` to set the height of the bottom sheet.
+  - Added `dismissBottomSheet()` to hide and dismiss the bottom sheet.
+  - Added `setHalfExpanded()` to half-expand the bottom sheet.
+  - Added `setInteractionEnabled(enabled: Boolean)` to enable or disable user interaction with the bottom sheet.
+  - Added `observeBottomSheetState(onStateChanged: (newState: Int) -> Unit)` to observe state changes of the bottom sheet.
+
 ## [1.1.0] - 2024-07-19
 ### Added
 - **BaseAdapter**
diff --git a/isseverCore/build.gradle.kts b/isseverCore/build.gradle.kts
@@ -96,7 +96,7 @@ afterEvaluate {
                 from(components["release"])
                 groupId = "com.github.issever22"
                 artifactId = "iCore"
-                version = "1.1.1"
+                version = "1.1.2"
 
                 pom {
                     name.set("iCore")
diff --git a/isseverCore/src/main/java/com/issever/core/base/BaseAdapter.kt b/isseverCore/src/main/java/com/issever/core/base/BaseAdapter.kt
@@ -10,12 +10,13 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
 import com.issever.core.data.initialization.IsseverCore
 
-abstract class BaseAdapter<T: Any, VB: ViewBinding>(
+abstract class BaseAdapter<T : Any, VB : ViewBinding>(
     private val bindingInflater: (LayoutInflater, ViewGroup, Boolean) -> VB
 ) : RecyclerView.Adapter<BaseAdapter<T, VB>.BaseViewHolder>() {
 
     open val coreLocalData: BaseLocalData by lazy { IsseverCore.getBaseLocalData() }
-    inner class BaseViewHolder(val binding: VB): RecyclerView.ViewHolder(binding.root)
+
+    inner class BaseViewHolder(val binding: VB) : RecyclerView.ViewHolder(binding.root)
 
     open val differ by lazy {
         AsyncListDiffer(this, object : DiffUtil.ItemCallback<T>() {
@@ -30,7 +31,10 @@ abstract class BaseAdapter<T: Any, VB: ViewBinding>(
     }
 
     private var onItemViewClickListener: ((T, View) -> Unit)? = null
+    protected fun getViewClickListener(): ((T, View) -> Unit)? = onItemViewClickListener
+
     private var onItemClickListener: ((T) -> Unit)? = null
+    protected fun getClickListener(): ((T) -> Unit)? = onItemClickListener
 
     fun setOnItemViewClickListener(listener: (T, View) -> Unit) {
         onItemViewClickListener = listener
@@ -41,7 +45,10 @@ abstract class BaseAdapter<T: Any, VB: ViewBinding>(
     }
 
     private var onItemViewLongClickListener: ((T, View) -> Unit)? = null
+    protected fun getViewLongClickListener(): ((T, View) -> Unit)? = onItemViewLongClickListener
+
     private var onItemLongClickListener: ((T) -> Unit)? = null
+    protected fun getLongClickListener(): ((T) -> Unit)? = onItemLongClickListener
 
     fun setOnItemViewLongClickListener(listener: (T, View) -> Unit) {
         onItemViewLongClickListener = listener
@@ -52,9 +59,13 @@ abstract class BaseAdapter<T: Any, VB: ViewBinding>(
     }
 
     private var doubleClickTimeout: Long = 300L
+    private var lastClickTime: Long = 0L
 
     private var onItemViewDoubleClickListener: ((T, View) -> Unit)? = null
+    protected fun getViewDoubleClickListener(): ((T, View) -> Unit)? = onItemViewDoubleClickListener
+
     private var onItemDoubleClickListener: ((T) -> Unit)? = null
+    protected fun getDoubleClickListener(): ((T) -> Unit)? = onItemDoubleClickListener
 
     fun setOnItemViewDoubleClickListener(listener: (T, View) -> Unit) {
         onItemViewDoubleClickListener = listener
@@ -80,85 +91,74 @@ abstract class BaseAdapter<T: Any, VB: ViewBinding>(
 
     override fun onBindViewHolder(holder: BaseViewHolder, position: Int) {
         val item = getItem(position)
-        bind(holder, item,holder.binding.root.context)
+        bind(holder, item, holder.binding.root.context)
 
-        setClickListenerForView(item,holder.binding.root)
+        setClickListenerForView(item, holder.binding.root)
     }
 
+    private val originalClickListeners = mutableMapOf<View, View.OnClickListener?>()
+
+    private val originalLongClickListeners = mutableMapOf<View, View.OnLongClickListener?>()
+
     private fun setClickListenerForView(item: T, view: View) {
-        var lastClickTime = 0L
-        var clickCount = 0
-
-        val clickRunnable = Runnable {
-            if (clickCount == 1) {
-                onItemViewClickListener?.invoke(item, view)
-                onItemClickListener?.invoke(item)
-            } else if (clickCount == 2) {
-                onItemViewDoubleClickListener?.invoke(item, view)
-                onItemDoubleClickListener?.invoke(item)
+        if (view.id != View.NO_ID || view.parent == null) {
+            if (!originalClickListeners.containsKey(view)) {
+                originalClickListeners[view] = try {
+                    val field = View::class.java.getDeclaredField("mListenerInfo")
+                    field.isAccessible = true
+                    val listenerInfo = field.get(view)
+                    val listenerField = listenerInfo.javaClass.getDeclaredField("mOnClickListener")
+                    listenerField.isAccessible = true
+                    listenerField.get(listenerInfo) as? View.OnClickListener
+                } catch (e: Exception) {
+                    null
+                }
             }
-            clickCount = 0
-        }
 
-        val isDoubleClickEnabled = onItemViewDoubleClickListener != null || onItemDoubleClickListener != null
+            if (!originalLongClickListeners.containsKey(view)) {
+                originalLongClickListeners[view] = try {
+                    val field = View::class.java.getDeclaredField("mListenerInfo")
+                    field.isAccessible = true
+                    val listenerInfo = field.get(view)
+                    val listenerField =
+                        listenerInfo.javaClass.getDeclaredField("mOnLongClickListener")
+                    listenerField.isAccessible = true
+                    listenerField.get(listenerInfo) as? View.OnLongClickListener
+                } catch (e: Exception) {
+                    null
+                }
+            }
 
-        if (view.parent == null) {
             view.setOnClickListener {
-                if (isDoubleClickEnabled) {
-                    val currentTime = System.currentTimeMillis()
-                    if (currentTime - lastClickTime < doubleClickTimeout) {
-                        clickCount++
-                        view.removeCallbacks(clickRunnable)
-                    } else {
-                        clickCount = 1
-                    }
-                    lastClickTime = currentTime
-                    view.postDelayed(clickRunnable, doubleClickTimeout)
+                originalClickListeners[view]?.onClick(view)
+
+                val currentTime = System.currentTimeMillis()
+                if (currentTime - lastClickTime < doubleClickTimeout) {
+                    onItemViewDoubleClickListener?.invoke(item, view)
+                    onItemDoubleClickListener?.invoke(item)
                 } else {
-                    onItemViewClickListener?.invoke(item, it)
+                    onItemViewClickListener?.invoke(item, view)
                     onItemClickListener?.invoke(item)
                 }
+                lastClickTime = currentTime
             }
 
             view.setOnLongClickListener {
-                onItemViewLongClickListener?.invoke(item, it)
+                originalLongClickListeners[view]?.onLongClick(view)
+                onItemViewLongClickListener?.invoke(item, view)
                 onItemLongClickListener?.invoke(item)
                 true
             }
         }
 
         if (view is ViewGroup) {
             for (i in 0 until view.childCount) {
-                val child = view.getChildAt(i)
-                setClickListenerForView(item, child)
-            }
-        } else {
-            view.setOnClickListener {
-                if (isDoubleClickEnabled) {
-                    val currentTime = System.currentTimeMillis()
-                    if (currentTime - lastClickTime < doubleClickTimeout) {
-                        clickCount++
-                        view.removeCallbacks(clickRunnable)
-                    } else {
-                        clickCount = 1
-                    }
-                    lastClickTime = currentTime
-                    view.postDelayed(clickRunnable, doubleClickTimeout)
-                } else {
-                    onItemViewClickListener?.invoke(item, it)
-                    onItemClickListener?.invoke(item)
-                }
-            }
-
-            view.setOnLongClickListener {
-                onItemViewLongClickListener?.invoke(item, it)
-                onItemLongClickListener?.invoke(item)
-                true
+                setClickListenerForView(item, view.getChildAt(i))
             }
         }
     }
 
-    abstract fun bind(holder: BaseViewHolder,item: T, context: Context)
+    abstract fun bind(holder: BaseViewHolder, item: T, context: Context)
 
     open fun areItemsTheSame(oldItem: T, newItem: T): Boolean {
         return oldItem == newItem
diff --git a/isseverCore/src/main/java/com/issever/core/base/BaseBottomSheetDialogFragment.kt b/isseverCore/src/main/java/com/issever/core/base/BaseBottomSheetDialogFragment.kt
@@ -13,7 +13,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.issever.core.data.initialization.IsseverCore
 import com.issever.core.util.extensions.showSnackbar
 
-abstract class BaseBottomSheetDialogFragment<VB : ViewBinding,VM : BaseViewModel?> : BottomSheetDialogFragment() {
+abstract class BaseBottomSheetDialogFragment<VB : ViewBinding, VM : BaseViewModel?> : BottomSheetDialogFragment() {
 
     private var _binding: VB? = null
     open val binding get() = _binding!!
@@ -24,8 +24,9 @@ abstract class BaseBottomSheetDialogFragment<VB : ViewBinding,VM : BaseViewModel
     protected abstract fun initViewBinding(): VB
     protected open fun init() {}
     protected open fun initObservers() {}
-    open var loadingView : View? = null
+    open var loadingView: View? = null
     open lateinit var behavior: BottomSheetBehavior<FrameLayout>
+    open var bottomSheet: FrameLayout? = null
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
@@ -38,7 +39,7 @@ abstract class BaseBottomSheetDialogFragment<VB : ViewBinding,VM : BaseViewModel
         super.onViewCreated(view, savedInstanceState)
 
         val dialog = dialog as BottomSheetDialog
-        val bottomSheet = dialog.findViewById<FrameLayout>(com.google.android.material.R.id.design_bottom_sheet)
+        bottomSheet = dialog.findViewById<FrameLayout>(com.google.android.material.R.id.design_bottom_sheet)
         behavior = BottomSheetBehavior.from(bottomSheet!!)
 
         init()
@@ -53,6 +54,44 @@ abstract class BaseBottomSheetDialogFragment<VB : ViewBinding,VM : BaseViewModel
         initObservers()
     }
 
+    open fun setExpanded() {
+        behavior.state = BottomSheetBehavior.STATE_EXPANDED
+    }
+
+    open fun setCollapsed() {
+        behavior.state = BottomSheetBehavior.STATE_COLLAPSED
+    }
+
+    open fun setBottomSheetHeight(height: Int) {
+        val layoutParams = bottomSheet?.layoutParams
+        layoutParams?.height = height
+        bottomSheet?.layoutParams = layoutParams
+    }
+
+    open fun dismissBottomSheet() {
+        behavior.state = BottomSheetBehavior.STATE_HIDDEN
+        dialog?.dismiss()
+    }
+
+    open fun setHalfExpanded() {
+        behavior.state = BottomSheetBehavior.STATE_HALF_EXPANDED
+    }
+
+    open fun setInteractionEnabled(enabled: Boolean) {
+        bottomSheet?.isClickable = enabled
+        bottomSheet?.isFocusable = enabled
+    }
+
+    open fun observeBottomSheetState(onStateChanged: (newState: Int) -> Unit) {
+        behavior.addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {
+            override fun onStateChanged(bottomSheet: View, newState: Int) {
+                onStateChanged(newState)
+            }
+
+            override fun onSlide(bottomSheet: View, slideOffset: Float) {}
+        })
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
