From 5b9ba3ed3d14362b6e2d3144dfa3d82f39f07c42 Mon Sep 17 00:00:00 2001 From: tangalbert919 Date: Sat, 29 Dec 2018 15:37:24 -0600 Subject: [PATCH] Take @miterosan's suggestions, fix SampleGame.Android --- SampleGame.Android/MainActivity.cs | 16 +--- .../Properties/AndroidManifest.xml | 2 +- .../Resources/Resource.designer.cs | 43 +++++----- SampleGame.Android/Resources/layout/Main.axml | 28 ------- .../mipmap-anydpi-v26/ic_launcher.xml | 5 ++ .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 ++ .../Resources/mipmap-hdpi/ic_launcher.png | Bin 0 -> 1634 bytes .../mipmap-hdpi/ic_launcher_foreground.png | Bin 0 -> 1441 bytes .../mipmap-hdpi/ic_launcher_round.png | Bin 0 -> 3552 bytes .../Resources/mipmap-mdpi/ic_launcher.png | Bin 0 -> 1362 bytes .../mipmap-mdpi/ic_launcher_foreground.png | Bin 0 -> 958 bytes .../mipmap-mdpi/ic_launcher_round.png | Bin 0 -> 2413 bytes .../Resources/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 2307 bytes .../mipmap-xhdpi/ic_launcher_foreground.png | Bin 0 -> 2056 bytes .../mipmap-xhdpi/ic_launcher_round.png | Bin 0 -> 4858 bytes .../Resources/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 3871 bytes .../mipmap-xxhdpi/ic_launcher_foreground.png | Bin 0 -> 3403 bytes .../mipmap-xxhdpi/ic_launcher_round.png | Bin 0 -> 8001 bytes .../Resources/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 5016 bytes .../mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 0 -> 4889 bytes .../mipmap-xxxhdpi/ic_launcher_round.png | Bin 0 -> 10893 bytes .../Resources/values/Strings.xml | 4 + .../Resources/values/colors.xml | 6 ++ .../values/ic_launcher_background.xml | 4 + SampleGame.Android/SampleGame.Android.csproj | 77 ++++++++++++++---- osu.Framework.Android/AndroidGameHost.cs | 12 ++- osu.Framework.Android/AndroidGameView.cs | 14 +--- osu.Framework.Android/AndroidGameWindow.cs | 1 - osu.Framework.Android/AndroidStorage.cs | 51 ------------ .../Textures/AndroidTextureLoaderStore.cs | 26 +++--- .../Assets/AboutAssets.txt | 19 ----- osu.Framework.Tests.Android/MainActivity.cs | 2 - .../Properties/AndroidManifest.xml | 3 +- .../Properties/AssemblyInfo.cs | 18 ---- .../Resources/AboutResources.txt | 44 ---------- .../osu.Framework.Tests.Android.csproj | 21 +++-- 36 files changed, 146 insertions(+), 255 deletions(-) delete mode 100644 SampleGame.Android/Resources/layout/Main.axml create mode 100644 SampleGame.Android/Resources/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 SampleGame.Android/Resources/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 SampleGame.Android/Resources/mipmap-hdpi/ic_launcher.png create mode 100644 SampleGame.Android/Resources/mipmap-hdpi/ic_launcher_foreground.png create mode 100644 SampleGame.Android/Resources/mipmap-hdpi/ic_launcher_round.png create mode 100644 SampleGame.Android/Resources/mipmap-mdpi/ic_launcher.png create mode 100644 SampleGame.Android/Resources/mipmap-mdpi/ic_launcher_foreground.png create mode 100644 SampleGame.Android/Resources/mipmap-mdpi/ic_launcher_round.png create mode 100644 SampleGame.Android/Resources/mipmap-xhdpi/ic_launcher.png create mode 100644 SampleGame.Android/Resources/mipmap-xhdpi/ic_launcher_foreground.png create mode 100644 SampleGame.Android/Resources/mipmap-xhdpi/ic_launcher_round.png create mode 100644 SampleGame.Android/Resources/mipmap-xxhdpi/ic_launcher.png create mode 100644 SampleGame.Android/Resources/mipmap-xxhdpi/ic_launcher_foreground.png create mode 100644 SampleGame.Android/Resources/mipmap-xxhdpi/ic_launcher_round.png create mode 100644 SampleGame.Android/Resources/mipmap-xxxhdpi/ic_launcher.png create mode 100644 SampleGame.Android/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png create mode 100644 SampleGame.Android/Resources/mipmap-xxxhdpi/ic_launcher_round.png create mode 100644 SampleGame.Android/Resources/values/Strings.xml create mode 100644 SampleGame.Android/Resources/values/colors.xml create mode 100644 SampleGame.Android/Resources/values/ic_launcher_background.xml delete mode 100644 osu.Framework.Tests.Android/Assets/AboutAssets.txt delete mode 100644 osu.Framework.Tests.Android/Resources/AboutResources.txt diff --git a/SampleGame.Android/MainActivity.cs b/SampleGame.Android/MainActivity.cs index eb2c95faf..3716f8016 100644 --- a/SampleGame.Android/MainActivity.cs +++ b/SampleGame.Android/MainActivity.cs @@ -3,28 +3,18 @@ using Android.App; using Android.OS; -using Android.Widget; -using osu.Framework.Android; -using System; +using Android.Content.PM; namespace SampleGame.Android { - [Activity(Label = "SampleGame", MainLauncher = true, Icon = "@mipmap/icon")] + [Activity(Label = "SampleGame", MainLauncher = true, ScreenOrientation = ScreenOrientation.Landscape)] public class MainActivity : Activity { protected override void OnCreate(Bundle savedInstanceState) { base.OnCreate(savedInstanceState); - SetContentView(Resource.Layout.Main); - - //Button button = FindViewById