Move initialIconState to parser

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

@@ -44,8 +44,10 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void setScreenTitleBarButtons(String screenInstanceId, String navigatorEventId, ReadableArray buttons) {
-        List<TitleBarButtonParams> titleBarButtons = TitleBarButtonParamsParser.parseButtons(BundleConverter.toBundle(buttons));
+    public void setScreenTitleBarButtons(String screenInstanceId, String navigatorEventId, ReadableArray rightButtons, ReadableMap leftButton) {
+        List<TitleBarButtonParams> titleBarButtons = new TitleBarButtonParamsParser().
+                parseButtons(BundleConverter.toBundle(rightButtons));
+
         NavigationCommandsHandler.setScreenTitleBarButtons(screenInstanceId, navigatorEventId, titleBarButtons);
     }
 

android/app/src/main/java/com/reactnativenavigation/params/ScreenParams.java

@@ -8,7 +8,7 @@ public class ScreenParams {
     public String screenId;
     public Bundle passProps;
     public List<TitleBarButtonParams> rightButtons;
-    public TitleBarButtonParams leftButton;
+    public TitleBarLeftButtonParams leftButton;
     public String title;
     public ScreenStyleParams styleParams;
     public List<TopTabParams> topTabParams;

android/app/src/main/java/com/reactnativenavigation/params/TitleBarLeftButtonParams.java

@@ -0,0 +1,14 @@
+package com.reactnativenavigation.params;
+
+import com.balysv.materialmenu.MaterialMenuDrawable;
+
+public class TitleBarLeftButtonParams extends TitleBarButtonParams {
+    public MaterialMenuDrawable.IconState initialIconState;
+
+    public TitleBarLeftButtonParams(TitleBarButtonParams params) {
+        icon = params.icon;
+        color = params.color;
+        eventId = params.eventId;
+        enabled = params.enabled;
+    }
+}

android/app/src/main/java/com/reactnativenavigation/params/parsers/ScreenParamsParser.java

@@ -27,10 +27,10 @@ public class ScreenParamsParser extends Parser {
         result.navigatorEventId = result.navigationParams.getString(KEY_NAVIGATOR_EVENT_ID);
         result.screenInstanceId = result.navigationParams.getString(KEY_SCREEN_INSTANCE_ID);
         if (hasKey(params, KEY_RIGHT_BUTTONS)) {
-            result.rightButtons = TitleBarButtonParamsParser.parseButtons(params.getBundle(KEY_RIGHT_BUTTONS));
+            result.rightButtons = new TitleBarButtonParamsParser().parseButtons(params.getBundle(KEY_RIGHT_BUTTONS));
         }
         if (hasKey(params, KEY_LEFT_BUTTON)) {
-            result.leftButton = TitleBarButtonParamsParser.parseSingleButton(params.getBundle(KEY_LEFT_BUTTON));
+            result.leftButton = new TitleBarLeftButtonParamsParser().parseSingleButton(params.getBundle(KEY_LEFT_BUTTON));
         }
         result.title = params.getString(KEY_TITLE);
         result.styleParams = ScreenStyleParamsParser.parse(params.getBundle(STYLE_PARAMS));

android/app/src/main/java/com/reactnativenavigation/params/parsers/TitleBarButtonParamsParser.java

@@ -10,7 +10,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class TitleBarButtonParamsParser extends Parser {
-    public static List<TitleBarButtonParams> parseButtons(Bundle params) {
+    public List<TitleBarButtonParams> parseButtons(Bundle params) {
         List<TitleBarButtonParams> result = new ArrayList<>();
 
         for (String key : params.keySet()) {
@@ -19,7 +19,7 @@ public class TitleBarButtonParamsParser extends Parser {
         return result;
     }
 
-    public static TitleBarButtonParams parseSingleButton(Bundle bundle) {
+    public TitleBarButtonParams parseSingleButton(Bundle bundle) {
         TitleBarButtonParams result = new TitleBarButtonParams();
         result.label = bundle.getString("title");
         if (hasKey(bundle,"icon")) {

android/app/src/main/java/com/reactnativenavigation/params/parsers/TitleBarLeftButtonParamsParser.java

@@ -0,0 +1,30 @@
+package com.reactnativenavigation.params.parsers;
+
+import android.os.Bundle;
+
+import com.balysv.materialmenu.MaterialMenuDrawable;
+import com.reactnativenavigation.params.TitleBarLeftButtonParams;
+
+public class TitleBarLeftButtonParamsParser extends TitleBarButtonParamsParser {
+
+    public TitleBarLeftButtonParams parseSingleButton(Bundle params) {
+        TitleBarLeftButtonParams backButtonParams = new TitleBarLeftButtonParams(super.parseSingleButton(params));
+        backButtonParams.initialIconState = getIconStateFromId(backButtonParams.eventId);
+        return backButtonParams;
+    }
+
+    private MaterialMenuDrawable.IconState getIconStateFromId(String id) {
+        switch (id) {
+            case "back":
+                return MaterialMenuDrawable.IconState.ARROW;
+            case "cancel":
+                return MaterialMenuDrawable.IconState.X;
+            case "accept":
+                return MaterialMenuDrawable.IconState.CHECK;
+            case "sideMenu":
+                return MaterialMenuDrawable.IconState.BURGER;
+            default:
+                throw new RuntimeException("Unsupported button type " + id);
+        }
+    }
+}

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

@@ -6,6 +6,7 @@ import android.view.View;
 
 import com.balysv.materialmenu.MaterialMenuDrawable;
 import com.reactnativenavigation.params.TitleBarButtonParams;
+import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 
 // TODO: replace with vector menu drawable
 public class LeftButton extends MaterialMenuDrawable implements View.OnClickListener {
@@ -16,12 +17,12 @@ public class LeftButton extends MaterialMenuDrawable implements View.OnClickList
                 Color.BLACK;
     }
 
-    private TitleBarButtonParams params;
+    private TitleBarLeftButtonParams params;
     private final TitleBarBackButtonListener titleBarBackButtonListener;
     private final String navigatorEventId;
 
     public LeftButton(Context context,
-                      TitleBarButtonParams params,
+                      TitleBarLeftButtonParams params,
                       TitleBarBackButtonListener titleBarBackButtonListener,
                       String navigatorEventId) {
         super(context, getColor(params), Stroke.THIN);
@@ -33,7 +34,7 @@ public class LeftButton extends MaterialMenuDrawable implements View.OnClickList
 
     private void setInitialState() {
         if (params != null) {
-            setIconState(getIconStateFromId(params.eventId));
+            setIconState(params.initialIconState);
         } else {
             setVisible(false);
         }
@@ -46,22 +47,6 @@ public class LeftButton extends MaterialMenuDrawable implements View.OnClickList
         }
     }
 
-    // TODO: move to parser
-    public IconState getIconStateFromId(String id) {
-        switch (id) {
-            case "back":
-                return IconState.ARROW;
-            case "cancel":
-                return IconState.X;
-            case "accept":
-                return IconState.CHECK;
-            case "sideMenu":
-                return IconState.BURGER;
-            default:
-                throw new RuntimeException("Unsupported button type " + id);
-        }
-    }
-
     private boolean isBackButton() {
         return getIconState() == IconState.ARROW;
     }

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

@@ -6,6 +6,7 @@ import android.view.Menu;
 
 import com.reactnativenavigation.animation.VisibilityAnimator;
 import com.reactnativenavigation.params.TitleBarButtonParams;
+import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 
 import java.util.List;
 
@@ -41,7 +42,7 @@ public class TitleBar extends Toolbar {
         button.addToMenu(index);
     }
 
-    public void setLeftButton(TitleBarButtonParams leftButtonParams,
+    public void setLeftButton(TitleBarLeftButtonParams leftButtonParams,
                                TitleBarBackButtonListener titleBarBackButtonListener, String navigatorEventId) {
         LeftButton leftButton = new LeftButton(getContext(), leftButtonParams, titleBarBackButtonListener, navigatorEventId);
         setNavigationOnClickListener(leftButton);

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

@@ -6,6 +6,7 @@ import android.support.design.widget.TabLayout;
 
 import com.reactnativenavigation.params.ScreenStyleParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
+import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.utils.ViewUtils;
 
 import java.util.List;
@@ -21,7 +22,7 @@ public class TopBar extends AppBarLayout {
         setId(ViewUtils.generateViewId());
     }
 
-    public void addTitleBarAndSetButtons(List<TitleBarButtonParams> rightButtons, TitleBarButtonParams leftButton,
+    public void addTitleBarAndSetButtons(List<TitleBarButtonParams> rightButtons, TitleBarLeftButtonParams leftButton,
                                          TitleBarBackButtonListener titleBarBackButtonListener,
                                          String navigatorEventId) {
         titleBar = new TitleBar(getContext());

src/deprecated/platformSpecificDeprecated.android.js

@@ -136,7 +136,6 @@ function addTabIcon(tab) {
   }
 }
 
-// TODO: add left buttons here
 function navigatorSetButtons(navigator, navigatorEventID, params) {
   if (params.rightButtons) {
     params.rightButtons.forEach(function(button) {
@@ -148,7 +147,17 @@ function navigatorSetButtons(navigator, navigatorEventID, params) {
       }
     });
   }
-  newPlatformSpecific.setScreenTitleBarButtons(navigator.screenInstanceID, navigatorEventID, params.rightButtons);
+  if (params.leftButton) {
+    params.leftButton.forEach(function(button) {
+      if (button.icon) {
+        const icon = resolveAssetSource(button.icon);
+        if (icon) {
+          button.icon = icon.uri;
+        }
+      }
+    });
+  }
+  newPlatformSpecific.setScreenTitleBarButtons(navigator.screenInstanceID, navigatorEventID, params.rightButtons, params.leftButton);
 }
 
 function navigatorSetTabBadge(navigator, params) {

src/platformSpecific.android.js

@@ -42,8 +42,8 @@ function setScreenTitleBarTitle(screenInstanceID, title) {
   NativeReactModule.setScreenTitleBarTitle(screenInstanceID, title);
 }
 
-function setScreenTitleBarButtons(screenInstanceID, navigatorEventID, buttons) {
-  NativeReactModule.setScreenTitleBarButtons(screenInstanceID, navigatorEventID, buttons);
+function setScreenTitleBarButtons(screenInstanceID, navigatorEventID, rightButtons, leftButton) {
+  NativeReactModule.setScreenTitleBarButtons(screenInstanceID, navigatorEventID, rightButtons, leftButton);
 }
 
 function showModal(screenParams) {