Fixed some style nits.

efimerdlerkravitz · Jun 8, 2015 · 39ee777 · 39ee777
1 parent d48e5b7
commit 39ee777
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/library/src/main/java/com/getkeepsafe/android/multistateanimation/MultiStateAnimation.java b/library/src/main/java/com/getkeepsafe/android/multistateanimation/MultiStateAnimation.java
@@ -1,6 +1,6 @@
 package com.getkeepsafe.android.multistateanimation;
 
-import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.drawable.AnimationDrawable;
 import android.os.Build;
@@ -422,13 +422,14 @@ public String getTransitioningFromId() {
      *
      * @param drawable The drawable to play.
      */
-    @SuppressLint("NewApi")
+    @TargetApi(16)
     private void playDrawable(NotifyingAnimationDrawable drawable) {
         mCurrentDrawable = drawable;
         mCurrentDrawable.setAnimationFinishedListener(this);
 
-        if (mListener.get() != null) {
-            mListener.get().onAnimationStarting();
+        AnimationSeriesListener listener = mListener.get();
+        if (listener != null) {
+            listener.onAnimationStarting();
         }
 
         if (mView != null) {
@@ -471,7 +472,7 @@ public void queueTransition(String id) {
     public void transitionNow(String id) {
         AnimationSection newSection = mSectionsById.get(id);
         if (newSection == null) {
-            throw new RuntimeException("transitionNow called with invalid id: " + id);
+            throw new IllegalArgumentException("transitionNow called with invalid id: " + id);
         }
 
         // If the section has a transition from the old section, play the
@@ -514,8 +515,9 @@ public void clearAnimation() {
      */
     @Override
     public void onAnimationFinished() {
-        if (mListener.get() != null) {
-            mListener.get().onAnimationFinished();
+        AnimationSeriesListener listener = mListener.get();
+        if (listener != null) {
+            listener.onAnimationFinished();
         }
         if (mTransitioningFromId != null) {
             mTransitioningFromId = null;

diff --git a/...src/main/java/com/getkeepsafe/android/multistateanimation/NotifyingAnimationDrawable.java b/...src/main/java/com/getkeepsafe/android/multistateanimation/NotifyingAnimationDrawable.java
@@ -67,8 +67,9 @@ public boolean selectDrawable(int idx) {
         if (idx != 0 && idx == getNumberOfFrames() - 1) {
             if (!mFinished || !isOneShot()) {
                 mFinished = true;
-                if (mListener.get() != null) {
-                    mListener.get().onAnimationFinished();
+                OnAnimationFinishedListener listener = mListener.get();
+                if (listener != null) {
+                    listener.onAnimationFinished();
                 }
             }
         }