Merge pull request #1 from LoxiaLiSA/master

click interceptor

app-androidx/build.gradle

@@ -60,7 +60,6 @@ dependencies {
     implementation deps.androidx.constraint
     implementation deps.pageindicator
     implementation deps.circleimageview
-    implementation deps.panelSwitchHelper_androidx
-//    implementation project(":panel-androidx")
-//    implementation 'com.squareup.leakcanary:leakcanary-android:2.4'
+    implementation project(":panel-androidx")
+    implementation 'com.squareup.leakcanary:leakcanary-android:2.4'
 }

panel-androidx/local.properties

@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Tue Aug 03 11:14:43 CST 2021
+sdk.dir=/Users/yangxin/Library/Android/sdk

panel-androidx/src/main/java/com/effective/android/panel/view/PanelSwitchLayout.kt

@@ -20,10 +20,7 @@ import com.effective.android.panel.device.DeviceRuntime
 import com.effective.android.panel.interfaces.ContentScrollMeasurer
 import com.effective.android.panel.interfaces.PanelHeightMeasurer
 import com.effective.android.panel.interfaces.ViewAssertion
-import com.effective.android.panel.interfaces.listener.OnEditFocusChangeListener
-import com.effective.android.panel.interfaces.listener.OnKeyboardStateListener
-import com.effective.android.panel.interfaces.listener.OnPanelChangeListener
-import com.effective.android.panel.interfaces.listener.OnViewClickListener
+import com.effective.android.panel.interfaces.listener.*
 import com.effective.android.panel.log.LogFormatter
 import com.effective.android.panel.utils.DisplayUtil
 import com.effective.android.panel.utils.DisplayUtil.getLocationOnScreen
@@ -100,6 +97,7 @@ class PanelSwitchLayout : LinearLayout, ViewAssertion {
         }
     }
 
+    var clickInterceptor: ClickInterceptor? = null
 
     @JvmOverloads
     constructor(context: Context?, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : super(context, attrs, defStyleAttr) {
@@ -189,6 +187,11 @@ class PanelSwitchLayout : LinearLayout, ViewAssertion {
                         LogTracker.log("$TAG#initListener", "panelItem invalid click! preClickTime: $preClickTime currentClickTime: $currentTime")
                         return
                     }
+
+                    if (clickInterceptor?.intercept(v.id) == true) {
+                        return
+                    }
+
                     notifyViewClick(v)
                     val targetId = panelContainer.getPanelId(panelView)
                     if (panelId == targetId && panelView.isTriggerViewCanToggle() && panelView.isShowing()) {
@@ -704,4 +707,9 @@ class PanelSwitchLayout : LinearLayout, ViewAssertion {
         val TAG = PanelSwitchLayout::class.java.simpleName
         private var preClickTime: Long = 0
     }
+}
+
+
+interface ClickInterceptor {
+    fun intercept(viewId: Int): Boolean
 }

settings.gradle

@@ -2,4 +2,4 @@
 //include ':panel'
 
 include ':app-androidx'
-//include ':panel-androidx'
+include ':panel-androidx'

versions.gradle

@@ -30,8 +30,6 @@ ext.deps.androidx = androidx
 
 ext.deps.pageindicator = "com.romandanylyk:pageindicatorview:$versions.pageindicator"
 ext.deps.android_gradle_plugin = "com.android.tools.build:gradle:$versions.android_gradle_plugin"
-ext.deps.panelSwitchHelper = "com.effective.android:panelSwitchHelper:$versions.panelSwitchHelper"
-ext.deps.panelSwitchHelper_androidx = "com.effective.android:panelSwitchHelper-androidx:$versions.panelSwitchHelper_androidx"
 ext.deps.circleimageview = "de.hdodenhof:circleimageview:$versions.circleimageview"
 
 def config = [:]