visibilityAnimator refactor

android/app/src/main/java/com/reactnativenavigation/animation/VisibilityAnimator.java

@@ -8,7 +8,6 @@ import android.view.View;
 
 import com.reactnativenavigation.views.ScrollDirectionListener;
 
-// TODO find a better name for this class
 public class VisibilityAnimator {
 
     public enum HideDirection {
@@ -42,10 +41,10 @@ public class VisibilityAnimator {
     }
 
     public void setVisible(boolean visible, boolean animate) {
-        if (isShowing() && !visible) {
-            hide(animate);
-        } else if (isHiding() && visible) {
+        if (visible && isHiding()) {
             show(animate);
+        } else if (!visible && isShowing()) {
+            hide(animate);
         }
     }
 

android/app/src/main/java/com/reactnativenavigation/bridge/NavigationReactModule.java

@@ -59,7 +59,7 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void setTopBarVisible(String screenInstanceID, boolean hidden, boolean animated) {
-        NavigationCommandsHandler.toggleTopBarVisible(screenInstanceID, hidden, animated);
+        NavigationCommandsHandler.setTopBarVisible(screenInstanceID, hidden, animated);
     }
 
     @ReactMethod

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationCommandsHandler.java

@@ -90,7 +90,7 @@ public class NavigationCommandsHandler {
         });
     }
 
-    public static void toggleTopBarVisible(final String screenInstanceID, final boolean hidden, final boolean animated) {
+    public static void setTopBarVisible(final String screenInstanceID, final boolean hidden, final boolean animated) {
         final NavigationActivity currentActivity = NavigationActivity.currentActivity;
         if (currentActivity == null) {
             return;

android/app/src/main/java/com/reactnativenavigation/layouts/ScreenStack.java

@@ -6,7 +6,6 @@ import android.widget.FrameLayout;
 
 import com.reactnativenavigation.params.ScreenParams;
 
-import java.util.Iterator;
 import java.util.Stack;
 
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
@@ -98,11 +97,9 @@ public class ScreenStack extends FrameLayout {
             return null;
         }
 
-        Iterator<Screen> iterator = stack.iterator();
-        while (iterator.hasNext()) {
-            Screen next = iterator.next();
-            if (next.getScreenInstanceId().equals(screenInstanceId)) {
-                return next;
+        for (Screen screen : stack) {
+            if (screen.getScreenInstanceId().equals(screenInstanceId)) {
+                return screen;
             }
         }
 

android/app/src/main/java/com/reactnativenavigation/views/ScrollViewAttacher.java

@@ -22,7 +22,7 @@ public class ScrollViewAttacher {
         }
     }
 
-    public void detach() {
+    private void detach() {
         if (scrollView != null) {
             scrollView.getViewTreeObserver().removeOnScrollChangedListener(scrollDirectionListener);
             scrollDirectionListener = null;