Merge branch 'master' into v1.12.13-hotfixes

android/src/main/java/com/idlefish/flutterboost/FlutterViewContainerManager.java

@@ -133,7 +133,7 @@ public class FlutterViewContainerManager implements IContainerManager {
         urlParams.put(IContainerRecord.UNIQ_KEY,uniqueId);
 
         IContainerRecord currentTopRecord = getCurrentTopRecord();
-        if(onResult != null) {
+        if(onResult != null&&currentTopRecord!=null) {
             mOnResults.put(currentTopRecord.uniqueId(),onResult);
         }
 

android/src/main/java/com/idlefish/flutterboost/containers/FlutterActivityAndFragmentDelegate.java

@@ -127,12 +127,15 @@ public class FlutterActivityAndFragmentDelegate implements IFlutterViewContainer
     @NonNull
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         Log.v(TAG, "Creating FlutterView.");
+
+
         flutterEngine.getActivityControlSurface().attachToActivity(
                 host.getActivity(),
                 host.getLifecycle()
         );
 
 
+
         mSyncer = FlutterBoost.instance().containerManager().generateSyncer(this);
 
         ensureAlive();
@@ -188,7 +191,7 @@ public class FlutterActivityAndFragmentDelegate implements IFlutterViewContainer
     public void onPostResume() {
         Log.v(TAG, "onPostResume()");
         ensureAlive();
-        Utils.setStatusBarLightMode(host.getActivity(), true);
+//        Utils.setStatusBarLightMode(host.getActivity(), true);
 
     }
 

android/src/main/java/com/idlefish/flutterboost/containers/FlutterFragment.java

@@ -14,6 +14,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
 import com.idlefish.flutterboost.FlutterBoost;
+import com.idlefish.flutterboost.Utils;
 import com.idlefish.flutterboost.XFlutterView;
 import io.flutter.embedding.android.*;
 import io.flutter.embedding.engine.FlutterEngine;
@@ -252,17 +253,9 @@ public class FlutterFragment extends Fragment implements FlutterActivityAndFragm
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        configureStatusBarForFullscreenFlutterExperience();
         return delegate.onCreateView(inflater, container, savedInstanceState);
     }
-    private void configureStatusBarForFullscreenFlutterExperience() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            Window window = this.getActivity().getWindow();
-            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-            window.setStatusBarColor(Color.TRANSPARENT);
-            window.getDecorView().setSystemUiVisibility(PlatformPlugin.DEFAULT_SYSTEM_UI | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-        }
-    }
+
 
     @Override
     public void onStart() {
@@ -278,6 +271,7 @@ public class FlutterFragment extends Fragment implements FlutterActivityAndFragm
         if (!isHidden()) {
             delegate.onResume();
         }
+
     }
 
     // TODO(mattcarroll): determine why this can't be in onResume(). Comment reason, or move if possible.

example/android/app/src/main/java/com/taobao/idlefish/flutterboostexample/FitSystemWindowFrameLayout.java

+package com.taobao.idlefish.flutterboostexample;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.os.Build;
+import androidx.annotation.NonNull;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowInsets;
+import android.widget.FrameLayout;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.core.view.ViewCompat;
+
+
+public class FitSystemWindowFrameLayout extends FrameLayout {
+
+
+    public FitSystemWindowFrameLayout( @NonNull Context context) {
+        super(context);
+    }
+
+    public FitSystemWindowFrameLayout( @NonNull Context context,  @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public FitSystemWindowFrameLayout( @NonNull Context context,  @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    public FitSystemWindowFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    @Override
+    public WindowInsets dispatchApplyWindowInsets(WindowInsets insets) {
+        WindowInsets result = super.dispatchApplyWindowInsets(insets);
+        if (!insets.isConsumed()) {
+            final int count = getChildCount();
+            for (int i = 0; i < count; i++)
+                result = getChildAt(i).dispatchApplyWindowInsets(insets);
+        }
+        return result;
+    }
+ 
+    @Override
+    public void addView(View child, int index, ViewGroup.LayoutParams params) {
+        super.addView(child, index, params);
+        ViewCompat.requestApplyInsets(child);
+    }
+    
+}

example/android/app/src/main/res/layout/flutter_fragment_page.xml

@@ -5,7 +5,7 @@
     android:orientation="vertical"
     android:background="@android:color/white">
 
-    <FrameLayout
+    <com.taobao.idlefish.flutterboostexample.FitSystemWindowFrameLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"