diff --git a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithDrawActivity.kt b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithDrawActivity.kt index 991db27..c1f6601 100644 --- a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithDrawActivity.kt +++ b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithDrawActivity.kt @@ -366,7 +366,7 @@ class WithDrawActivity : AppViewsEmptyViewModelActivity() { .setHighlightShape(RectShape(10.dp, 10.dp, 10.dp)) .setHighlightHorizontalPadding(0.dp) .setConstraints(Constraints.TopToBottomOfHighlight + Constraints.EndToEndOfHighlight) - .setMarginOffset(MarginOffset(top = -20.dp.toInt())) + .setMarginOffset(MarginOffset(top = -20.dp.toInt(), end = 20.dp.toInt())) .build() } .setBackgroundColor("#cc000000".toColorInt()) diff --git a/app/src/main/java/com/gamedog/vididin/main/fragments/HomeFragment.kt b/app/src/main/java/com/gamedog/vididin/main/fragments/HomeFragment.kt index 7e9bee0..f131f58 100644 --- a/app/src/main/java/com/gamedog/vididin/main/fragments/HomeFragment.kt +++ b/app/src/main/java/com/gamedog/vididin/main/fragments/HomeFragment.kt @@ -145,11 +145,11 @@ class HomeFragment : AppViewsFragment(), OnSwit HighlightParameter.Builder() .setHighlightView(binding?.popMenu!!, { }) - .setTipsViewId(R.layout.guide_step_withdraw) + .setTipsViewId(R.layout.guide_step_popmnue) .setHighlightShape(OvalShape(binding?.popMenu?.measuredWidth!!.toFloat()/2)) .setHighlightHorizontalPadding(0.dp) .setConstraints(Constraints.TopToBottomOfHighlight + Constraints.EndToEndOfHighlight) - .setMarginOffset(MarginOffset(top = -20.dp.toInt(), end = -20.dp.toInt())) + .setMarginOffset(MarginOffset(top = -20.dp.toInt(), end = 20.dp.toInt())) .build() } .setBackgroundColor("#cc000000".toColorInt()) diff --git a/app/src/main/java/com/gamedog/vididin/widget/AnimImageView.kt b/app/src/main/java/com/gamedog/vididin/widget/AnimImageView.kt index fd9e58e..83f9605 100644 --- a/app/src/main/java/com/gamedog/vididin/widget/AnimImageView.kt +++ b/app/src/main/java/com/gamedog/vididin/widget/AnimImageView.kt @@ -6,11 +6,10 @@ import android.animation.ObjectAnimator import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater -import android.view.animation.AnimationSet import android.widget.LinearLayout import com.ama.core.architecture.util.ResUtil.dp import com.vididin.real.money.game.databinding.LayoutAnimImageviewBinding -import kotlin.math.min + class AnimImageView @JvmOverloads constructor( diff --git a/app/src/main/java/com/gamedog/vididin/widget/AnimImageView2.kt b/app/src/main/java/com/gamedog/vididin/widget/AnimImageView2.kt new file mode 100644 index 0000000..c816d8b --- /dev/null +++ b/app/src/main/java/com/gamedog/vididin/widget/AnimImageView2.kt @@ -0,0 +1,57 @@ +package com.gamedog.vididin.widget + +import android.animation.AnimatorSet +import android.animation.ObjectAnimator +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import android.widget.LinearLayout +import com.ama.core.architecture.util.ResUtil.dp +import com.vididin.real.money.game.databinding.LayoutAnimImageview2Binding + +class AnimImageView2 @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : LinearLayout(context, attrs, defStyleAttr) { + private var mBinding: LayoutAnimImageview2Binding + private val animationFraction = 0.2f + private var animatorSet: AnimatorSet = AnimatorSet() + + init { + mBinding = LayoutAnimImageview2Binding.inflate(LayoutInflater.from(context), this, true) + startAnim() + } + + + + private fun startAnim() { + with(mBinding) { + // 1. move distance + /*val moveDistanceX = -min(ivImage.width, ivImage.height) * animationFraction + val moveDistanceY = -min(ivImage.width, ivImage.height) * animationFraction*/ + val moveDistanceX = 20.dp + val moveDistanceY = -20.dp + + // 2. x and y + val animatorX = ObjectAnimator.ofFloat(ivImage, "translationX", 0f, moveDistanceX.toFloat()) + val animatorY = ObjectAnimator.ofFloat(ivImage, "translationY", 0f, moveDistanceY.toFloat()) + animatorX.repeatMode = ObjectAnimator.REVERSE + animatorX.repeatCount = ObjectAnimator.INFINITE + animatorY.repeatMode = ObjectAnimator.REVERSE + animatorY.repeatCount = ObjectAnimator.INFINITE + + // 3. set + animatorSet.playTogether(animatorX, animatorY) + animatorSet.duration = 600 + + animatorSet.start() + } + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + animatorSet.cancel() + } + +} \ No newline at end of file diff --git a/app/src/main/res/layout/guide_step_popmnue.xml b/app/src/main/res/layout/guide_step_popmnue.xml new file mode 100644 index 0000000..625ec80 --- /dev/null +++ b/app/src/main/res/layout/guide_step_popmnue.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/guide_step_zerobuy.xml b/app/src/main/res/layout/guide_step_zerobuy.xml index b47cc75..c892875 100644 --- a/app/src/main/res/layout/guide_step_zerobuy.xml +++ b/app/src/main/res/layout/guide_step_zerobuy.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-xxhdpi/icon_finger_right.webp b/app/src/main/res/mipmap-xxhdpi/icon_finger_right.webp new file mode 100644 index 0000000..4c29910 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/icon_finger_right.webp differ