V2 constants (#3486)

* Constants support

* Change Navigation.constants() to an async function on Android

Also added topBarHeight and bottomTabsHeight

lib/android/app/src/main/java/com/reactnativenavigation/react/Constants.java

@@ -4,4 +4,7 @@ public class Constants {
     public static final String BACK_BUTTON_JS_KEY = "backButtonId";
     public static final String BACK_BUTTON_ID = "RNN.back";
     public static final String STATUS_BAR_HEIGHT_KEY = "statusBarHeight";
+    public static final String TOP_BAR_HEIGHT_KEY = "topBarHeight";
+    public static final String BOTTOM_TABS_HEIGHT_KEY = "bottomTabsHeight";
+    public static final int BOTTOM_TABS_HEIGHT = 56;
 }

lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java

@@ -3,11 +3,13 @@ package com.reactnativenavigation.react;
 import android.support.annotation.NonNull;
 
 import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableMap;
 import com.reactnativenavigation.NavigationActivity;
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.parse.LayoutFactory;
@@ -24,7 +26,6 @@ import com.reactnativenavigation.viewcontrollers.Navigator;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 import com.reactnativenavigation.viewcontrollers.externalcomponent.ExternalComponentCreator;
 
-import java.util.HashMap;
 import java.util.Map;
 
 public class NavigationModule extends ReactContextBaseJavaModule {
@@ -46,12 +47,14 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 		return NAME;
 	}
 
-	@Override
-    public Map<String, Object> getConstants() {
-        final Map<String, Object> constants = new HashMap<>();
-        constants.put(Constants.BACK_BUTTON_JS_KEY, Constants.BACK_BUTTON_ID);
-        constants.put(Constants.STATUS_BAR_HEIGHT_KEY, UiUtils.getStatusBarHeight(getReactApplicationContext()));
-        return constants;
+	@ReactMethod
+    public void getConstants(Promise promise) {
+        WritableMap constants = Arguments.createMap();
+        constants.putString(Constants.BACK_BUTTON_JS_KEY, Constants.BACK_BUTTON_ID);
+        constants.putDouble(Constants.STATUS_BAR_HEIGHT_KEY, UiUtils.getStatusBarHeight(getReactApplicationContext()));
+        constants.putDouble(Constants.TOP_BAR_HEIGHT_KEY, UiUtils.getToolBarHeight(getReactApplicationContext()));
+        constants.putDouble(Constants.TOP_BAR_HEIGHT_KEY, UiUtils.dpToPx(getReactApplicationContext(), Constants.BOTTOM_TABS_HEIGHT));
+        promise.resolve(constants);
     }
 
 	@ReactMethod

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

@@ -12,11 +12,14 @@ import android.view.ViewTreeObserver;
 import android.view.WindowManager;
 
 public class UiUtils {
-    public static final int STATUS_BAR_HEIGHT_M = 24;
-    public static final int STATUS_BAR_HEIGHT_L = 25;
+    private static final int STATUS_BAR_HEIGHT_M = 24;
+    private static final int STATUS_BAR_HEIGHT_L = 25;
+    private static final int DEFAULT_TOOLBAR_HEIGHT = 56;
+
     private static int statusBarHeight = -1;
+    private static int toolBarHeight = -1;
 
-	public static void runOnPreDrawOnce(final View view, final Runnable task) {
+    public static void runOnPreDrawOnce(final View view, final Runnable task) {
         view.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
             @Override
             public boolean onPreDraw() {
@@ -61,6 +64,18 @@ public class UiUtils {
         return statusBarHeight;
     }
 
+    public static int getToolBarHeight(Context context) {
+        if (toolBarHeight > 0) {
+            return toolBarHeight;
+        }
+        final Resources resources = context.getResources();
+        final int resourceId = resources.getIdentifier("action_bar_size", "dimen", "android");
+        toolBarHeight = resourceId > 0 ?
+                resources.getDimensionPixelSize(resourceId) :
+                (int) dpToPx(context, DEFAULT_TOOLBAR_HEIGHT);
+        return toolBarHeight;
+    }
+
     public static float dpToPx(Context context, float dp) {
         float scale = context.getResources().getDisplayMetrics().density;
         return dp * scale + 0.5f;

lib/ios/Constants.h

@@ -0,0 +1,8 @@
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+@interface Constants : NSObject
+
++ (NSDictionary *)getConstants;
+
+@end

lib/ios/Constants.m

@@ -0,0 +1,21 @@
+#import "Constants.h"
+
+@implementation Constants
+
++ (NSDictionary *)getConstants {
+	return @{@"topBarHeight": @([self topBarHeight]), @"statusBarHeight": @([self statusBarHeight]), @"bottomTabsHeight": @([self bottomTabsHeight])};
+}
+
++ (CGFloat)topBarHeight {
+	return UIApplication.sharedApplication.delegate.window.rootViewController.navigationController.navigationBar.frame.size.height;
+}
+
++ (CGFloat)statusBarHeight {
+	return [UIApplication sharedApplication].statusBarFrame.size.height;
+}
+
++ (CGFloat)bottomTabsHeight {
+	return UIApplication.sharedApplication.delegate.window.rootViewController.tabBarController.tabBar.frame.size.height;
+}
+
+@end

lib/ios/RNNBridgeModule.m

@@ -1,4 +1,5 @@
 #import "RNNBridgeModule.h"
+#import "Constants.h"
 
 @implementation RNNBridgeModule {
 	RNNCommandsHandler* _commandsHandler;
@@ -101,5 +102,9 @@ RCT_EXPORT_METHOD(getLaunchArgs:(NSString*)commandId :(RCTPromiseResolveBlock)re
 	resolve(args);
 }
 
+RCT_EXPORT_METHOD(getConstants:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+	resolve([Constants getConstants]);
+}
+
 @end
 

lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -91,6 +91,8 @@
 		50570BEB2063E09B006A1B5C /* RNNTitleViewHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 50570BE92063E09B006A1B5C /* RNNTitleViewHelper.m */; };
 		5064495D20DC62B90026709C /* RNNSideMenuSideOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 5064495B20DC62B90026709C /* RNNSideMenuSideOptions.h */; };
 		5064495E20DC62B90026709C /* RNNSideMenuSideOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 5064495C20DC62B90026709C /* RNNSideMenuSideOptions.m */; };
+		50644A2020E11A720026709C /* Constants.h in Headers */ = {isa = PBXBuildFile; fileRef = 50644A1E20E11A720026709C /* Constants.h */; };
+		50644A2120E11A720026709C /* Constants.m in Sources */ = {isa = PBXBuildFile; fileRef = 50644A1F20E11A720026709C /* Constants.m */; };
 		506A2B1420973DFD00F43A95 /* RNNErrorHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 506A2B1220973DFD00F43A95 /* RNNErrorHandler.h */; };
 		506A2B1520973DFD00F43A95 /* RNNErrorHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 506A2B1320973DFD00F43A95 /* RNNErrorHandler.m */; };
 		50706E6D20CE7CA5003345C3 /* UIImage+tint.h in Headers */ = {isa = PBXBuildFile; fileRef = 50706E6B20CE7CA5003345C3 /* UIImage+tint.h */; };
@@ -307,6 +309,8 @@
 		50570BE92063E09B006A1B5C /* RNNTitleViewHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNTitleViewHelper.m; sourceTree = "<group>"; };
 		5064495B20DC62B90026709C /* RNNSideMenuSideOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNSideMenuSideOptions.h; sourceTree = "<group>"; };
 		5064495C20DC62B90026709C /* RNNSideMenuSideOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNSideMenuSideOptions.m; sourceTree = "<group>"; };
+		50644A1E20E11A720026709C /* Constants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Constants.h; sourceTree = "<group>"; };
+		50644A1F20E11A720026709C /* Constants.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Constants.m; sourceTree = "<group>"; };
 		506A2B1220973DFD00F43A95 /* RNNErrorHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNErrorHandler.h; sourceTree = "<group>"; };
 		506A2B1320973DFD00F43A95 /* RNNErrorHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNErrorHandler.m; sourceTree = "<group>"; };
 		50706E6B20CE7CA5003345C3 /* UIImage+tint.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIImage+tint.h"; sourceTree = "<group>"; };
@@ -466,6 +470,8 @@
 				390AD476200F499D00A8250D /* RNNSwizzles.m */,
 				506A2B1220973DFD00F43A95 /* RNNErrorHandler.h */,
 				506A2B1320973DFD00F43A95 /* RNNErrorHandler.m */,
+				50644A1E20E11A720026709C /* Constants.h */,
+				50644A1F20E11A720026709C /* Constants.m */,
 				50706E6B20CE7CA5003345C3 /* UIImage+tint.h */,
 				50706E6C20CE7CA5003345C3 /* UIImage+tint.m */,
 			);
@@ -830,6 +836,7 @@
 				7B1126A31E2D2B6C00F9B03B /* RNNSplashScreen.h in Headers */,
 				261F0E641E6EC94900989DE2 /* RNNModalManager.h in Headers */,
 				263905C01E4C6F440023D7D3 /* SidebarAirbnbAnimation.h in Headers */,
+				50644A2020E11A720026709C /* Constants.h in Headers */,
 				E8367B801F7A8A4700675C05 /* VICMAImageView.h in Headers */,
 				263905E61E4CAC950023D7D3 /* RNNSideMenuChildVC.h in Headers */,
 				263905C41E4C6F440023D7D3 /* SidebarFacebookAnimation.h in Headers */,
@@ -1012,6 +1019,7 @@
 				390AD478200F499D00A8250D /* RNNSwizzles.m in Sources */,
 				7BA500751E2544B9001B9E1B /* ReactNativeNavigation.m in Sources */,
 				263905B21E4C6F440023D7D3 /* MMDrawerController.m in Sources */,
+				50644A2120E11A720026709C /* Constants.m in Sources */,
 				E8AEDB3D1F55A1C2000F5A6A /* RNNElementView.m in Sources */,
 				E33AC20520B5C3890090DB8A /* RNNStatusBarOptions.m in Sources */,
 				E83BAD6B1F27363A00A9F3DD /* RNNNavigationOptions.m in Sources */,

lib/src/Navigation.ts

@@ -162,7 +162,7 @@ export class Navigation {
   /**
    * Constants coming from native
    */
-  public constants(): Constants {
-    return Constants.get();
+  public async constants(): Promise<any> {
+    return await Constants.get();
   }
 }

lib/src/adapters/Constants.ts

@@ -1,9 +1,10 @@
 import { NativeModules } from 'react-native';
 
 export class Constants {
-  static get(): Constants {
+  static async get(): Promise<any> {
     if (!this.instance) {
-      this.instance = new Constants();
+      const constants = await NativeModules.RNNBridgeModule.getConstants();
+      this.instance = new Constants(constants);
     }
     return this.instance;
   }
@@ -12,10 +13,13 @@ export class Constants {
 
   public readonly statusBarHeight: number;
   public readonly backButtonId: string;
+  public readonly topBarHeight: number;
+  public readonly bottomTabsHeight: number;
 
-  private constructor() {
-    const m = NativeModules.RNNBridgeModule;
-    this.statusBarHeight = m.statusBarHeight;
-    this.backButtonId = m.backButtonId;
+  private constructor(constants) {
+    this.statusBarHeight = constants.statusBarHeight;
+    this.topBarHeight = constants.topBarHeight;
+    this.backButtonId = constants.backButtonId;
+    this.bottomTabsHeight = constants.bottomTabsHeight;
   }
 }