feat: carry back the clicked view to the SwitchClickListener

closes #87
Jacksgong · May 12, 2018 · b43093f · b43093f · xiaobaDev · Aug 24, 2018
1 parent a7cd0cc
commit b43093f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/app/src/main/java/cn/dreamtobe/kpswitch/demo/activity/ChattingResolvedActivity.java b/app/src/main/java/cn/dreamtobe/kpswitch/demo/activity/ChattingResolvedActivity.java
@@ -138,7 +138,7 @@ public void onKeyboardShowing(boolean isShowing) {
             KPSwitchConflictUtil.attach(mPanelRoot, mSendEdt,
                     new KPSwitchConflictUtil.SwitchClickListener() {
                         @Override
-                        public void onClickSwitch(boolean switchToPanel) {
+                        public void onClickSwitch(View v, boolean switchToPanel) {
                             if (switchToPanel) {
                                 mSendEdt.clearFocus();
                             } else {
@@ -153,7 +153,7 @@ public void onClickSwitch(boolean switchToPanel) {
             KPSwitchConflictUtil.attach(mPanelRoot, mPlusIv, mSendEdt,
                     new KPSwitchConflictUtil.SwitchClickListener() {
                         @Override
-                        public void onClickSwitch(boolean switchToPanel) {
+                        public void onClickSwitch(View v, boolean switchToPanel) {
                             if (switchToPanel) {
                                 mSendEdt.clearFocus();
                             } else {

diff --git a/app/src/main/java/cn/dreamtobe/kpswitch/demo/activity/ChattingResolvedFragmentActivity.java b/app/src/main/java/cn/dreamtobe/kpswitch/demo/activity/ChattingResolvedFragmentActivity.java
@@ -108,7 +108,7 @@ public void onKeyboardShowing(boolean isShowing) {
         KPSwitchConflictUtil.attach(mPanelRoot, mPlusIv, mSendEdt,
                 new KPSwitchConflictUtil.SwitchClickListener() {
                     @Override
-                    public void onClickSwitch(boolean switchToPanel) {
+                    public void onClickSwitch(View v, boolean switchToPanel) {
                         if (switchToPanel) {
                             mSendEdt.clearFocus();
                         } else {

diff --git a/...java/cn/dreamtobe/kpswitch/demo/activity/ChattingResolvedHandleByPlaceholderActivity.java b/...java/cn/dreamtobe/kpswitch/demo/activity/ChattingResolvedHandleByPlaceholderActivity.java
@@ -72,7 +72,7 @@ protected void onCreate(Bundle savedInstanceState) {
         KPSwitchConflictUtil.attach(panelRoot, plusIv, sendEdt,
                 new KPSwitchConflictUtil.SwitchClickListener() {
                     @Override
-                    public void onClickSwitch(boolean switchToPanel) {
+                    public void onClickSwitch(View v, boolean switchToPanel) {
                         if (switchToPanel) {
                             sendEdt.clearFocus();
                         } else {

diff --git a/library/src/main/java/cn/dreamtobe/kpswitch/util/KPSwitchConflictUtil.java b/library/src/main/java/cn/dreamtobe/kpswitch/util/KPSwitchConflictUtil.java
@@ -80,7 +80,7 @@ public static void attach(final View panelLayout,
                 public void onClick(View v) {
                     final boolean switchToPanel = switchPanelAndKeyboard(panelLayout, focusView);
                     if (switchClickListener != null) {
-                        switchClickListener.onClickSwitch(switchToPanel);
+                        switchClickListener.onClickSwitch(v, switchToPanel);
                     }
                 }
             });
@@ -255,10 +255,11 @@ public static void hidePanelAndKeyboard(final View panelLayout) {
      */
     public interface SwitchClickListener {
         /**
+         * @param v The view that was clicked.
          * @param switchToPanel If true, switch to showing Panel; If false, switch to showing
          *                      Keyboard.
          */
-        void onClickSwitch(boolean switchToPanel);
+        void onClickSwitch(View v, boolean switchToPanel);
     }
 
     /**
@@ -317,7 +318,7 @@ public void onClick(View v) {
                 }
 
                 if (switchClickListener != null && switchToPanel != null) {
-                    switchClickListener.onClickSwitch(switchToPanel);
+                    switchClickListener.onClickSwitch(v, switchToPanel);
                 }
             }
         });