.nuspec updates and fixes for X.A.Support 23 -> 25 (#679)

diff --git a/.nuspec/Xamarin.Forms.Maps.nuspec b/.nuspec/Xamarin.Forms.Maps.nuspec
index f7125bd..9e7aef4 100644 (file)
--- a/.nuspec/Xamarin.Forms.Maps.nuspec
+++ b/.nuspec/Xamarin.Forms.Maps.nuspec
@@ -22,6 +22,12 @@
         <dependency id="Xamarin.Android.Support.v7.AppCompat" version="[23.3.0]"/>
         <dependency id="Xamarin.Forms$IdAppend$" version="$version$"/>
       </group>
+      <group targetFramework="MonoAndroid70">
+        <dependency id="Xamarin.GooglePlayServices.Maps" version="29.0.0.1"/>
+        <dependency id="Xamarin.Android.Support.v7.MediaRouter" version="23.3.0"/>
+        <dependency id="Xamarin.Android.Support.v7.AppCompat" version="23.3.0"/>
+        <dependency id="Xamarin.Forms$IdAppend$" version="$version$"/>
+      </group>
     </dependencies>
     <references>
       <group targetFramework="portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10">

diff --git a/.nuspec/Xamarin.Forms.nuspec b/.nuspec/Xamarin.Forms.nuspec
index 6cbbc43..ce12380 100644 (file)
--- a/.nuspec/Xamarin.Forms.nuspec
+++ b/.nuspec/Xamarin.Forms.nuspec
@@ -23,6 +23,13 @@
         <dependency id="Xamarin.Android.Support.v7.CardView" version="[23.3.0]"/>
         <dependency id="Xamarin.Android.Support.v7.MediaRouter" version="[23.3.0]"/>
       </group>
+      <group targetFramework="MonoAndroid70">
+        <dependency id="Xamarin.Android.Support.v4" version="23.3.0"/>
+        <dependency id="Xamarin.Android.Support.Design" version="23.3.0"/>
+        <dependency id="Xamarin.Android.Support.v7.AppCompat" version="23.3.0"/>
+        <dependency id="Xamarin.Android.Support.v7.CardView" version="23.3.0"/>
+        <dependency id="Xamarin.Android.Support.v7.MediaRouter" version="23.3.0"/>
+      </group>
     </dependencies>
     <references>
        <group targetFramework="portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20">

diff --git a/Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs b/Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs
index 9e37e66..cab4d56 100644 (file)
--- a/Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs
+++ b/Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs
@@ -23,10 +23,11 @@ using Fragment = Android.Support.V4.App.Fragment;
 using FragmentManager = Android.Support.V4.App.FragmentManager;
 using FragmentTransaction = Android.Support.V4.App.FragmentTransaction;
 using Object = Java.Lang.Object;
+using static Android.Views.View;
 
 namespace Xamarin.Forms.Platform.Android.AppCompat
 {
-       public class NavigationPageRenderer : VisualElementRenderer<NavigationPage>, IManageFragments
+       public class NavigationPageRenderer : VisualElementRenderer<NavigationPage>, IManageFragments, IOnClickListener
        {
                readonly List<Fragment> _fragmentStack = new List<Fragment>();
 
@@ -144,7 +145,7 @@ namespace Xamarin.Forms.Platform.Android.AppCompat
 
                                if (_toolbar != null)
                                {
-                                       _toolbar.NavigationClick -= BarOnNavigationClick;
+                                       _toolbar.SetNavigationOnClickListener(null);
                                        _toolbar.Dispose();
                                        _toolbar = null;
                                }
@@ -392,7 +393,7 @@ namespace Xamarin.Forms.Platform.Android.AppCompat
                        valueAnim.Start();
                }
 
-               void BarOnNavigationClick(object sender, AToolbar.NavigationClickEventArgs navigationClickEventArgs)
+               public void OnClick(AView v)
                {
                        Element?.PopAsync();
                }
@@ -558,7 +559,7 @@ namespace Xamarin.Forms.Platform.Android.AppCompat
                        AToolbar oldToolbar = _toolbar;
 
                        _toolbar.RemoveFromParent();
-                       _toolbar.NavigationClick -= BarOnNavigationClick;
+                       _toolbar.SetNavigationOnClickListener(null);
                        _toolbar = null;
 
                        SetupToolbar();
@@ -582,7 +583,7 @@ namespace Xamarin.Forms.Platform.Android.AppCompat
                        else
                                bar = new AToolbar(context);
 
-                       bar.NavigationClick += BarOnNavigationClick;
+                       bar.SetNavigationOnClickListener(this);
 
                        AddView(bar);
                        _toolbar = bar;