Added animation type to library.

fevziomurtekin · Jul 1, 2019 · 0d18d69 · 0d18d69
1 parent 27550ba
commit 0d18d69
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 12 deletions.
diff --git a/.idea/markdown-exported-files.xml b/.idea/markdown-exported-files.xml
diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml
diff --git a/README.md b/README.md
@@ -84,7 +84,7 @@ dependencies {
 
 ## Features
 
-- [ ] Horizontal/vertical Animation.
+- [x] Horizontal/vertical Animation.
 - [ ] Card design programmatically will changed. 
 
 ## License

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -16,6 +16,7 @@
         app:cardYearTextSize="13"
         app:cardNameTextSize="15"
         app:cardMonthTextSize="13"
+        app:cardAnimationType="vertical"
     />
 
 </RelativeLayout>
diff --git a/payview/src/main/java/com/fevziomurtekin/payview/Payview.kt b/payview/src/main/java/com/fevziomurtekin/payview/Payview.kt
@@ -76,7 +76,7 @@ class Payview : NestedScrollView, View.OnFocusChangeListener {
 
     private var cardType : CardType = CardType.MASTERCARD
 
-
+    private var cardAnimationType:Int = AnimationType.HORIZONTAL
 
     constructor(context:Context) : super(context) { init(context,null,0,0) }
 
@@ -122,7 +122,7 @@ class Payview : NestedScrollView, View.OnFocusChangeListener {
                 cardYearTextSize=it.getInt(R.styleable.Payview_cardYearTextSize,13)
                 cardMonthTextSize=it.getInt(R.styleable.Payview_cardMonthTextSize,13)
                 cardCvTextSize=it.getInt(R.styleable.Payview_cardCvTextSize,14)
-                animationType = it.getInteger(R.styleable.Payview_cardAnimationType,AnimationType.HORIZONTAL)
+                cardAnimationType=it.getInt(R.styleable.Payview_cardAnimationType,AnimationType.HORIZONTAL)
                 initViews()
                 initData()
             }
@@ -360,11 +360,21 @@ class Payview : NestedScrollView, View.OnFocusChangeListener {
     private fun showAnimation(mood: Char){
         System.gc()
         if(mood == 'o' && mood != lastMood){
-            val set = AnimatorInflater.loadAnimator(this@Payview.context, R.animator.front_horizontal_in) as AnimatorSet
+            val set = AnimatorInflater.loadAnimator(this@Payview.context,
+                if(cardAnimationType == AnimationType.HORIZONTAL)
+                    R.animator.front_horizontal_in
+                else
+                    R.animator.front_vertical_in
+            ) as AnimatorSet
             set.apply {
                 setTarget(rl_front)
             }
-            val set1 = AnimatorInflater.loadAnimator(this@Payview.context, R.animator.front_horizontal_out) as AnimatorSet
+            val set1 = AnimatorInflater.loadAnimator(this@Payview.context,
+                if(cardAnimationType == AnimationType.HORIZONTAL)
+                    R.animator.front_horizontal_out
+                else
+                    R.animator.front_vertical_out
+            ) as AnimatorSet
             set1.apply {
                 setTarget(rl_back)
             }
@@ -374,11 +384,21 @@ class Payview : NestedScrollView, View.OnFocusChangeListener {
             animator.start()
 
         }else if (mood == 'i' && mood!=lastMood){
-            val set = AnimatorInflater.loadAnimator(this@Payview.context, R.animator.back_horizontal_in) as AnimatorSet
+            val set = AnimatorInflater.loadAnimator(this@Payview.context,
+                if(cardAnimationType == AnimationType.HORIZONTAL)
+                    R.animator.back_horizontal_in
+                else
+                    R.animator.back_vertical_in
+            ) as AnimatorSet
             set.apply {
                 setTarget(rl_front)
             }
-            val set1 = AnimatorInflater.loadAnimator(this@Payview.context, R.animator.back_horizontal_out) as AnimatorSet
+            val set1 = AnimatorInflater.loadAnimator(this@Payview.context,
+                if(cardAnimationType == AnimationType.HORIZONTAL)
+                    R.animator.back_horizontal_out
+                else
+                    R.animator.back_vertical_out
+            ) as AnimatorSet
             set1.apply {
                 setTarget(rl_back)
             }

diff --git a/payview/src/main/java/com/fevziomurtekin/payview/commons/AnimationType.kt b/payview/src/main/java/com/fevziomurtekin/payview/commons/AnimationType.kt
@@ -1,6 +1,8 @@
 package com.fevziomurtekin.payview.commons
 
-enum class AnimationType {
-    HORIZONTAL,
-    VERTICAL
-}
+annotation class AnimationType {
+    companion object {
+        val HORIZONTAL=0
+        val VERTICAL=1
+    }
+}