Refactor

drasticactions · Dec 25, 2021 · ea8d0d3 · ea8d0d3
1 parent ee00d4c
commit ea8d0d3
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,7 +3,6 @@
         <LangVersion>preview</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <WarningsAsErrors>nullable</WarningsAsErrors>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354">

diff --git a/DrasticMaui.Contracts/DrasticMaui.Contracts.csproj b/DrasticMaui.Contracts/DrasticMaui.Contracts.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+	<WarningsAsErrors>nullable</WarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
 		<AdditionalFiles Include="..\stylecop.json" Link="stylecop.json" />

diff --git a/DrasticMaui.Mac/DrasticMaui.Mac.csproj b/DrasticMaui.Mac/DrasticMaui.Mac.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net6.0-macos</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+	<WarningsAsErrors>nullable</WarningsAsErrors>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/DrasticMaui.Sample/MauiProgram.cs b/DrasticMaui.Sample/MauiProgram.cs
@@ -15,7 +15,6 @@ public static class MauiProgram
     /// <returns>MauiApp.</returns>
     public static MauiApp CreateMauiApp()
     {
-        var trayService = new DrasticMaui.Tray.TrayService();
         var builder = MauiApp.CreateBuilder();
         builder
             .UseMauiApp<App>()

diff --git a/DrasticMaui/DrasticMaui.csproj b/DrasticMaui/DrasticMaui.csproj
@@ -5,6 +5,7 @@
 		<TargetFrameworks>net6.0;net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
 		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net6.0-windows10.0.19041</TargetFrameworks>
 		<UseMaui>true</UseMaui>
+		<WarningsAsErrors>nullable</WarningsAsErrors>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/DrasticMaui/Overlays/PageOverlay.Android.cs b/DrasticMaui/Overlays/PageOverlay.Android.cs
@@ -7,11 +7,12 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using DrasticMaui.Tools;
 using Android.App;
 using Android.Views;
 using AndroidX.CoordinatorLayout.Widget;
+using DrasticMaui.Tools;
 using Microsoft.Maui.Handlers;
+using Microsoft.Maui.Platform;
 
 namespace DrasticMaui.Overlays
 {
@@ -98,13 +99,13 @@ internal void AddNativeElements(Page view)
 
             var pageHandler = view.ToHandler(this.context);
             var element = pageHandler?.NativeView;
-            if (element is not null)
+            if (element is Android.Views.View aView)
             {
-                element.Touch += this.Element_Touch;
-                var layerCount = nativeLayer.ChildCount;
-                var childView = nativeLayer.GetChildAt(1);
-                nativeLayer.AddView(element, layerCount, new CoordinatorLayout.LayoutParams(CoordinatorLayout.LayoutParams.MatchParent, CoordinatorLayout.LayoutParams.MatchParent));
-                element.BringToFront();
+                aView.Touch += this.Element_Touch;
+                var layerCount = this.nativeLayer.ChildCount;
+                var childView = this.nativeLayer.GetChildAt(1);
+                this.nativeLayer.AddView(aView, layerCount, new CoordinatorLayout.LayoutParams(CoordinatorLayout.LayoutParams.MatchParent, CoordinatorLayout.LayoutParams.MatchParent));
+                aView.BringToFront();
             }
         }
 
@@ -121,10 +122,10 @@ internal void RemoveNativeElements(Page view)
 
             var pageHandler = view.ToHandler(this.context);
             var element = pageHandler?.NativeView;
-            if (element is not null)
+            if (element is Android.Views.View aView)
             {
-                element.Touch -= this.Element_Touch;
-                this.nativeLayer.RemoveView(element);
+                aView.Touch -= this.Element_Touch;
+                this.nativeLayer.RemoveView(aView);
             }
         }