Feature/mainmenu scene

Assets/Plugins/Android/LargeScreenPlayableActivity.java

@@ -7,6 +7,8 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Bundle;
+import android.os.Build;
+import android.view.WindowManager;
 import android.util.Log;
 import android.view.Display;
 import android.util.DisplayMetrics;
@@ -31,6 +33,9 @@
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
+
+
+
 import static androidx.core.content.ContextCompat.getSystemService;
 
 
@@ -42,22 +47,31 @@ public class LargeScreenPlayableActivity extends UnityPlayerActivity {
     private float lastValue = -1.0f;
 
     static Context mContext;
-    WindowLayoutInfo lastLayoutInfo = null;
     FoldingFeature lastFoldingFeature = null;
     WindowInfoTrackerCallbackAdapter wit;
+    private final LayoutStateChangeCallback layoutStateChangeCallback =
+            new LayoutStateChangeCallback();
 
 
     @Override
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         mContext = this;
-        wit = new WindowInfoTrackerCallbackAdapter(WindowInfoTracker.Companion.getOrCreate(this));
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            getWindow().getAttributes().layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
+        }
+
+        wit = new WindowInfoTrackerCallbackAdapter(WindowInfoTracker.getOrCreate(this));
+        wit.addWindowLayoutInfoListener(
+            this, Runnable::run, layoutStateChangeCallback);
     }
 
     @Override
 	public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
-        Log.d(TAG, newConfig.toString());
+
+        Log.d(TAG, "on Configuration changed: " + newConfig.toString());
 
         // winConfig={ mBounds=Rect(0, 0 - 1080, 2092) mAppBounds=Rect(0, 0 - 1080, 1896) mMaxBounds=Rect(0, 0 - 1080, 2092) mDisplayRotation=ROTATION_180 mWindowingMode=fullscreen mDisplayWindowingMode=fullscreen mActivityType=standard mAlwaysOnTop=undefined mRotation=ROTATION_180}}
         try {
@@ -78,9 +92,7 @@ else if (rotation == Surface.ROTATION_270)
                 json.put("orientation", "ORIENTATION_PORTRAIT");
             else if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE)
                 json.put("orientation", "ORIENTATION_LANDSCAPE");
-            // else if (newConfig.orientation == Configuration.ORIENTATION_SQUARE)      <-- deprecated in API level 16
-            //    json.put("orientation", "ORIENTATION_SQUARE");
-            else if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE)
+            else
                 json.put("orientation", "ORIENTATION_UNDEFINED");
 
             DisplayMetrics screenMetrics = new DisplayMetrics();
@@ -101,7 +113,7 @@ else if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE)
         }  
     }
 
-    protected void HandleFoldingFeatures(FoldingFeature foldingFeature) {
+    protected void HandleFoldingFeatures(FoldingFeature foldingFeature) {        
          try {
             JSONObject json = new JSONObject();
             if (foldingFeature != null) {
@@ -126,34 +138,43 @@ protected void HandleFoldingFeatures(FoldingFeature foldingFeature) {
             } else {
                 json.put("state", "CLOSED");
             }
-
+            Log.d(TAG, "HandleFoldingFeatures: " + json.toString());    
             mUnityPlayer.UnitySendMessage("ConfigurationManager", "onFoldChanged", json.toString());
         } catch (JSONException e) {
+            Log.d(TAG, "Exception json");
+            throw new RuntimeException(e);
         }
     }
 
     @Override
     protected void onStart() {
         super.onStart();
-        wit.addWindowLayoutInfoListener(this, runOnUiThreadExecutor(), (newLayoutInfo -> {
-            lastLayoutInfo = newLayoutInfo;
+    }
 
-            lastFoldingFeature = null;
-            if (newLayoutInfo.getDisplayFeatures().size() > 0) {
-                newLayoutInfo.getDisplayFeatures().forEach(displayFeature -> {
+    @Override
+    protected void onStop() {
+        super.onStop();
+    }
+
+    protected void onLayoutStateChange(WindowLayoutInfo newLayoutInfo){
+        Log.d(TAG, "onLayoutStateChange: " + newLayoutInfo.toString());
+
+        lastFoldingFeature = null;
+        if (newLayoutInfo.getDisplayFeatures().size() > 0) {
+            newLayoutInfo.getDisplayFeatures().forEach(displayFeature -> {
+                if(displayFeature instanceof FoldingFeature)
+                {   
+                    // only set if it's a fold, not other feature type. only works for single-fold devices.
                     FoldingFeature foldingFeature = (FoldingFeature)displayFeature;
-                    if (foldingFeature != null)
-                    {   // only set if it's a fold, not other feature type. only works for single-fold devices.
-                        lastFoldingFeature = foldingFeature;
-                        HandleFoldingFeatures(foldingFeature);
-        				Log.d(TAG, "Fold changed: " + foldingFeature.toString());
-
-                    } else {
-        				Log.d(TAG, "Fold changed: [Closed]");
-                    }
-                });
-            }
-        }));
+                    lastFoldingFeature = foldingFeature;
+                    HandleFoldingFeatures(foldingFeature);
+                    Log.d(TAG, "Fold changed: " + foldingFeature.toString());
+
+                } else {
+                    Log.d(TAG, "Fold changed: [Closed]");
+                }
+            });
+        }  
     }
 
     Executor runOnUiThreadExecutor()
@@ -174,4 +195,14 @@ public FoldingFeature getFoldingFeature()
     {
         return lastFoldingFeature;
     }
+
+    class LayoutStateChangeCallback implements Consumer<WindowLayoutInfo> {
+        @Override
+        public void accept(WindowLayoutInfo newLayoutInfo) {
+            // Use newLayoutInfo to update the Layout
+            LargeScreenPlayableActivity.this.runOnUiThread( () -> {
+               LargeScreenPlayableActivity.this.onLayoutStateChange(newLayoutInfo);
+           });
+        }
+    }
 }