Rename Task to Func

lib/android/app/src/main/java/com/reactnativenavigation/utils/Functions.java

@@ -4,4 +4,12 @@ public class Functions {
     public interface Unit<T> {
         T get();
     }
+
+    public interface Func {
+        void run();
+    }
+
+    public interface Func1<T> {
+        void run(T param);
+    }
 }

lib/android/app/src/main/java/com/reactnativenavigation/utils/Task.java

@@ -1,5 +0,0 @@
-package com.reactnativenavigation.utils;
-
-public interface Task<T> {
-    void run(T param);
-}

lib/android/app/src/main/java/com/reactnativenavigation/utils/Time.java

@@ -4,24 +4,34 @@ import android.util.Log;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 
 @SuppressWarnings("WeakerAccess")
 public class Time {
     private static Map<String, Long> tagsToStartTime = new HashMap<>();
     private static Now now = new Now();
+    private static AtomicInteger count = new AtomicInteger();
 
     public static <T> T log(String tag, Functions.Unit<T> unit) {
-        log(tag);
+        int idx = count.incrementAndGet();
+        log(tag + idx);
         T t = unit.get();
-        log(tag);
+        log(tag + idx);
         return t;
     }
 
+    public static void log(String tag, Functions.Func task) {
+        int idx = count.incrementAndGet();
+        log(tag + idx);
+        task.run();
+        log(tag + idx);
+    }
+
     public static void log(String tag) {
         if (tagsToStartTime.containsKey(tag)) {
             Log.i(tag, "Elapsed: " + (now() - time(tag)));
         } else {
-            Log.i(tag, "logging start");
+            Log.v(tag, "logging start");
         }
         tagsToStartTime.put(tag, now());
     }

lib/android/app/src/main/java/com/reactnativenavigation/utils/ViewUtils.java

@@ -9,6 +9,7 @@ import android.view.ViewParent;
 
 import com.facebook.react.views.view.ReactViewBackgroundDrawable;
 import com.reactnativenavigation.react.ReactView;
+import com.reactnativenavigation.utils.Functions.Func1;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -90,7 +91,7 @@ public class ViewUtils {
         return view.getLayoutParams().height < 0 ? view.getHeight() : view.getLayoutParams().height;
     }
 
-    public static void performOnParentReactView(View child, Task<ReactView> task) {
+    public static void performOnParentReactView(View child, Func1<ReactView> task) {
         ReactView parent = findParentReactView(child.getParent());
         if (parent != null) {
             task.run(parent);

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ViewController.java

@@ -16,8 +16,8 @@ import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.NullBool;
 import com.reactnativenavigation.presentation.FabPresenter;
 import com.reactnativenavigation.utils.CommandListener;
+import com.reactnativenavigation.utils.Functions.Func1;
 import com.reactnativenavigation.utils.StringUtils;
-import com.reactnativenavigation.utils.Task;
 import com.reactnativenavigation.utils.UiThread;
 import com.reactnativenavigation.utils.UiUtils;
 import com.reactnativenavigation.viewcontrollers.stack.StackController;
@@ -126,7 +126,7 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
         return activity;
     }
 
-    protected void performOnParentController(Task<ParentController> task) {
+    protected void performOnParentController(Func1<ParentController> task) {
         if (parentController != null) task.run(parentController);
     }
 
@@ -139,7 +139,7 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
         this.parentController = parentController;
     }
 
-    public void performOnParentStack(Task<StackController> task) {
+    public void performOnParentStack(Func1<StackController> task) {
         if (parentController instanceof StackController) {
             task.run((StackController) parentController);
         } else if (this instanceof StackController) {
@@ -270,7 +270,7 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
 
     }
 
-    void runOnPreDraw(Task<T> task) {
+    void runOnPreDraw(Func1<T> task) {
         UiUtils.runOnPreDrawOnce(getView(), () -> task.run(getView()));
     }
 
@@ -291,7 +291,7 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
         );
     }
 
-    void applyOnController(ViewController controller, Task<ViewController> task) {
+    void applyOnController(ViewController controller, Func1<ViewController> task) {
         if (controller != null) task.run(controller);
     }
 

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/button/NavigationIconResolver.java

@@ -9,9 +9,9 @@ import android.util.Log;
 import com.reactnativenavigation.R;
 import com.reactnativenavigation.parse.params.Button;
 import com.reactnativenavigation.react.Constants;
+import com.reactnativenavigation.utils.Functions.Func1;
 import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.ImageLoadingListenerAdapter;
-import com.reactnativenavigation.utils.Task;
 
 public class NavigationIconResolver {
 
@@ -23,7 +23,7 @@ public class NavigationIconResolver {
         this.imageLoader = imageLoader;
     }
 
-    public void resolve(Button button, Task<Drawable> onSuccess) {
+    public void resolve(Button button, Func1<Drawable> onSuccess) {
         if (button.icon.hasValue()) {
             imageLoader.loadIcon(context, button.icon.get(), new ImageLoadingListenerAdapter() {
                 @Override

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/navigator/Navigator.java

@@ -13,7 +13,7 @@ import com.reactnativenavigation.presentation.Presenter;
 import com.reactnativenavigation.react.EventEmitter;
 import com.reactnativenavigation.utils.CommandListener;
 import com.reactnativenavigation.utils.CompatUtils;
-import com.reactnativenavigation.utils.Task;
+import com.reactnativenavigation.utils.Functions.Func1;
 import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.ParentController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
@@ -207,7 +207,7 @@ public class Navigator extends ParentController {
         return controllerById;
     }
 
-    private void applyOnStack(String fromId, CommandListener listener, Task<StackController> task) {
+    private void applyOnStack(String fromId, CommandListener listener, Func1<StackController> task) {
         ViewController from = findController(fromId);
         if (from != null) {
             if (from instanceof StackController) {

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/toptabs/TopTabsController.java

@@ -7,7 +7,7 @@ import android.view.View;
 
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.presentation.Presenter;
-import com.reactnativenavigation.utils.Task;
+import com.reactnativenavigation.utils.Functions.Func1;
 import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.ParentController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
@@ -103,7 +103,7 @@ public class TopTabsController extends ParentController<TopTabsViewPager> {
         getView().switchToTab(index);
     }
 
-    private void performOnCurrentTab(Task<ViewController> task) {
+    private void performOnCurrentTab(Func1<ViewController> task) {
         task.run(tabs.get(getView().getCurrentItem()));
     }
 }

lib/android/app/src/main/java/com/reactnativenavigation/views/toptabs/TopTabsStyleHelper.java

@@ -7,7 +7,7 @@ import android.widget.TextView;
 
 import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.Number;
-import com.reactnativenavigation.utils.Task;
+import com.reactnativenavigation.utils.Functions.Func1;
 import com.reactnativenavigation.utils.ViewUtils;
 
 class TopTabsStyleHelper {
@@ -44,7 +44,7 @@ class TopTabsStyleHelper {
         applyOnTabTitle(tabIndex, (title) -> title.setTypeface(fontFamily));
     }
 
-    private void applyOnTabTitle(int tabIndex, Task<TextView> action) {
+    private void applyOnTabTitle(int tabIndex, Func1<TextView> action) {
         TextView title = ViewUtils.findChildByClass(getTabView(tabIndex), TextView.class);
         if (title != null) {
             action.run(title);

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/button/NavigationIconResolverTest.java

@@ -10,8 +10,8 @@ import com.reactnativenavigation.parse.params.Button;
 import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.react.Constants;
+import com.reactnativenavigation.utils.Functions.Func1;
 import com.reactnativenavigation.utils.ImageLoader;
-import com.reactnativenavigation.utils.Task;
 
 import org.junit.Test;
 
@@ -36,7 +36,7 @@ public class NavigationIconResolverTest extends BaseTest {
 
     @Test
     public void create_iconButton() {
-        @SuppressWarnings("Convert2Lambda") Task<Drawable> onSuccess = spy(new Task<Drawable>() {
+        @SuppressWarnings("Convert2Lambda") Func1<Drawable> onSuccess = spy(new Func1<Drawable>() {
             @Override
             public void run(Drawable icon) {
 
@@ -49,7 +49,7 @@ public class NavigationIconResolverTest extends BaseTest {
 
     @Test
     public void create_backButton() {
-        @SuppressWarnings("Convert2Lambda") Task<Drawable> onSuccess = spy(new Task<Drawable>() {
+        @SuppressWarnings("Convert2Lambda") Func1<Drawable> onSuccess = spy(new Func1<Drawable>() {
             @Override
             public void run(Drawable param) {