增加点击动画，更改图片

wanglu1209 · Sep 17, 2018 · 5a12223 · 5a12223
1 parent ffba166
commit 5a12223
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@
 
 <img src="https://raw.githubusercontent.com/wanglu1209/WPopup/master/img/undo.gif" width="200" height="350" />
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<img src="https://raw.githubusercontent.com/wanglu1209/WPopup/master/img/friend_circle.gif" width="200" height="350" />
+<img src="https://raw.githubusercontent.com/wanglu1209/WPopup/master/img/anim_gif.gif" width="200" height="350" />
 
 </div>
 

diff --git a/app/src/main/java/com/wanglu/wpopup/ListActivity.kt b/app/src/main/java/com/wanglu/wpopup/ListActivity.kt
@@ -9,7 +9,6 @@ import com.wanglu.lib.WPopup
 import com.wanglu.lib.WPopupAnim
 import com.wanglu.lib.WPopupDirection
 import com.wanglu.lib.WPopupModel
-import com.wanglu.wpopup.R.id.mRv
 import kotlinx.android.synthetic.main.activity_list.*
 
 class ListActivity: AppCompatActivity() {
@@ -53,6 +52,7 @@ class ListActivity: AppCompatActivity() {
                 .setData(friendCircleData)
                 .setAnim(WPopupAnim.ANIM_FRIEND_CIRCLE)
                 .setIconDirection(WPopupDirection.LEFT)
+                .setEnableChangeAnim(true)
                 .setPopupOrientation(WPopup.Builder.HORIZONTAL)
                 .setOnItemClickListener(object : WPopup.Builder.OnItemClickListener {
                     override fun onItemClick(view: View, position: Int) {

diff --git a/img/anim_gif.gif b/img/anim_gif.gif
diff --git a/lib/src/main/java/com/wanglu/lib/WCommonAnim.kt b/lib/src/main/java/com/wanglu/lib/WCommonAnim.kt
@@ -0,0 +1,31 @@
+package com.wanglu.lib
+
+import android.animation.AnimatorSet
+import android.animation.ObjectAnimator
+import android.view.View
+
+class WCommonAnim(private val view: View) {
+
+    private val animSet: AnimatorSet = AnimatorSet()
+    private var scaleXAnim: ObjectAnimator? = null
+    private var scaleYAnim: ObjectAnimator? = null
+
+
+
+    init {
+        animSet.duration = 200
+    }
+
+    fun start() {
+        if (animSet.isRunning)
+            animSet.cancel()
+
+        if (scaleXAnim == null) {
+            scaleXAnim = ObjectAnimator.ofFloat(view, View.SCALE_X, 1.2f, 1f)
+            scaleYAnim = ObjectAnimator.ofFloat(view, View.SCALE_Y,  1.2f, 1f)
+            animSet.playTogether(scaleXAnim, scaleYAnim)
+        }
+        animSet.start()
+    }
+
+}
diff --git a/lib/src/main/java/com/wanglu/lib/WPopParams.kt b/lib/src/main/java/com/wanglu/lib/WPopParams.kt
@@ -26,7 +26,8 @@ data class WPopParams(
     var commonItemTextSize = 14
     var commonPopMargin = 1
     var commonIconDirection = WPopupDirection.LEFT   // 传入的图片的位置
-    var commonDraablePadding = 5
+    var commonDrawablePadding = 5
+    var commonIsEnableChangeAnim = false    // 切换时是否启用动画
     var longClickView: View? = null   //长按点击事件的View
     var animRes = WPopupAnim.ANIM_ALPHA    // 动画
 }
diff --git a/lib/src/main/java/com/wanglu/lib/WPopup.kt b/lib/src/main/java/com/wanglu/lib/WPopup.kt
@@ -32,7 +32,8 @@ class WPopup(popParams: WPopParams) : BasePopup(popParams) {
         commonAdapter.setDirection(popParams.commonIconDirection)
         commonAdapter.setTextColor(popParams.commonItemTextColor)
         commonAdapter.setTextSize(popParams.commonItemTextSize)
-        commonAdapter.setDrawablePadding(popParams.commonDraablePadding)
+        commonAdapter.setDrawablePadding(popParams.commonDrawablePadding)
+        commonAdapter.setIsEnableChangeAnim(popParams.commonIsEnableChangeAnim)
         recyclerView = getContentView().findViewById(R.id.mRvCommon)
         commonRootLayout = getContentView().findViewById(R.id.mCommonRootLayout)
         recyclerView.adapter = commonAdapter
@@ -294,7 +295,12 @@ class WPopup(popParams: WPopParams) : BasePopup(popParams) {
         }
 
         fun setDrawablePadding(padding: Int): Builder{
-            popParams.commonDraablePadding = padding
+            popParams.commonDrawablePadding = padding
+            return this
+        }
+
+        fun setEnableChangeAnim(isEnable: Boolean): Builder{
+            popParams.commonIsEnableChangeAnim = isEnable
             return this
         }
 

diff --git a/lib/src/main/java/com/wanglu/lib/WPopupAdapter.kt b/lib/src/main/java/com/wanglu/lib/WPopupAdapter.kt
@@ -21,6 +21,7 @@ class WPopupAdapter(private val popup: WPopup) : RecyclerView.Adapter<WPopupAdap
     private var drawablePadding = 10
     private var key = 0
     private val views = hashMapOf<Int, Int>()
+    private var isAnim: Boolean = false
 
     fun setData(data: List<WPopupModel>) {
         mData = data
@@ -67,6 +68,10 @@ class WPopupAdapter(private val popup: WPopup) : RecyclerView.Adapter<WPopupAdap
         notifyDataSetChanged()
     }
 
+    fun setIsEnableChangeAnim(isEnable: Boolean) {
+        isAnim = isEnable
+    }
+
     fun setItemClickListener(wItemClickListener: WPopup.Builder.OnItemClickListener) {
         this.mWItemClickListener = wItemClickListener
     }
@@ -104,6 +109,8 @@ class WPopupAdapter(private val popup: WPopup) : RecyclerView.Adapter<WPopupAdap
                         text = mData!![position].text
                         views[key] = 0
                     }
+                    if (isAnim)
+                        WCommonAnim(holder.tv).start()
                     holder.tv.text = text
                     showImg(holder, drawable)
                 }
@@ -116,18 +123,17 @@ class WPopupAdapter(private val popup: WPopup) : RecyclerView.Adapter<WPopupAdap
                         popup.dismiss()
                     }
                 }
-                handler.sendEmptyMessageDelayed(1, 100)
+                handler.sendEmptyMessageDelayed(1, 220)
                 mWItemClickListener!!.onItemClick(holder.view, position)
             }
         }
 
         // 如果可以切换的text不是空，那么则判断是否切换过
         if (mData!![position].switchText.isNotEmpty()) {
-            val text: String
-            if (views[key] == 0) {
-                text = mData!![position].text
+            val text: String = if (views[key] == 0) {
+                mData!![position].text
             } else {
-                text = mData!![position].switchText
+                mData!![position].switchText
             }
             holder.tv.text = text
         } else {
@@ -148,6 +154,7 @@ class WPopupAdapter(private val popup: WPopup) : RecyclerView.Adapter<WPopupAdap
             showImg(holder, drawable)
             holder.tv.compoundDrawablePadding = Utils.dp2px(holder.tv.context, drawablePadding)
         }
+
     }
 
     private fun showImg(holder: ViewHolder, drawable: Drawable) {
@@ -158,6 +165,7 @@ class WPopupAdapter(private val popup: WPopup) : RecyclerView.Adapter<WPopupAdap
             WPopupDirection.LEFT -> holder.tv.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null)
             WPopupDirection.RIGHT -> holder.tv.setCompoundDrawablesWithIntrinsicBounds(null, null, drawable, null)
         }
+
     }
 
 

diff --git a/lib/src/main/res/layout/adapter_common_item.xml b/lib/src/main/res/layout/adapter_common_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
@@ -16,4 +16,4 @@
         android:paddingTop="10dp"
         android:textColor="#fff"
         android:textSize="14sp"/>
-</FrameLayout>
+</RelativeLayout>