react-native-security-suite 0.9.0 → 0.9.1

package/android/src/main/java/com/securitysuite/SecureFragment.java

@@ -1,6 +1,7 @@
 package com.securitysuite;
 
 import android.app.Activity;
+import android.content.Context;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -9,6 +10,7 @@ import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
 public class SecureFragment extends Fragment {
@@ -21,17 +23,35 @@ public class SecureFragment extends Fragment {
     return secureView;
   }
 
+  @Override
+  public void onCreate(@Nullable Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    Log.d("SecureFragment", "onCreate");
+  }
+
+  @Override
+  public void onAttach(Context context) {
+    super.onAttach(context);
+    Log.d("SecureFragment", "onAttach");
+  }
+
+  @Override
+  public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+    super.onActivityCreated(savedInstanceState);
+    Log.d("SecureFragment", "onActivityCreated");
+  }
+
   @Override
   public void onViewCreated(View view, Bundle savedInstanceState) {
     super.onViewCreated(view, savedInstanceState);
-    Log.d("hereeeee", "1");
+    Log.d("SecureFragment", "onViewCreated");
     final Activity activity = getActivity();
     if (activity != null) {
       activity.runOnUiThread(new Runnable() {
         @Override
         public void run() {
           Window window = activity.getWindow();
-            window.addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+          window.addFlags(WindowManager.LayoutParams.FLAG_SECURE);
         }
       });
     }
@@ -40,18 +60,19 @@ public class SecureFragment extends Fragment {
   @Override
   public void onPause() {
     super.onPause();
+    Log.d("SecureFragment", "onPause");
   }
 
   @Override
   public void onResume() {
     super.onResume();
+    Log.d("SecureFragment", "onResume");
   }
 
   @Override
   public void onDestroy() {
     super.onDestroy();
-
-    Log.d("hereeeee", "2");
+    Log.d("SecureFragment", "onDestroy");
     final Activity activity = getActivity();
     if (activity != null) {
       activity.runOnUiThread(new Runnable() {

package/android/src/main/java/com/securitysuite/SecureView.java

@@ -1,11 +1,67 @@
 package com.securitysuite;
 
 import android.content.Context;
+import android.view.View;
 import android.widget.FrameLayout;
-import androidx.annotation.NonNull;
+
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.UIManagerModule;
 
 public class SecureView extends FrameLayout {
-  public SecureView(@NonNull Context context) {
+  private View contentView;
+
+  public SecureView(Context context) {
     super(context);
   }
+
+  @Override
+  public void requestLayout() {
+    super.requestLayout();
+    post(measureAndLayout);
+  }
+
+  private final Runnable measureAndLayout = () -> {
+    measure(
+      MeasureSpec.makeMeasureSpec(getWidth(), MeasureSpec.EXACTLY),
+      MeasureSpec.makeMeasureSpec(getHeight(), MeasureSpec.EXACTLY));
+    layout(getLeft(), getTop(), getRight(), getBottom());
+  };
+
+  @Override
+  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    int maxWidth = 0;
+    int maxHeight = 0;
+
+    for (int i = 0; i < getChildCount(); i++) {
+      View child = getChildAt(i);
+      if (child.getVisibility() != GONE) {
+        child.measure(widthMeasureSpec, MeasureSpec.UNSPECIFIED);
+
+        maxWidth = Math.max(maxWidth, child.getMeasuredWidth());
+        maxHeight = Math.max(maxHeight, child.getMeasuredHeight());
+      }
+    }
+
+    int finalWidth = Math.max(maxWidth, getSuggestedMinimumWidth());
+    int finalHeight = Math.max(maxHeight, getSuggestedMinimumHeight());
+
+    setMeasuredDimension(finalWidth, finalHeight);
+
+    ThemedReactContext reactContext = (ThemedReactContext) getContext();
+    UIManagerModule uiManagerModule = reactContext.getNativeModule(UIManagerModule.class);
+
+    if (uiManagerModule != null) {
+      reactContext.runOnNativeModulesQueueThread(() -> uiManagerModule.updateNodeSize(getId(), finalWidth, finalHeight));
+    }
+  }
+
+
+  public void setContentView(View view) {
+    contentView = view;
+    addView(contentView);
+  }
+
+  public View getContentView() {
+    return contentView;
+  }
 }

package/android/src/main/java/com/securitysuite/SecureViewManager.java

@@ -1,8 +1,11 @@
 package com.securitysuite;
 
+import android.app.Activity;
 import android.view.Choreographer;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.FrameLayout;
 
 import androidx.annotation.NonNull;
@@ -18,7 +21,7 @@ import com.facebook.react.uimanager.ThemedReactContext;
 
 import java.util.Map;
 
-public class SecureViewManager extends ViewGroupManager<FrameLayout> {
+public class SecureViewManager extends ViewGroupManager<SecureView> {
 
   public static final String REACT_CLASS = "SecureView";
   public final int COMMAND_CREATE = 1;
@@ -36,33 +39,33 @@ public class SecureViewManager extends ViewGroupManager<FrameLayout> {
     return REACT_CLASS;
   }
 
-  /**
-   * Return a FrameLayout which will later hold the Fragment
-   */
   @Override
-  public FrameLayout createViewInstance(ThemedReactContext reactContext) {
-    return new FrameLayout(reactContext);
+  public SecureView createViewInstance(ThemedReactContext reactContext) {
+    // TODO: move this to the fragment lifycycle
+    final Activity activity = reactContext.getCurrentActivity();
+    if (activity != null) {
+      activity.runOnUiThread(new Runnable() {
+        @Override
+        public void run() {
+          Window window = activity.getWindow();
+          window.addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+        }
+      });
+    }
+    return new SecureView(reactContext);
   }
 
-  /**
-   * Map the "create" command to an integer
-   */
   @Nullable
   @Override
   public Map<String, Integer> getCommandsMap() {
     return MapBuilder.of("create", COMMAND_CREATE);
   }
 
-  /**
-   * Handle "create" command (called from JS) and call createFragment method
-   */
-  @Override
   public void receiveCommand(
-          @NonNull FrameLayout root,
-          String commandId,
-          @Nullable ReadableArray args
-  ) {
-    super.receiveCommand(root, commandId, args);
+      @NonNull FrameLayout root,
+      String commandId,
+      @Nullable ReadableArray args) {
+    super.receiveCommand((SecureView) root, commandId, args);
     int reactNativeViewId = args.getInt(0);
     int commandIdInt = Integer.parseInt(commandId);
 
@@ -70,11 +73,12 @@ public class SecureViewManager extends ViewGroupManager<FrameLayout> {
       case COMMAND_CREATE:
         createFragment(root, reactNativeViewId);
         break;
-      default: {}
+      default: {
+      }
     }
   }
 
-  @ReactPropGroup(names = {"width", "height"}, customType = "Style")
+  @ReactPropGroup(names = { "width", "height" }, customType = "Style")
   public void setStyle(FrameLayout view, int index, Integer value) {
     if (index == 0) {
       propWidth = value == -1 ? ViewGroup.LayoutParams.MATCH_PARENT : value;
@@ -85,9 +89,6 @@ public class SecureViewManager extends ViewGroupManager<FrameLayout> {
     }
   }
 
-  /**
-   * Replace your React Native view with a custom fragment
-   */
   public void createFragment(FrameLayout root, int reactNativeViewId) {
     ViewGroup parentView = (ViewGroup) root.findViewById(reactNativeViewId);
     setupLayout(parentView);
@@ -95,9 +96,9 @@ public class SecureViewManager extends ViewGroupManager<FrameLayout> {
     final SecureFragment myFragment = new SecureFragment();
     FragmentActivity activity = (FragmentActivity) reactContext.getCurrentActivity();
     activity.getSupportFragmentManager()
-            .beginTransaction()
-            .replace(reactNativeViewId, myFragment, String.valueOf(reactNativeViewId))
-            .commit();
+        .beginTransaction()
+        .replace(reactNativeViewId, myFragment, String.valueOf(reactNativeViewId))
+        .commit();
   }
 
   public void setupLayout(View view) {
@@ -111,18 +112,13 @@ public class SecureViewManager extends ViewGroupManager<FrameLayout> {
     });
   }
 
-  /**
-   * Layout all children properly
-   */
   public void manuallyLayoutChildren(View view) {
-    int width = propWidth == ViewGroup.LayoutParams.MATCH_PARENT ?
-            ViewGroup.LayoutParams.MATCH_PARENT : propWidth;
-    int height = propHeight == ViewGroup.LayoutParams.MATCH_PARENT ?
-            ViewGroup.LayoutParams.MATCH_PARENT : propHeight;
+    int width = propWidth == ViewGroup.LayoutParams.MATCH_PARENT ? ViewGroup.LayoutParams.MATCH_PARENT : propWidth;
+    int height = propHeight == ViewGroup.LayoutParams.MATCH_PARENT ? ViewGroup.LayoutParams.MATCH_PARENT : propHeight;
 
     view.measure(
-            View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.EXACTLY),
-            View.MeasureSpec.makeMeasureSpec(height, View.MeasureSpec.EXACTLY));
+        View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.EXACTLY),
+        View.MeasureSpec.makeMeasureSpec(height, View.MeasureSpec.EXACTLY));
 
     view.layout(0, 0, width, height);
   }

package/android/src/main/java/com/securitysuite/SecuritySuitePackage.java

@@ -6,7 +6,6 @@ import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 public class SecuritySuitePackage implements ReactPackage {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-security-suite",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "Security solution for React Native",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",