From 9e84b9eb816b1ba2f73acb5d8da4c03f7e445788 Mon Sep 17 00:00:00 2001 From: Morten Nielsen Date: Fri, 4 Aug 2023 10:01:26 -0700 Subject: [PATCH] Upgrade Android sample app to .net6.0 --- .../{Properties => }/AndroidManifest.xml | 7 +- src/SampleApp.Droid/MainActivity.cs | 339 +++++----- .../Properties/AssemblyInfo.cs | 30 - .../Resources/AboutResources.txt | 44 ++ .../Resources/Resource.Designer.cs | 588 ------------------ .../layout/{Main.axml => activity_main.xml} | 4 +- .../Resources/values/Strings.xml | 7 +- .../values/ic_launcher_background.xml | 4 + src/SampleApp.Droid/SampleApp.Droid.csproj | 108 +--- 9 files changed, 238 insertions(+), 893 deletions(-) rename src/SampleApp.Droid/{Properties => }/AndroidManifest.xml (64%) delete mode 100644 src/SampleApp.Droid/Properties/AssemblyInfo.cs create mode 100644 src/SampleApp.Droid/Resources/AboutResources.txt delete mode 100644 src/SampleApp.Droid/Resources/Resource.Designer.cs rename src/SampleApp.Droid/Resources/layout/{Main.axml => activity_main.xml} (96%) create mode 100644 src/SampleApp.Droid/Resources/values/ic_launcher_background.xml diff --git a/src/SampleApp.Droid/Properties/AndroidManifest.xml b/src/SampleApp.Droid/AndroidManifest.xml similarity index 64% rename from src/SampleApp.Droid/Properties/AndroidManifest.xml rename to src/SampleApp.Droid/AndroidManifest.xml index 6a7f8b3..e92bd31 100644 --- a/src/SampleApp.Droid/Properties/AndroidManifest.xml +++ b/src/SampleApp.Droid/AndroidManifest.xml @@ -1,8 +1,9 @@  - - + - + + + \ No newline at end of file diff --git a/src/SampleApp.Droid/MainActivity.cs b/src/SampleApp.Droid/MainActivity.cs index 49ec478..397c97d 100644 --- a/src/SampleApp.Droid/MainActivity.cs +++ b/src/SampleApp.Droid/MainActivity.cs @@ -1,181 +1,178 @@ -using Android.App; -using Android.Widget; -using Android.OS; using Android; -using Android.Support.V4.App; -using Android.Support.V4.Content; using Android.Content.PM; -using System; -using System.Collections.Generic; -using System.Linq; -using NmeaParser.Messages; +using AndroidX.Core.App; -namespace SampleApp.Droid +namespace SampleApp.Droid; + +[Activity(Label = "@string/app_name", MainLauncher = true, Icon = "@drawable/icon")] +public class MainActivity : Activity { - [Activity(Label = "NMEA Parser SampleApp", MainLauncher = true, Icon = "@drawable/icon")] - public class MainActivity : Activity + private Button startButton; + private Button stopButton; + + protected override void OnCreate(Bundle? savedInstanceState) + { + base.OnCreate(savedInstanceState); + + // Set our view from the "main" layout resource + SetContentView(Resource.Layout.activity_main); + startButton = FindViewById