From 2dcd5c3fa7336ffe2c4b735381fe5ee7c5090581 Mon Sep 17 00:00:00 2001
From: Ellpeck <me@ellpeck.de>
Date: Mon, 7 Feb 2022 13:19:03 +0100
Subject: [PATCH] fixed some issues with the android demo

---
 Demos.Android/Activity1.cs                   |  4 +++-
 Demos.Android/Demos.Android.csproj           | 12 ++++++++++--
 Demos.Android/Properties/AndroidManifest.xml |  5 ++---
 Demos.Android/Properties/AssemblyInfo.cs     | 15 +--------------
 Demos/GameImpl.cs                            | 10 +++++++---
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/Demos.Android/Activity1.cs b/Demos.Android/Activity1.cs
index 0ec0e94..4f4265c 100644
--- a/Demos.Android/Activity1.cs
+++ b/Demos.Android/Activity1.cs
@@ -8,6 +8,7 @@ using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Input;
 using MLEM.Extensions;
 using MLEM.Misc;
+using static Android.Views.SystemUiFlags;
 
 namespace Demos.Android {
     [Activity(
@@ -46,7 +47,8 @@ namespace Demos.Android {
         public override void OnWindowFocusChanged(bool hasFocus) {
             base.OnWindowFocusChanged(hasFocus);
             // hide the status bar
-            this.view.SystemUiVisibility = (StatusBarVisibility) (SystemUiFlags.LayoutStable | SystemUiFlags.LayoutHideNavigation | SystemUiFlags.LayoutFullscreen | SystemUiFlags.HideNavigation | SystemUiFlags.Fullscreen | SystemUiFlags.ImmersiveSticky);
+            if (hasFocus)
+                this.Window.DecorView.SystemUiVisibility = (StatusBarVisibility) (ImmersiveSticky | LayoutStable | LayoutHideNavigation | LayoutFullscreen | HideNavigation | Fullscreen);
         }
 
     }
diff --git a/Demos.Android/Demos.Android.csproj b/Demos.Android/Demos.Android.csproj
index 97b7f48..d17a13b 100644
--- a/Demos.Android/Demos.Android.csproj
+++ b/Demos.Android/Demos.Android.csproj
@@ -27,7 +27,7 @@
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
         <DebugSymbols>true</DebugSymbols>
-        <DebugType>portable</DebugType>
+        <DebugType>full</DebugType>
         <Optimize>false</Optimize>
         <OutputPath>bin\$(MonoGamePlatform)\$(Platform)\$(Configuration)\</OutputPath>
         <DefineConstants>DEBUG;TRACE;ANDROID</DefineConstants>
@@ -37,7 +37,7 @@
         <AndroidLinkMode>None</AndroidLinkMode>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-        <DebugType>portable</DebugType>
+        <DebugType>pdbonly</DebugType>
         <Optimize>true</Optimize>
         <OutputPath>bin\$(MonoGamePlatform)\$(Platform)\$(Configuration)\</OutputPath>
         <DefineConstants>TRACE;ANDROID</DefineConstants>
@@ -45,6 +45,14 @@
         <WarningLevel>4</WarningLevel>
         <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
         <AndroidLinkMode>SdkOnly</AndroidLinkMode>
+        <AotAssemblies>false</AotAssemblies>
+        <EnableLLVM>false</EnableLLVM>
+        <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
+        <BundleAssemblies>false</BundleAssemblies>
+        <MandroidI18n />
+        <AndroidPackageFormat>aab</AndroidPackageFormat>
+        <AndroidUseAapt2>true</AndroidUseAapt2>
+        <AndroidCreatePackagePerAbi>false</AndroidCreatePackagePerAbi>
     </PropertyGroup>
     <ItemGroup>
         <Reference Include="System" />
diff --git a/Demos.Android/Properties/AndroidManifest.xml b/Demos.Android/Properties/AndroidManifest.xml
index 8211e7d..073f17b 100644
--- a/Demos.Android/Properties/AndroidManifest.xml
+++ b/Demos.Android/Properties/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="de.ellpeck.mlem.demos.android" android:versionCode="1" android:versionName="1.0">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="de.ellpeck.mlem.demos.android" android:installLocation="auto" android:versionCode="1" android:versionName="1.0">
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
-    <application android:label="MLEM Android Demos" />
+    <application android:label="MLEM Android Demos" android:resizeableActivity="true" />
 </manifest>
\ No newline at end of file
diff --git a/Demos.Android/Properties/AssemblyInfo.cs b/Demos.Android/Properties/AssemblyInfo.cs
index 3c42f3b..5093a42 100644
--- a/Demos.Android/Properties/AssemblyInfo.cs
+++ b/Demos.Android/Properties/AssemblyInfo.cs
@@ -12,17 +12,4 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCopyright("Copyright © 2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
+[assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Demos/GameImpl.cs b/Demos/GameImpl.cs
index 1f5417b..8b11a78 100644
--- a/Demos/GameImpl.cs
+++ b/Demos/GameImpl.cs
@@ -9,6 +9,7 @@ using MLEM.Textures;
 using MLEM.Ui;
 using MLEM.Ui.Elements;
 using MLEM.Ui.Style;
+using MonoGame.Framework.Utilities;
 
 namespace Demos {
     public class GameImpl : MlemGame {
@@ -45,9 +46,12 @@ namespace Demos {
 
         protected override void LoadContent() {
             // TODO remove with MonoGame 3.8.1 https://github.com/MonoGame/MonoGame/issues/7298
-            this.GraphicsDeviceManager.PreferredBackBufferWidth = 1280;
-            this.GraphicsDeviceManager.PreferredBackBufferHeight = 720;
-            this.GraphicsDeviceManager.ApplyChanges();
+            if (PlatformInfo.MonoGamePlatform == MonoGamePlatform.DesktopGL) {
+                this.GraphicsDeviceManager.PreferredBackBufferWidth = 1280;
+                this.GraphicsDeviceManager.PreferredBackBufferHeight = 720;
+                this.GraphicsDeviceManager.ApplyChanges();
+            }
+
             base.LoadContent();
             this.UiSystem.AutoScaleReferenceSize = new Point(1280, 720);
             this.UiSystem.AutoScaleWithScreen = true;