diff --git a/InputKit.nuspec b/InputKit.nuspec
index a5318aa..e8ff41d 100644
--- a/InputKit.nuspec
+++ b/InputKit.nuspec
@@ -161,14 +161,14 @@
-
-
+
+
-
-
+
diff --git a/InputKit/InputKit.csproj b/InputKit/InputKit.csproj
index f8756ee..1015fff 100644
--- a/InputKit/InputKit.csproj
+++ b/InputKit/InputKit.csproj
@@ -1,7 +1,7 @@
- netstandard2.0;MonoAndroid80;Xamarin.iOS10;Xamarin.TVOS10;Xamarin.WatchOS10;Xamarin.Mac20;
+ netstandard2.0;MonoAndroid81;Xamarin.iOS10;Xamarin.TVOS10;Xamarin.WatchOS10;Xamarin.Mac20;
Plugin.InputKit
Plugin.InputKit
@@ -59,7 +59,7 @@
-
+
diff --git a/InputKit/Platforms/Droid/MenuEffect.cs b/InputKit/Platforms/Droid/MenuEffect.cs
index e93851b..3533511 100644
--- a/InputKit/Platforms/Droid/MenuEffect.cs
+++ b/InputKit/Platforms/Droid/MenuEffect.cs
@@ -1,4 +1,6 @@
-using Android.Widget;
+using Android.Content;
+using Android.OS;
+using Android.Support.V7.Widget;
using Plugin.InputKit.Platforms.Droid;
using System.Linq;
using Xamarin.Forms;
@@ -19,20 +21,17 @@ protected override void OnAttached()
if (Effect != null)
Effect.Parent.OnPopupRequest += OnPopupRequest;
-
+ Context context = Plugin.CurrentActivity.CrossCurrentActivity.Current.AppContext;
if (Control != null)
{
- ToggleMenu = new PopupMenu(Plugin.CurrentActivity.CrossCurrentActivity.Current.AppContext, Control);
- ToggleMenu.Gravity = Android.Views.GravityFlags.Right;
- ToggleMenu.MenuItemClick += MenuItemClick;
+ ToggleMenu = new PopupMenu(context, Control);
}
-
else if (Container != null)
{
- ToggleMenu = new PopupMenu(Plugin.CurrentActivity.CrossCurrentActivity.Current.AppContext, Container);
- ToggleMenu.Gravity = Android.Views.GravityFlags.Right;
- ToggleMenu.MenuItemClick += MenuItemClick;
+ ToggleMenu = new PopupMenu(context, Container);
}
+ ToggleMenu.Gravity = (int)Android.Views.GravityFlags.Right;
+ ToggleMenu.MenuItemClick += MenuItemClick;
}
void OnPopupRequest(View view)
diff --git a/Sample.InputKit/Sample.InputKit.Android/Properties/AndroidManifest.xml b/Sample.InputKit/Sample.InputKit.Android/Properties/AndroidManifest.xml
index 91c3072..6ba12f1 100644
--- a/Sample.InputKit/Sample.InputKit.Android/Properties/AndroidManifest.xml
+++ b/Sample.InputKit/Sample.InputKit.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/Sample.InputKit/Sample.InputKit.Android/Sample.InputKit.Android.csproj b/Sample.InputKit/Sample.InputKit.Android/Sample.InputKit.Android.csproj
index 864b226..c566036 100644
--- a/Sample.InputKit/Sample.InputKit.Android/Sample.InputKit.Android.csproj
+++ b/Sample.InputKit/Sample.InputKit.Android/Sample.InputKit.Android.csproj
@@ -27,6 +27,9 @@
prompt
4
None
+ false
+ false
+ false
true
@@ -37,6 +40,9 @@
4
true
false
+ false
+ false
+ false
@@ -83,7 +89,7 @@
- {B7F4F0DD-F749-4E39-9353-81B6BB56DFC8}
+ {b7f4f0dd-f749-4e39-9353-81b6bb56dfc8}
InputKit