logs and concurency fixes

jkwiecien · Jul 11, 2015 · 64d987a · 64d987a
1 parent 5887ab7
commit 64d987a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/switcher-library/build.gradle b/switcher-library/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 22
-        versionCode 11
-        versionName "1.1.1"
+        versionCode 12
+        versionName "1.1.2"
         renderscriptTargetApi 22
         renderscriptSupportModeEnabled true
     }

diff --git a/switcher-library/src/main/java/pl/aprilapps/switcher/Animations.java b/switcher-library/src/main/java/pl/aprilapps/switcher/Animations.java
@@ -54,14 +54,22 @@ public FadeInListener(View view) {
             this.view = view;
         }
 
+        @Override
+        public void onAnimationStart(Animator animation) {
+            super.onAnimationStart(animation);
+            Log.i(Switcher.class.getSimpleName(), String.format("fadeIn START: %s", view.getContext().getResources().getResourceName(view.getId())));
+        }
+
         @Override
         public void onAnimationEnd(Animator animation) {
             onAnimationEnd();
         }
 
         public void onAnimationEnd() {
-            Log.i(Switcher.class.getSimpleName(), String.format("fadeIn END: %s", view.getContext().getResources().getResourceName(view.getId())));
-            view.setVisibility(View.VISIBLE);
+            if (view.getVisibility() != View.VISIBLE) {
+                Log.i(Switcher.class.getSimpleName(), String.format("fadeIn END: %s", view.getContext().getResources().getResourceName(view.getId())));
+                view.setVisibility(View.VISIBLE);
+            }
         }
     }
 
@@ -73,14 +81,22 @@ public FadeOutListener(View view) {
             this.view = view;
         }
 
+        @Override
+        public void onAnimationStart(Animator animation) {
+            super.onAnimationStart(animation);
+            Log.i(Switcher.class.getSimpleName(), String.format("fadeOut START: %s", view.getContext().getResources().getResourceName(view.getId())));
+        }
+
         @Override
         public void onAnimationEnd(Animator animation) {
             onAnimationEnd();
         }
 
         public void onAnimationEnd() {
-            Log.i(Switcher.class.getSimpleName(), String.format("fadeOut END: %s", view.getContext().getResources().getResourceName(view.getId())));
-            view.setVisibility(View.INVISIBLE);
+            if (view.getVisibility() == View.VISIBLE) {
+                Log.i(Switcher.class.getSimpleName(), String.format("fadeOut END: %s", view.getContext().getResources().getResourceName(view.getId())));
+                view.setVisibility(View.INVISIBLE);
+            }
         }
     }
 }